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

Merge "Revert "[Expressive design] Update MainSwitch in SettingsActivity."" into main

Browse Source
This commit is contained in:
Jacky Wang
2024-12-26 23:17:38 -08:00
committed by Android (Google) Code Review
parent 0553c76186 63a14901aa
commit 82aa6c7e64
2 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
res/layout/settings_main_prefs.xml
View File

@@ -28,13 +28,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
<com.android.settings.widget.SettingsMainSwitchBar
android:id="@+id/expressive_switch_bar"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dip"/>
<FrameLayout <FrameLayout
android:id="@+id/main_content" android:id="@+id/main_content"
android:layout_width="match_parent" android:layout_width="match_parent"

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

@@ -311,10 +311,7 @@ public class SettingsActivity extends SettingsBaseActivity
} }
setContentView(R.layout.settings_main_prefs); setContentView(R.layout.settings_main_prefs);
mMainSwitch = findViewById(R.id.switch_bar);
mMainSwitch = SettingsThemeHelper.isExpressiveTheme(this)
? findViewById(R.id.expressive_switch_bar)
: findViewById(R.id.switch_bar);
if (mMainSwitch != null) { if (mMainSwitch != null) {
mMainSwitch.setMetricsCategory(lookupMetricsCategory()); mMainSwitch.setMetricsCategory(lookupMetricsCategory());
mMainSwitch.setTranslationZ(findViewById(R.id.main_content).getTranslationZ() + 1); mMainSwitch.setTranslationZ(findViewById(R.id.main_content).getTranslationZ() + 1);