diff options
author | Maurice Lam <yukl@google.com> | 2015-04-18 20:11:59 -0700 |
---|---|---|
committer | Maurice Lam <yukl@google.com> | 2015-04-21 10:19:35 -0700 |
commit | 83301b5256e3fd930d620e8e9ad5f43cd388ba09 (patch) | |
tree | 71e2c358fabf8aee6166177d0dcb34efc5215609 /src/com/android/settings/SetupRedactionInterstitial.java | |
parent | c3385dc11bacdcc4d8e7d614fd7133bb9e609cdb (diff) | |
download | packages_apps_Settings-83301b5256e3fd930d620e8e9ad5f43cd388ba09.zip packages_apps_Settings-83301b5256e3fd930d620e8e9ad5f43cd388ba09.tar.gz packages_apps_Settings-83301b5256e3fd930d620e8e9ad5f43cd388ba09.tar.bz2 |
[Setup] Use SetupWizardLayout
Use SetupWizardLayout for the screens that show in Settings to get
better visual consistency and new features like showing a progress
bar in list view.
Bug: 19594252
Change-Id: I53ab17a4c2d922a362e3762f1cdccb512f7d8f6e
Diffstat (limited to 'src/com/android/settings/SetupRedactionInterstitial.java')
-rw-r--r-- | src/com/android/settings/SetupRedactionInterstitial.java | 63 |
1 files changed, 33 insertions, 30 deletions
diff --git a/src/com/android/settings/SetupRedactionInterstitial.java b/src/com/android/settings/SetupRedactionInterstitial.java index 266a049..c6437e0 100644 --- a/src/com/android/settings/SetupRedactionInterstitial.java +++ b/src/com/android/settings/SetupRedactionInterstitial.java @@ -17,8 +17,10 @@ package com.android.settings; import com.android.settings.notification.RedactionInterstitial; -import com.android.setupwizard.navigationbar.SetupWizardNavBar; +import com.android.setupwizardlib.SetupWizardLayout; +import com.android.setupwizardlib.view.NavigationBar; +import android.app.Activity; import android.content.Context; import android.content.Intent; import android.content.res.Resources; @@ -34,8 +36,7 @@ import android.view.ViewGroup; * Wizard. Other changes should be done to RedactionInterstitial class instead and let this class * inherit those changes. */ -public class SetupRedactionInterstitial extends RedactionInterstitial - implements SetupWizardNavBar.NavigationBarListener{ +public class SetupRedactionInterstitial extends RedactionInterstitial { public static Intent createStartIntent(Context ctx) { Intent startIntent = RedactionInterstitial.createStartIntent(ctx); @@ -64,41 +65,43 @@ public class SetupRedactionInterstitial extends RedactionInterstitial super.onApplyThemeResource(theme, resid, first); } - @Override - public void onNavigationBarCreated(SetupWizardNavBar bar) { - SetupWizardUtils.setImmersiveMode(this); - bar.getBackButton().setEnabled(false); - } + public static class SetupEncryptionInterstitialFragment extends RedactionInterstitialFragment + implements NavigationBar.NavigationBarListener { - @Override - public void onNavigateBack() { - onBackPressed(); - } + @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); - @Override - public void onNavigateNext() { - setResult(RESULT_OK, getResultIntentData()); - finish(); - } + View content = super.onCreateView(inflater, layout, savedInstanceState); + layout.addView(content); - public static class SetupEncryptionInterstitialFragment extends RedactionInterstitialFragment { + final NavigationBar navigationBar = layout.getNavigationBar(); + navigationBar.setNavigationBarListener(this); + navigationBar.getBackButton().setEnabled(false); + SetupWizardUtils.setImmersiveMode(getActivity()); + return layout; + } @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - View view = inflater.inflate(R.layout.setup_template, container, false); - ViewGroup setupContent = (ViewGroup) view.findViewById(R.id.setup_content); - View content = super.onCreateView(inflater, setupContent, savedInstanceState); - setupContent.addView(content); - return view; + public void onNavigateBack() { + final Activity activity = getActivity(); + if (activity != null) { + activity.onBackPressed(); + } } @Override - public void onViewCreated(View view, Bundle savedInstanceState) { - super.onViewCreated(view, savedInstanceState); - SetupWizardUtils.setIllustration(getActivity(), - R.drawable.setup_illustration_lock_screen); - SetupWizardUtils.setHeaderText(getActivity(), R.string.notification_section_header); + public void onNavigateNext() { + final SetupRedactionInterstitial activity = (SetupRedactionInterstitial) getActivity(); + if (activity != null) { + activity.setResult(RESULT_OK, activity.getResultIntentData()); + finish(); + } } } } |