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

Commit 342c74ed authored by Maurice Lam's avatar Maurice Lam
Browse files

[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
parent e2d63fef

src/com/android/settings/SetupChooseLockPassword.java

+11 −5
Original line number Diff line number Diff line
@@ -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