Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16e8c767 authored by Menghan Li's avatar Menghan Li Committed by Android (Google) Code Review
Browse files

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

parents 93f6a257 1949a5d6

res/xml/captioning_settings.xml

+6 −6
Original line number Diff line number Diff line
@@ -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"

src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -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;