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

Commit 24044a78 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Rename settings category." into pi-dev

parents 2b17e016 b76cd970

packages/SettingsLib/src/com/android/settingslib/drawer/CategoryKey.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -49,8 +49,8 @@ public final class CategoryKey { 
            "com.android.settings.category.ia.notifications";

            "com.android.settings.category.ia.notifications";

    public static final String CATEGORY_DO_NOT_DISTURB = "com.android.settings.category.ia.dnd";

    public static final String CATEGORY_DO_NOT_DISTURB = "com.android.settings.category.ia.dnd";

    public static final String CATEGORY_GESTURES = "com.android.settings.category.ia.gestures";

    public static final String CATEGORY_GESTURES = "com.android.settings.category.ia.gestures";

    public static final String CATEGORY_NIGHT_LIGHT =

    public static final String CATEGORY_NIGHT_DISPLAY =

            "com.android.settings.category.ia.night_light";

            "com.android.settings.category.ia.night_display";





    public static final Map<String, String> KEY_COMPAT_MAP;

    public static final Map<String, String> KEY_COMPAT_MAP;

packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/CategoryKeyTest.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -58,7 +58,7 @@ public class CategoryKeyTest { 
        allKeys.add(CategoryKey.CATEGORY_SYSTEM_LANGUAGE);

        allKeys.add(CategoryKey.CATEGORY_SYSTEM_LANGUAGE);

        allKeys.add(CategoryKey.CATEGORY_SYSTEM_DEVELOPMENT);

        allKeys.add(CategoryKey.CATEGORY_SYSTEM_DEVELOPMENT);

        allKeys.add(CategoryKey.CATEGORY_GESTURES);

        allKeys.add(CategoryKey.CATEGORY_GESTURES);

        allKeys.add(CategoryKey.CATEGORY_NIGHT_LIGHT);

        allKeys.add(CategoryKey.CATEGORY_NIGHT_DISPLAY);

        // DO NOT REMOVE ANYTHING ABOVE

        // DO NOT REMOVE ANYTHING ABOVE





        assertThat(allKeys.size()).isEqualTo(18);

        assertThat(allKeys.size()).isEqualTo(18);