From b7e0923414c1d38ac85888727f41b50033f48dc6 Mon Sep 17 00:00:00 2001
From: Yuchen <kirain@google.com>
Date: Tue, 17 Dec 2024 02:48:11 +0000
Subject: [PATCH] [Expressive design] Update MainSwitch in SettingsActivity.

Bug: 349681531
Flag: EXEMPT migration
Test: visual
Change-Id: I0dc55e2ced5ba4ce808e0b29a9b3b60549972637
---
 res/layout/settings_main_prefs.xml             | 7 +++++++
 src/com/android/settings/SettingsActivity.java | 5 ++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/res/layout/settings_main_prefs.xml b/res/layout/settings_main_prefs.xml
index 48352e2efa0..affdd7a2c5c 100644
--- a/res/layout/settings_main_prefs.xml
+++ b/res/layout/settings_main_prefs.xml
@@ -28,6 +28,13 @@
         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 c81d504b223..4de04d3f105 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -311,7 +311,10 @@ public class SettingsActivity extends SettingsBaseActivity
         }
 
         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) {
             mMainSwitch.setMetricsCategory(lookupMetricsCategory());
             mMainSwitch.setTranslationZ(findViewById(R.id.main_content).getTranslationZ() + 1);