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

Commit 1f91111c authored by Jason Chiu's avatar Jason Chiu Committed by Android (Google) Code Review
Browse files

Merge "Fix the incorrect title of Panel" into rvc-dev

parents a5f3282f 4bbc85eb

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);