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

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

Merge "Add new category for input setting and language setting"

parents 0c56b3db 9c9e364a

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

+3 −0
Original line number Original line Diff line number Diff line
@@ -36,6 +36,9 @@ public final class CategoryKey { 
    public static final String CATEGORY_SECURITY = "com.android.settings.category.ia.security";

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

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

    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 = "com.android.settings.category.ia.system";

    public static final String CATEGORY_SYSTEM_INPUT = "com.android.settings.category.ia.input";

    public static final String CATEGORY_SYSTEM_LANGUAGE =

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





    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

+3 −1
Original line number Original line Diff line number Diff line
@@ -56,9 +56,11 @@ public class CategoryKeyTest { 
        allKeys.add(CategoryKey.CATEGORY_SECURITY);

        allKeys.add(CategoryKey.CATEGORY_SECURITY);

        allKeys.add(CategoryKey.CATEGORY_ACCOUNT);

        allKeys.add(CategoryKey.CATEGORY_ACCOUNT);

        allKeys.add(CategoryKey.CATEGORY_SYSTEM);

        allKeys.add(CategoryKey.CATEGORY_SYSTEM);

        allKeys.add(CategoryKey.CATEGORY_SYSTEM_INPUT);

        allKeys.add(CategoryKey.CATEGORY_SYSTEM_LANGUAGE);

        // DO NOT REMOVE ANYTHING ABOVE

        // DO NOT REMOVE ANYTHING ABOVE





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

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

    }

    }





}
 
}