diff options
author | Maurice Lam <yukl@google.com> | 2014-12-01 10:41:49 -0800 |
---|---|---|
committer | Maurice Lam <yukl@google.com> | 2014-12-01 20:24:08 -0800 |
commit | ecd2b7b81fd2faa2f2f3dbe5a169c749321f3d89 (patch) | |
tree | 77aea30201a9c0f27ece33108c8625dc96f80a2f /src/com/android/settings/SetupChooseLockPassword.java | |
parent | 6b19fa9017800b94c75238339a337fd8f6c3e808 (diff) | |
download | packages_apps_Settings-ecd2b7b81fd2faa2f2f3dbe5a169c749321f3d89.zip packages_apps_Settings-ecd2b7b81fd2faa2f2f3dbe5a169c749321f3d89.tar.gz packages_apps_Settings-ecd2b7b81fd2faa2f2f3dbe5a169c749321f3d89.tar.bz2 |
[FRP] Theme interstitials for lock screen setup
Use the setup wizard theme for EncryptionInterstital and
RedactionInterstitial as they will show during the lock screen setup
as part of setup wizard.
Bug: 18482708
Change-Id: I65c8924952345a4e17fcf4ffb7d68df53244c5d7
Diffstat (limited to 'src/com/android/settings/SetupChooseLockPassword.java')
-rw-r--r-- | src/com/android/settings/SetupChooseLockPassword.java | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/com/android/settings/SetupChooseLockPassword.java b/src/com/android/settings/SetupChooseLockPassword.java index 5366a55..ed6fab4 100644 --- a/src/com/android/settings/SetupChooseLockPassword.java +++ b/src/com/android/settings/SetupChooseLockPassword.java @@ -27,6 +27,13 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +/** + * Setup Wizard's version of ChooseLockPassword screen. It inherits the logic and basic structure + * from ChooseLockPassword class, and should remain similar to that behaviorally. This class should + * only overload base methods for minor theme and behavior differences specific to Setup Wizard. + * Other changes should be done to ChooseLockPassword class instead and let this class inherit + * those changes. + */ public class SetupChooseLockPassword extends ChooseLockPassword implements SetupWizardNavBar.NavigationBarListener { @@ -86,5 +93,12 @@ public class SetupChooseLockPassword extends ChooseLockPassword super.onViewCreated(view, savedInstanceState); SetupWizardUtils.setHeaderText(getActivity(), getActivity().getTitle()); } + + @Override + protected Intent getRedactionInterstitialIntent(Context context) { + Intent intent = SetupRedactionInterstitial.createStartIntent(context); + SetupWizardUtils.copySetupExtras(getActivity().getIntent(), intent); + return intent; + } } } |