From 342c74ed03cc7aa2bd67e6ff90c22307777af536 Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Thu, 7 May 2015 17:22:09 -0700
Subject: [PATCH] [LockScreenSetup] Fix "Choose Lock PIN" title

Set the header text for SetupChooseLockPassword in onViewCreated
after the superclass has set the activity title.

Bug: 20861117
Change-Id: I27e4f06d16afd9a02647f8c10a76518f618bd6b8
---
 .../settings/SetupChooseLockPassword.java        | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/com/android/settings/SetupChooseLockPassword.java b/src/com/android/settings/SetupChooseLockPassword.java
index 6f384a487ce..080e47002ae 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