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

Commit ee01f3dd authored by Yi-Ling Chuang's avatar Yi-Ling Chuang Committed by Android (Google) Code Review
Browse files

Merge "Update category names in Display page" into sc-dev

parents 95744749 954bffe9

res/values/strings.xml

+4 −2
Original line number Diff line number Diff line
@@ -12912,10 +12912,12 @@ 
    <string name="category_name_brightness">Brightness</string>

    <!-- Lock screen category name in Display Settings [CHAR LIMIT=none] -->

    <string name="category_name_lock_display">Lock Display</string>

    <!-- Visibility category name in Display Settings [CHAR LIMIT=none] -->

    <string name="category_name_visibility">Visibility</string>

    <!-- Appearance category name in Display Settings [CHAR LIMIT=none] -->

    <string name="category_name_appearance">Appearance</string>

    <!-- Color category name in Display Settings [CHAR LIMIT=none] -->

    <string name="category_name_color">Color</string>

    <!-- Name of Other display controls category in Display Settings [CHAR LIMIT=none] -->

    <string name="category_name_display_controls">Other Display Controls</string>

    <!-- Others category name [CHAR LIMIT=none] -->

    <string name="category_name_others">Others</string>

    <!-- General category name [CHAR LIMIT=none] -->

res/xml/display_settings_v2.xml

+2 −2
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ 
    </PreferenceCategory>



    <PreferenceCategory

        android:title="@string/category_name_visibility">

        android:title="@string/category_name_appearance">



        <com.android.settings.display.darkmode.DarkModePreference

            android:key="dark_ui_mode"
@@ -102,7 +102,7 @@ 
    </PreferenceCategory>



    <PreferenceCategory

        android:title="@string/category_name_general">

        android:title="@string/category_name_display_controls">



        <SwitchPreference

            android:key="auto_rotate"