From 7e831030201fcac9ca0acc9684497dc44cea7023 Mon Sep 17 00:00:00 2001 From: Maurice Lam Date: Mon, 20 Jul 2015 16:08:38 -0700 Subject: [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 --- .../settings/SetupEncryptionInterstitial.java | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'src/com/android/settings/SetupEncryptionInterstitial.java') diff --git a/src/com/android/settings/SetupEncryptionInterstitial.java b/src/com/android/settings/SetupEncryptionInterstitial.java index 4605ca1bec..27d7e0cd21 100644 --- a/src/com/android/settings/SetupEncryptionInterstitial.java +++ b/src/com/android/settings/SetupEncryptionInterstitial.java @@ -72,22 +72,24 @@ public class SetupEncryptionInterstitial extends EncryptionInterstitial { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - final SetupWizardLayout layout = new SetupWizardLayout(inflater.getContext()); - layout.setIllustration(R.drawable.setup_illustration_lock_screen, - R.drawable.setup_illustration_horizontal_tile); - layout.setBackgroundTile(R.drawable.setup_illustration_tile); - layout.setHeaderText(R.string.encryption_interstitial_header); + return inflater.inflate(R.layout.setup_encryption_interstitial, container, false); + } + + @Override + public void onViewCreated(View view, Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + + final SetupWizardLayout layout = + (SetupWizardLayout) view.findViewById(R.id.setup_wizard_layout); - View content = super.onCreateView(inflater, layout, savedInstanceState); - layout.addView(content); - layout.getNavigationBar().setNavigationBarListener(this); + final NavigationBar navigationBar = layout.getNavigationBar(); + navigationBar.setNavigationBarListener(this); Activity activity = getActivity(); if (activity != null) { activity.setTitle(R.string.encryption_interstitial_header); SetupWizardUtils.setImmersiveMode(activity); } - return layout; } @Override -- cgit v1.2.3