summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/EncryptionInterstitial.java
diff options
context:
space:
mode:
authorMaurice Lam <yukl@google.com>2015-07-20 16:08:38 -0700
committerMaurice Lam <yukl@google.com>2015-07-20 21:06:21 -0700
commit7e831030201fcac9ca0acc9684497dc44cea7023 (patch)
tree080bca918e469ccbdf701615c64f94dc73efe776 /src/com/android/settings/EncryptionInterstitial.java
parentd85fafce30f6fb71ea9de9de3c6d8aafc99dba33 (diff)
downloadpackages_apps_Settings-7e831030201fcac9ca0acc9684497dc44cea7023.tar.gz
packages_apps_Settings-7e831030201fcac9ca0acc9684497dc44cea7023.tar.bz2
packages_apps_Settings-7e831030201fcac9ca0acc9684497dc44cea7023.zip
[ScreenLock] Style encryption interstitial in SUW
When running in setup wizard, style the encryption interstitial using styles from Setup Wizard library, to be consistent with the rest of the setup flow. Bug: 22587892 Change-Id: I3787643139ec4189f16e0046875fe3a688c8060b
Diffstat (limited to 'src/com/android/settings/EncryptionInterstitial.java')
-rw-r--r--src/com/android/settings/EncryptionInterstitial.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/com/android/settings/EncryptionInterstitial.java b/src/com/android/settings/EncryptionInterstitial.java
index 73d8257b6..1bef99a24 100644
--- a/src/com/android/settings/EncryptionInterstitial.java
+++ b/src/com/android/settings/EncryptionInterstitial.java
@@ -87,8 +87,12 @@ public class EncryptionInterstitial extends SettingsActivity {
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
- final int layoutId = R.layout.encryption_interstitial;
- View view = inflater.inflate(layoutId, container, false);
+ return inflater.inflate(R.layout.encryption_interstitial, container, false);
+ }
+
+ @Override
+ public void onViewCreated(View view, Bundle savedInstanceState) {
+ super.onViewCreated(view, savedInstanceState);
mRequirePasswordToDecryptButton =
(RadioButton) view.findViewById(R.id.encrypt_require_password);
mDontRequirePasswordToDecryptButton =
@@ -135,7 +139,6 @@ public class EncryptionInterstitial extends SettingsActivity {
setRequirePasswordState(getActivity().getIntent().getBooleanExtra(
EXTRA_REQUIRE_PASSWORD, true));
- return view;
}
@Override