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

Browse Source
This commit is contained in:
Jason Chiu
2020-04-22 06:30:12 +00:00
committed by Android (Google) Code Review
parent a5f3282ff7 4bbc85eb54
commit 1f91111c3a
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

@@ -201,6 +201,8 @@ public class PanelFragment extends Fragment {
final IconCompat icon = mPanel.getIcon(); final IconCompat icon = mPanel.getIcon();
if (icon == null) { if (icon == null) {
mTitleView.setVisibility(View.VISIBLE);
mPanelHeader.setVisibility(View.GONE);
mTitleView.setText(mPanel.getTitle()); mTitleView.setText(mPanel.getTitle());
} else { } else {
mTitleView.setVisibility(View.GONE); mTitleView.setVisibility(View.GONE);
@@ -220,6 +222,7 @@ public class PanelFragment extends Fragment {
if (TextUtils.isEmpty(customTitle)) { if (TextUtils.isEmpty(customTitle)) {
mSeeMoreButton.setVisibility(View.GONE); mSeeMoreButton.setVisibility(View.GONE);
} else { } else {
mSeeMoreButton.setVisibility(View.VISIBLE);
mSeeMoreButton.setText(customTitle); mSeeMoreButton.setText(customTitle);
} }
} else if (mPanel.getSeeMoreIntent() == null) { } 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) { if (!shouldForceCreation && fragment != null && fragment instanceof PanelFragment) {
final PanelFragment panelFragment = (PanelFragment) fragment; final PanelFragment panelFragment = (PanelFragment) fragment;
panelFragment.setArguments(mBundle); panelFragment.setArguments(mBundle);
((PanelFragment) fragment).updatePanelWithAnimation(); panelFragment.updatePanelWithAnimation();
} else { } else {
setContentView(R.layout.settings_panel); setContentView(R.layout.settings_panel);