summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaurice Lam <yukl@google.com>2015-05-09 00:04:32 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-09 00:04:32 +0000
commit69a03f75171c9f21ee4517f8e6d02cfa955c6a84 (patch)
tree984123733f69236ee8e1b6dc3c6b59efe8b63288
parentd7cba372c6cdeeb8da74de0ae60a2b30ab5f4e25 (diff)
parent342c74ed03cc7aa2bd67e6ff90c22307777af536 (diff)
downloadpackages_apps_Settings-69a03f75171c9f21ee4517f8e6d02cfa955c6a84.zip
packages_apps_Settings-69a03f75171c9f21ee4517f8e6d02cfa955c6a84.tar.gz
packages_apps_Settings-69a03f75171c9f21ee4517f8e6d02cfa955c6a84.tar.bz2
Merge "[LockScreenSetup] Fix "Choose Lock PIN" title" into mnc-dev
-rw-r--r--src/com/android/settings/SetupChooseLockPassword.java16
1 files changed, 11 insertions, 5 deletions
diff --git a/src/com/android/settings/SetupChooseLockPassword.java b/src/com/android/settings/SetupChooseLockPassword.java
index 6f384a4..080e470 100644
--- a/src/com/android/settings/SetupChooseLockPassword.java
+++ b/src/com/android/settings/SetupChooseLockPassword.java
@@ -86,19 +86,25 @@ public class SetupChooseLockPassword extends ChooseLockPassword {
public static class SetupChooseLockPasswordFragment extends ChooseLockPasswordFragment
implements NavigationBar.NavigationBarListener {
+ private SetupWizardLayout mLayout;
private NavigationBar mNavigationBar;
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
- final SetupWizardLayout layout = (SetupWizardLayout) inflater.inflate(
+ mLayout = (SetupWizardLayout) inflater.inflate(
R.layout.setup_choose_lock_password, container, false);
- SystemBarHelper.setImeInsetView(layout.findViewById(R.id.suw_bottom_scroll_view));
- mNavigationBar = layout.getNavigationBar();
+ mNavigationBar = mLayout.getNavigationBar();
mNavigationBar.setNavigationBarListener(this);
- layout.setHeaderText(getActivity().getTitle());
+ return mLayout;
+ }
+
+ @Override
+ public void onViewCreated(View view, Bundle savedInstanceState) {
+ super.onViewCreated(view, savedInstanceState);
+ SystemBarHelper.setImeInsetView(mLayout.findViewById(R.id.suw_bottom_scroll_view));
SetupWizardUtils.setImmersiveMode(getActivity());
- return layout;
+ mLayout.setHeaderText(getActivity().getTitle());
}
@Override