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

Commit 3bec62c0 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

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

parents f5b9f2de 1c683fba

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);

    }

}