From 44f2736f5453ec3bf1fffd3471ecda24da57a094 Mon Sep 17 00:00:00 2001 From: Maurice Lam Date: Fri, 8 Jul 2016 18:38:48 -0700 Subject: [PATCH] Fix PIN screen title Set the header text of the screen after Activity.setTitle is called, so that the PIN screen will show the PIN text as header, as opposed to the default which is always "password". Bug: 30041779 Change-Id: I525bd4e5c51252410fdeb0424329bbfbd86e5b7d --- src/com/android/settings/ChooseLockPassword.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/ChooseLockPassword.java index 5a8960c8b7f..801f0083dd8 100644 --- a/src/com/android/settings/ChooseLockPassword.java +++ b/src/com/android/settings/ChooseLockPassword.java @@ -290,10 +290,7 @@ public class ChooseLockPassword extends SettingsActivity { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - GlifLayout layout = (GlifLayout) inflater.inflate( - R.layout.choose_lock_password, container, false); - layout.setHeaderText(getActivity().getTitle()); - return layout; + return inflater.inflate(R.layout.choose_lock_password, container, false); } @Override @@ -365,6 +362,7 @@ public class ChooseLockPassword extends SettingsActivity { : R.string.lockpassword_choose_your_pin_header; CharSequence title = getText(id); sa.setTitle(title); + ((GlifLayout) view).setHeaderText(title); } }