From 3a6affec54be7c0c8592fa9b8d78c654abfdc610 Mon Sep 17 00:00:00 2001
From: Chun-Ku Lin <chunkulin@google.com>
Date: Thu, 6 Mar 2025 01:44:30 +0000
Subject: [PATCH] Use ButtonPreference for consistent style

Bug: 397514562
Test: manual
Flag: com.android.settingslib.widget.theme.flags.is_expressive_design_enabled
Change-Id: I830386e058c1459306ffa4235b8da27a273a9170
---
 ...hAccessibilityActivityPreferenceFragment.java | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java b/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java
index c6995b01af7..a3e2d6aa05a 100644
--- a/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java
@@ -17,6 +17,8 @@
 package com.android.settings.accessibility;
 
 import static com.android.settings.accessibility.AccessibilityStatsLogUtils.logAccessibilityServiceEnabled;
+import static com.android.settingslib.widget.ButtonPreference.SIZE_EXTRA_LARGE;
+import static com.android.settingslib.widget.ButtonPreference.TYPE_TONAL;
 
 import android.accessibilityservice.AccessibilityShortcutInfo;
 import android.app.ActivityOptions;
@@ -39,6 +41,8 @@ import androidx.annotation.Nullable;
 import androidx.preference.Preference;
 
 import com.android.settings.R;
+import com.android.settingslib.widget.ButtonPreference;
+import com.android.settingslib.widget.SettingsThemeHelper;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -147,8 +151,14 @@ public class LaunchAccessibilityActivityPreferenceFragment extends ToggleFeature
     }
 
     private void initLaunchPreference() {
-        final Preference launchPreference = new Preference(getPrefContext());
-        launchPreference.setLayoutResource(R.layout.accessibility_launch_activity_preference);
+        final Preference launchPreference;
+        if (SettingsThemeHelper.isExpressiveTheme(getPrefContext())) {
+            launchPreference = new ButtonPreference(getPrefContext());
+            ((ButtonPreference) launchPreference).setButtonStyle(TYPE_TONAL, SIZE_EXTRA_LARGE);
+        } else {
+            launchPreference = new Preference(getPrefContext());
+            launchPreference.setLayoutResource(R.layout.accessibility_launch_activity_preference);
+        }
         launchPreference.setKey(KEY_LAUNCH_PREFERENCE);
 
         final AccessibilityShortcutInfo info = getAccessibilityShortcutInfo();
@@ -207,4 +217,4 @@ public class LaunchAccessibilityActivityPreferenceFragment extends ToggleFeature
     protected String getLogTag() {
         return TAG;
     }
-}
+}
\ No newline at end of file