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

Commit 4bbc85eb authored by Jason Chiu's avatar Jason Chiu
Browse files

Fix the incorrect title of Panel 

Since panel activity is singleInstance, a newer panel will reuse the
same fragment as the previous panel when they are displayed one after
another.

Panel fragment has two kinds of exclusive header layout which shouldn't
be showed at the same time, so we have to reset their visible states
when creating panel content.

Fixes: 154668079
Test: robotest
Change-Id: I701a7cde4b43322fbc63ae1cb74c41dd23b37c0c
parent 12a838d1

src/com/android/settings/panel/PanelFragment.java

+3 −0
Original line number Diff line number Diff line
@@ -201,6 +201,8 @@ public class PanelFragment extends Fragment { 


        final IconCompat icon = mPanel.getIcon();

        if (icon == null) {

            mTitleView.setVisibility(View.VISIBLE);

            mPanelHeader.setVisibility(View.GONE);

            mTitleView.setText(mPanel.getTitle());

        } else {

            mTitleView.setVisibility(View.GONE);
@@ -220,6 +222,7 @@ public class PanelFragment extends Fragment { 
            if (TextUtils.isEmpty(customTitle)) {

                mSeeMoreButton.setVisibility(View.GONE);

            } else {

                mSeeMoreButton.setVisibility(View.VISIBLE);

                mSeeMoreButton.setText(customTitle);

            }

        } else if (mPanel.getSeeMoreIntent() == null) {

src/com/android/settings/panel/SettingsPanelActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ public class SettingsPanelActivity extends FragmentActivity { 
        if (!shouldForceCreation && fragment != null && fragment instanceof PanelFragment) {

            final PanelFragment panelFragment = (PanelFragment) fragment;

            panelFragment.setArguments(mBundle);

            ((PanelFragment) fragment).updatePanelWithAnimation();

            panelFragment.updatePanelWithAnimation();

        } else {

            setContentView(R.layout.settings_panel);