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

Commit ac7f50eb authored by Darrell Shi's avatar Darrell Shi Committed by Automerger Merge Worker
Browse files

Merge "Add communal settings category key." into tm-qpr-dev am: 8118ea49 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20737688



Change-Id: I92b2f4726c30d488667d85c3c6e7c264ac33d9ef
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7e2ee156 8118ea49

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

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

    public static final String CATEGORY_SMART_BATTERY_SETTINGS =

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

    public static final String CATEGORY_COMMUNAL_SETTINGS =

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



    public static final Map<String, String> KEY_COMPAT_MAP;

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

+2 −1
Original line number Diff line number Diff line
@@ -60,8 +60,9 @@ public class CategoryKeyTest { 
        allKeys.add(CategoryKey.CATEGORY_GESTURES);

        allKeys.add(CategoryKey.CATEGORY_NIGHT_DISPLAY);

        allKeys.add(CategoryKey.CATEGORY_SMART_BATTERY_SETTINGS);

        allKeys.add(CategoryKey.CATEGORY_COMMUNAL_SETTINGS);

        // DO NOT REMOVE ANYTHING ABOVE



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

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

    }

}