Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79321c48 authored by Maurice Lam's avatar Maurice Lam Committed by Android (Google) Code Review
Browse files

Merge "Fix PIN screen title" into nyc-mr1-dev

parents ed9aed18 44f2736f

src/com/android/settings/ChooseLockPassword.java

+2 −4
Original line number Diff line number Diff line
@@ -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);

            }

        }