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

Merge "Use ButtonPreference for consistent style" into main

Browse Source
This commit is contained in:
Treehugger Robot
2025-03-13 23:54:09 -07:00
committed by Android (Google) Code Review
parent 30cc4181c6 3a6affec54
commit 504218a317
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java
View File

@@ -17,6 +17,8 @@
package com.android.settings.accessibility; package com.android.settings.accessibility;
import static com.android.settings.accessibility.AccessibilityStatsLogUtils.logAccessibilityServiceEnabled; 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.accessibilityservice.AccessibilityShortcutInfo;
import android.app.ActivityOptions; import android.app.ActivityOptions;
@@ -39,6 +41,8 @@ import androidx.annotation.Nullable;
import androidx.preference.Preference; import androidx.preference.Preference;
import com.android.settings.R; import com.android.settings.R;
import com.android.settingslib.widget.ButtonPreference;
import com.android.settingslib.widget.SettingsThemeHelper;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -147,8 +151,14 @@ public class LaunchAccessibilityActivityPreferenceFragment extends ToggleFeature
} }
private void initLaunchPreference() { private void initLaunchPreference() {
final Preference launchPreference = new Preference(getPrefContext()); final Preference launchPreference;
launchPreference.setLayoutResource(R.layout.accessibility_launch_activity_preference); 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); launchPreference.setKey(KEY_LAUNCH_PREFERENCE);
final AccessibilityShortcutInfo info = getAccessibilityShortcutInfo(); final AccessibilityShortcutInfo info = getAccessibilityShortcutInfo();
@@ -207,4 +217,4 @@ public class LaunchAccessibilityActivityPreferenceFragment extends ToggleFeature
protected String getLogTag() { protected String getLogTag() {
return TAG; return TAG;
} }
} }