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

Commit 23ab3fdf authored by Doris Ling's avatar Doris Ling Committed by android-build-merger
Browse files

Merge "Add new category keys." into pi-dev 

am: 158d5b7b

Change-Id: Ia50d80bea7235ae5e17dd0f23f49d0b0c48e1d81
parents d0c08412 158d5b7b

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

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

    public static final String CATEGORY_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_NIGHT_LIGHT =

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



    public static final Map<String, String> KEY_COMPAT_MAP;

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

+3 −1
Original line number Diff line number Diff line
@@ -57,8 +57,10 @@ public class CategoryKeyTest { 
        allKeys.add(CategoryKey.CATEGORY_SYSTEM);

        allKeys.add(CategoryKey.CATEGORY_SYSTEM_LANGUAGE);

        allKeys.add(CategoryKey.CATEGORY_SYSTEM_DEVELOPMENT);

        allKeys.add(CategoryKey.CATEGORY_GESTURES);

        allKeys.add(CategoryKey.CATEGORY_NIGHT_LIGHT);

        // DO NOT REMOVE ANYTHING ABOVE



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

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

    }

}