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

Merge "Fix the overlap issue of MainSwitch and list view." into sc-dev am: c4d839e3df

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13746187

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1c6191294fa54fbebe51dc50e206b1b787e02028
This commit is contained in:
Stanley Wang
2021-03-04 13:10:17 +00:00
committed by Automerger Merge Worker
parent f8fdb4dd27 c4d839e3df
commit 29693a2fee
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/SettingsActivity.java
View File

@@ -309,6 +309,7 @@ public class SettingsActivity extends SettingsBaseActivity
mMainSwitch = findViewById(R.id.switch_bar);
if (mMainSwitch != null) {
mMainSwitch.setMetricsTag(getMetricsTag());
mMainSwitch.setTranslationZ(findViewById(R.id.main_content).getTranslationZ() + 1);
}
// see if we should show Back/Next buttons

2
src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
View File

@@ -200,8 +200,6 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
mSwitchBar = ((SettingsActivity) getActivity()).getSwitchBar();
mSwitchBar.setTitle(getContext().getString(R.string.developer_options_main_switch_title));
mSwitchBar.show();
mSwitchBar.setTranslationZ(
getActivity().findViewById(R.id.main_content).getTranslationZ() + 1);
mSwitchBarController = new DevelopmentSwitchBarController(
this /* DevelopmentSettings */, mSwitchBar, mIsAvailable,
getSettingsLifecycle());