From 63a14901aaa45795a61a7224cc153077092ef798 Mon Sep 17 00:00:00 2001
From: Jacky Wang <jiannan@google.com>
Date: Thu, 26 Dec 2024 20:44:31 -0800
Subject: [PATCH] Revert "[Expressive design] Update MainSwitch in
 SettingsActivity."

This reverts commit b7e0923414c1d38ac85888727f41b50033f48dc6.

Reason for revert: Cause regression b/385850462

Change-Id: I82992d428ea985bc2a762854df2abd555cc4a467
---
 res/layout/settings_main_prefs.xml             | 7 -------
 src/com/android/settings/SettingsActivity.java | 5 +----
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/res/layout/settings_main_prefs.xml b/res/layout/settings_main_prefs.xml
index affdd7a2c5c..48352e2efa0 100644
--- a/res/layout/settings_main_prefs.xml
+++ b/res/layout/settings_main_prefs.xml
@@ -28,13 +28,6 @@
         android:layout_width="match_parent"
         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
         android:id="@+id/main_content"
         android:layout_width="match_parent"
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 4de04d3f105..c81d504b223 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -311,10 +311,7 @@ public class SettingsActivity extends SettingsBaseActivity
         }
 
         setContentView(R.layout.settings_main_prefs);
-
-        mMainSwitch = SettingsThemeHelper.isExpressiveTheme(this)
-                ? findViewById(R.id.expressive_switch_bar)
-                : findViewById(R.id.switch_bar);
+        mMainSwitch = findViewById(R.id.switch_bar);
         if (mMainSwitch != null) {
             mMainSwitch.setMetricsCategory(lookupMetricsCategory());
             mMainSwitch.setTranslationZ(findViewById(R.id.main_content).getTranslationZ() + 1);