commit 6f21b063f80c2210a2cb9b30a3b8c575de9cfe04
author Will Leshner <wleshner@google.com> Sat Feb 08 13:47:25 2025 -0800
committer Will Leshner <wleshner@google.com> Mon Feb 10 09:57:23 2025 -0800
tree d8087fe21f3b9d9d8c24dd9ab7dc1e7477ab6aba
parent faa7bc846e87100faabd1f6389c871da615c2d01

Only show "hub mode" settings when the glanceable_hub_v2 flag is true.

Bug: 395320922
Test: atest CommunalPreferenceControllerTest
Flag: com.android.systemui.glanceable_hub_v2
Change-Id: I46e5931205a219806917fafcc1a7aac3b7046796

tests/robotests/Android.bp

diff --git a/tests/robotests/Android.bp b/tests/robotests/Android.bp
index 464d970..bb70a70 100644
--- a/tests/robotests/Android.bp
+++ b/tests/robotests/Android.bp
@@ -77,6 +77,7 @@
         "platform-test-annotations",
         "testables",
         "android.app.flags-aconfig-java",
+        "com_android_systemui_flags_lib",
     ],
 
     libs: [

tests/robotests/src/com/android/settings/communal/CommunalPreferenceControllerTest.java

diff --git a/tests/robotests/src/com/android/settings/communal/CommunalPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/communal/CommunalPreferenceControllerTest.java
index b88b1aa..cc970eb 100644
--- a/tests/robotests/src/com/android/settings/communal/CommunalPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/communal/CommunalPreferenceControllerTest.java
@@ -17,6 +17,7 @@
 package com.android.settings.communal;
 
 import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.systemui.Flags.FLAG_GLANCEABLE_HUB_V2;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -34,7 +35,6 @@
 import android.platform.test.flag.junit.SetFlagsRule;
 
 import com.android.settings.R;
-import com.android.settings.flags.Flags;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
 import com.android.settings.testutils.shadow.ShadowUserManager;
 
@@ -87,7 +87,7 @@
     }
 
     @Test
-    @EnableFlags(Flags.FLAG_ENABLE_HUB_MODE_SETTINGS_ON_MOBILE)
+    @EnableFlags(FLAG_GLANCEABLE_HUB_V2)
     public void isAvailable_communalOnMobileEnabled_shouldBeTrueForPrimaryUser() {
         setCommunalEnabled(false);
         setCommunalOnMobileEnabled(true);
@@ -96,7 +96,7 @@
     }
 
     @Test
-    @EnableFlags(Flags.FLAG_ENABLE_HUB_MODE_SETTINGS_ON_MOBILE)
+    @EnableFlags(FLAG_GLANCEABLE_HUB_V2)
     public void isAvailable_communalOnMobileEnabled_shouldBeFalseForSecondaryUser() {
         setCommunalEnabled(false);
         setCommunalOnMobileEnabled(true);
@@ -105,7 +105,7 @@
     }
 
     @Test
-    @EnableFlags(Flags.FLAG_ENABLE_HUB_MODE_SETTINGS_ON_MOBILE)
+    @EnableFlags(FLAG_GLANCEABLE_HUB_V2)
     public void isAvailable_communalOnMobileDisabled_shouldBeFalseForPrimaryUser() {
         setCommunalEnabled(false);
         setCommunalOnMobileEnabled(false);
@@ -114,8 +114,8 @@
     }
 
     @Test
-    @DisableFlags(Flags.FLAG_ENABLE_HUB_MODE_SETTINGS_ON_MOBILE)
-    public void isAvailable_hubModeSettingsOnMobileFlagDisabled_shouldBeFalseForPrimaryUser() {
+    @DisableFlags(FLAG_GLANCEABLE_HUB_V2)
+    public void isAvailable_glanceableHubV2FlagDisabled_shouldBeFalseForPrimaryUser() {
         setCommunalEnabled(false);
         setCommunalOnMobileEnabled(true);
         mShadowUserManager.setUserForeground(true);