diff options
| -rw-r--r-- | core/java/com/android/internal/net/VpnConfig.java | 7 | ||||
| -rw-r--r-- | core/res/res/values/config.xml | 4 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 1 |
3 files changed, 11 insertions, 1 deletions
diff --git a/core/java/com/android/internal/net/VpnConfig.java b/core/java/com/android/internal/net/VpnConfig.java index 98599d0..420f8a9 100644 --- a/core/java/com/android/internal/net/VpnConfig.java +++ b/core/java/com/android/internal/net/VpnConfig.java @@ -17,8 +17,10 @@ package com.android.internal.net; import android.app.PendingIntent; +import android.content.ComponentName; import android.content.Context; import android.content.Intent; +import android.content.res.Resources; import android.os.Parcel; import android.os.Parcelable; import android.os.UserHandle; @@ -47,7 +49,10 @@ public class VpnConfig implements Parcelable { public static Intent getIntentForConfirmation() { Intent intent = new Intent(); - intent.setClassName(DIALOGS_PACKAGE, DIALOGS_PACKAGE + ".ConfirmDialog"); + ComponentName componentName = ComponentName.unflattenFromString( + Resources.getSystem().getString( + com.android.internal.R.string.config_customVpnConfirmDialogComponent)); + intent.setClassName(componentName.getPackageName(), componentName.getClassName()); return intent; } 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" /> |