PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix the incorrect title of Panel" into rvc-dev am: 1f91111c3a am: 2fee6f3d1e

Browse Source 
Change-Id: I8d1e8c8197025068112a37bd6ae590b3228ff59d
This commit is contained in:
Jason Chiu
2020-04-22 07:00:05 +00:00
committed by Automerger Merge Worker
parent bdf1895a17 2fee6f3d1e
commit fe32005e88
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/panel/PanelFragment.java
View File

@@ -207,6 +207,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);
@@ -226,6 +228,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) {

2
src/com/android/settings/panel/SettingsPanelActivity.java
View File

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