diff options
author | Maurice Lam <yukl@google.com> | 2015-06-04 17:17:07 -0700 |
---|---|---|
committer | Maurice Lam <yukl@google.com> | 2015-06-04 17:17:07 -0700 |
commit | 25e30815752ab961c72617e8a84bd964449f874b (patch) | |
tree | 60c434420b88c239e7136bdfd91c43da181e4386 /src/com/android/settings/SetupRedactionInterstitial.java | |
parent | fb619a8726cf912e9c9156d8ca06760b641c5171 (diff) | |
download | packages_apps_Settings-25e30815752ab961c72617e8a84bd964449f874b.zip packages_apps_Settings-25e30815752ab961c72617e8a84bd964449f874b.tar.gz packages_apps_Settings-25e30815752ab961c72617e8a84bd964449f874b.tar.bz2 |
Update Setup Wizard redaction interstitial styles
Adhere to the setup wizard design guidelines for the redaction
interstitial shown during setup wizard.
Bug: 21561511
Change-Id: Id6c4f0d4b0075b0cbbbb4f8ab77db6f00ea72b70
Diffstat (limited to 'src/com/android/settings/SetupRedactionInterstitial.java')
-rw-r--r-- | src/com/android/settings/SetupRedactionInterstitial.java | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/src/com/android/settings/SetupRedactionInterstitial.java b/src/com/android/settings/SetupRedactionInterstitial.java index d3d841e..590788b 100644 --- a/src/com/android/settings/SetupRedactionInterstitial.java +++ b/src/com/android/settings/SetupRedactionInterstitial.java @@ -16,10 +16,6 @@ package com.android.settings; -import com.android.settings.notification.RedactionInterstitial; -import com.android.setupwizardlib.SetupWizardLayout; -import com.android.setupwizardlib.view.NavigationBar; - import android.app.Activity; import android.content.Context; import android.content.Intent; @@ -28,7 +24,10 @@ import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.Button; + +import com.android.settings.notification.RedactionInterstitial; +import com.android.setupwizardlib.SetupWizardLayout; +import com.android.setupwizardlib.view.NavigationBar; /** * Setup Wizard's version of RedactionInterstitial screen. It inherits the logic and basic structure @@ -72,21 +71,19 @@ public class SetupRedactionInterstitial extends RedactionInterstitial { @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.notification_section_header); + return inflater.inflate(R.layout.setup_redaction_interstitial, container, false); + } - View content = super.onCreateView(inflater, layout, savedInstanceState); - layout.addView(content); + @Override + public void onViewCreated(View view, Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + final SetupWizardLayout layout = + (SetupWizardLayout) view.findViewById(R.id.setup_wizard_layout); final NavigationBar navigationBar = layout.getNavigationBar(); navigationBar.setNavigationBarListener(this); - final Button backButton = navigationBar.getBackButton(); - backButton.setVisibility(View.GONE); + navigationBar.getBackButton().setVisibility(View.GONE); SetupWizardUtils.setImmersiveMode(getActivity()); - return layout; } @Override |