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

Merge "[Material Next] Move “main switch” right below illustration" into sc-dev am: 16e8c767f1

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486917

Change-Id: I7ed798b0b86420ba80cfb7c87757b488d2f7d06d
This commit is contained in:
Menghan Li
2021-05-12 02:43:53 +00:00
committed by Automerger Merge Worker
parent 82f0a27a61 16e8c767f1
commit 2cba3a3dbd
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
res/xml/captioning_settings.xml
View File

@@ -21,12 +21,6 @@
android:persistent="false"
android:title="@string/accessibility_captioning_title">
<com.android.settings.widget.SettingsMainSwitchPreference
android:key="captioning_preference_switch"
android:persistent="false"
android:summary="@string/accessibility_caption_primary_switch_summary"
android:title="@string/accessibility_caption_primary_switch_title" />
<com.android.settingslib.widget.LayoutPreference
android:key="captions_preview"
android:layout="@layout/accessibility_captions_preview"
@@ -35,6 +29,12 @@
android:title="@string/summary_placeholder"
settings:searchable="false" />
<com.android.settings.widget.SettingsMainSwitchPreference
android:key="captioning_preference_switch"
android:persistent="false"
android:summary="@string/accessibility_caption_primary_switch_summary"
android:title="@string/accessibility_caption_primary_switch_title" />
<Preference
android:fragment="com.android.settings.accessibility.CaptionAppearanceFragment"
android:key="captioning_caption_appearance"

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

@@ -103,8 +103,8 @@ public final class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePrefe
/** Customizes the order by preference key. */
protected List<String> getPreferenceOrderList() {
final List<String> lists = new ArrayList<>();
lists.add(KEY_USE_SERVICE_PREFERENCE);
lists.add(KEY_PREVIEW);
lists.add(KEY_USE_SERVICE_PREFERENCE);
lists.add(KEY_CATEGORY_MODE);
lists.add(KEY_GENERAL_CATEGORY);
lists.add(KEY_HTML_DESCRIPTION_PREFERENCE);

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

@@ -379,8 +379,8 @@ public abstract class ToggleFeaturePreferenceFragment extends SettingsPreference
/** Customizes the order by preference key. */
protected List<String> getPreferenceOrderList() {
final List<String> lists = new ArrayList<>();
lists.add(KEY_USE_SERVICE_PREFERENCE);
lists.add(KEY_ANIMATED_IMAGE);
lists.add(KEY_USE_SERVICE_PREFERENCE);
lists.add(KEY_GENERAL_CATEGORY);
lists.add(KEY_HTML_DESCRIPTION_PREFERENCE);
return lists;