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

Merge "Update Preference style" into sc-dev

Browse Source
This commit is contained in:
Edgar Wang
2021-03-24 14:14:37 +00:00
committed by Android (Google) Code Review
parent 419d5438f1 a4982b658b
commit 7cd16ae07d
4 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout/horizontal_preference.xml
View File

@@ -22,7 +22,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeightSmall" android:minHeight="?android:attr/listPreferredItemHeightSmall"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingStart="@dimen/preference_no_icon_padding_start" android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"> android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
<TextView <TextView

3
res/values/themes.xml
View File

@@ -23,10 +23,7 @@
<item name="android:windowIsFloating">true</item> <item name="android:windowIsFloating">true</item>
</style> </style>
<style name="Theme.SettingsBase" parent="@android:style/Theme.DeviceDefault.Settings" />
<style name="Theme.Settings" parent="Theme.SettingsBase"> <style name="Theme.Settings" parent="Theme.SettingsBase">
<item name="preferenceTheme">@style/PreferenceTheme</item>
<item name="android:clipToPadding">false</item> <item name="android:clipToPadding">false</item>
<item name="android:clipChildren">false</item> <item name="android:clipChildren">false</item>
<item name="android:listPreferredItemHeight">72dip</item> <item name="android:listPreferredItemHeight">72dip</item>

2
src/com/android/settings/accessibility/ShortcutPreference.java
View File

@@ -63,7 +63,7 @@ public class ShortcutPreference extends Preference {
super(context, attrs); super(context, attrs);
setLayoutResource(R.layout.accessibility_shortcut_secondary_action); setLayoutResource(R.layout.accessibility_shortcut_secondary_action);
setWidgetLayoutResource(R.layout.preference_widget_primary_switch); setWidgetLayoutResource(R.layout.preference_widget_primary_switch);
setIconSpaceReserved(true); setIconSpaceReserved(false);
} }
@Override @Override

2
src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
View File

@@ -488,7 +488,7 @@ public abstract class ToggleFeaturePreferenceFragment extends SettingsPreference
// Show the "Settings" menu as if it were a preference screen. // Show the "Settings" menu as if it were a preference screen.
mSettingsPreference = new Preference(getPrefContext()); mSettingsPreference = new Preference(getPrefContext());
mSettingsPreference.setTitle(mSettingsTitle); mSettingsPreference.setTitle(mSettingsTitle);
mSettingsPreference.setIconSpaceReserved(true); mSettingsPreference.setIconSpaceReserved(false);
mSettingsPreference.setIntent(mSettingsIntent); mSettingsPreference.setIntent(mSettingsIntent);
final PreferenceCategory generalCategory = findPreference(KEY_GENERAL_CATEGORY); final PreferenceCategory generalCategory = findPreference(KEY_GENERAL_CATEGORY);