diff options
| author | Vinod Krishnan <vinodkrishnan@google.com> | 2014-06-05 11:50:34 -0700 |
|---|---|---|
| committer | Vinod Krishnan <vinodkrishnan@google.com> | 2014-06-05 15:28:50 -0700 |
| commit | b0e5bbb657c59584c37a489c93a3a12d13ca56b7 (patch) | |
| tree | 607ca44d194a73fdc6e7a8d76a58012acd8f8047 /core/res | |
| parent | 89b6bf5a118322d923cb9349515f06e32003c6ef (diff) | |
| download | frameworks_base-b0e5bbb657c59584c37a489c93a3a12d13ca56b7.zip frameworks_base-b0e5bbb657c59584c37a489c93a3a12d13ca56b7.tar.gz frameworks_base-b0e5bbb657c59584c37a489c93a3a12d13ca56b7.tar.bz2 | |
Adding a way to stub Vpn ConfirmDialog
- This is needed to pass CTS tests on the wear devices
- Related CL: http://ar/479486
Bug: 15087985
Change-Id: I56673ff6085618a03ec61031e3af0f6631cb3425
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/res/values/config.xml | 4 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 99be34a..bbc58f5 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -1394,6 +1394,10 @@ <string name="config_customAdbPublicKeyConfirmationComponent" >com.android.systemui/com.android.systemui.usb.UsbDebuggingActivity</string> + <!-- Name of the CustomDialog that is used for VPN --> + <string name="config_customVpnConfirmDialogComponent" + >com.android.vpndialogs/com.android.vpndialogs.CustomDialog</string> + <!-- Apps that are authorized to access shared accounts, overridden by product overlays --> <string name="config_appsAuthorizedForSharedAccounts">;com.android.settings;</string> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 5b2b394..412ae9d 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1638,6 +1638,7 @@ <java-symbol type="integer" name="config_maximumScreenDimDuration" /> <java-symbol type="fraction" name="config_maximumScreenDimRatio" /> <java-symbol type="string" name="config_customAdbPublicKeyConfirmationComponent" /> + <java-symbol type="string" name="config_customVpnConfirmDialogComponent" /> <java-symbol type="layout" name="resolver_list" /> <java-symbol type="id" name="resolver_list" /> |