commit 1f91111c3af35dc3a379d1b457d6dbde918c435d
author Jason Chiu <chiujason@google.com> Wed Apr 22 06:30:12 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 22 06:30:12 2020 +0000
tree 2cfbc51db7a3c220d9ce80aa0b4affd82d73defe
parent a5f3282ff7c14446805531337fa48126a4416a10
parent 4bbc85eb549a61f230c30cb2852294087b169238

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

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

diff --git a/src/com/android/settings/panel/PanelFragment.java b/src/com/android/settings/panel/PanelFragment.java
index 14450a3..9de4139 100644
--- a/src/com/android/settings/panel/PanelFragment.java
+++ b/src/com/android/settings/panel/PanelFragment.java
@@ -201,6 +201,8 @@
 
         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 @@
             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

diff --git a/src/com/android/settings/panel/SettingsPanelActivity.java b/src/com/android/settings/panel/SettingsPanelActivity.java
index da46564..6bf016e 100644
--- a/src/com/android/settings/panel/SettingsPanelActivity.java
+++ b/src/com/android/settings/panel/SettingsPanelActivity.java
@@ -117,7 +117,7 @@
         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);