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

Commit 0dfadbef authored by Katsiaryna Naliuka's avatar Katsiaryna Naliuka Committed by android-build-merger
Browse files

Merge "Added a category for lockscreen settings." into oc-dr1-dev 

am: 7cb007c6

Change-Id: Ifd60b2b309fe7e251c13844ef5473bad1a73c757
parents 71f940f6 7cb007c6

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

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ public final class CategoryKey { 
    public static final String CATEGORY_SOUND = "com.android.settings.category.ia.sound";

    public static final String CATEGORY_STORAGE = "com.android.settings.category.ia.storage";

    public static final String CATEGORY_SECURITY = "com.android.settings.category.ia.security";

    public static final String CATEGORY_SECURITY_LOCKSCREEN =

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

    public static final String CATEGORY_ACCOUNT = "com.android.settings.category.ia.accounts";

    public static final String CATEGORY_SYSTEM = "com.android.settings.category.ia.system";

    public static final String CATEGORY_SYSTEM_LANGUAGE =

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

+2 −1
Original line number Diff line number Diff line
@@ -54,13 +54,14 @@ public class CategoryKeyTest { 
        allKeys.add(CategoryKey.CATEGORY_SOUND);

        allKeys.add(CategoryKey.CATEGORY_STORAGE);

        allKeys.add(CategoryKey.CATEGORY_SECURITY);

        allKeys.add(CategoryKey.CATEGORY_SECURITY_LOCKSCREEN);

        allKeys.add(CategoryKey.CATEGORY_ACCOUNT);

        allKeys.add(CategoryKey.CATEGORY_SYSTEM);

        allKeys.add(CategoryKey.CATEGORY_SYSTEM_LANGUAGE);

        allKeys.add(CategoryKey.CATEGORY_SYSTEM_DEVELOPMENT);

        // DO NOT REMOVE ANYTHING ABOVE



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

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

    }



}