Merge "Only show "hub mode" settings when the glanceable_hub_v2 flag is true." into main (e732852c) · Commits · e / os / android_packages_apps_Settings

Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -115,6 +115,7 @@ android_library {
		"device_policy_aconfig_flags_lib",
		"keyboard_flags_lib",
		"settings_connectivity_flags",
		"com_android_systemui_flags_lib",
		],

		plugins: [

src/com/android/settings/communal/CommunalPreferenceController.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@ import android.content.Context;
		import com.android.settings.R;
		import com.android.settings.Utils;
		import com.android.settings.core.BasePreferenceController;
		import com.android.settings.flags.Flags;

		/**
		* Controls the top-level Communal settings preference.
		@@ -40,14 +39,15 @@ public class CommunalPreferenceController extends BasePreferenceController {
		* Returns whether communal preferences are available.
		*/
		public static boolean isAvailable(Context context) {
		if (context.getResources().getBoolean(R.bool.config_show_communal_settings)) {
		return Utils.canCurrentUserDream(context);
		if (!Utils.canCurrentUserDream(context)) {
		return false;
		}

		if (context.getResources().getBoolean(R.bool.config_show_communal_settings_mobile)) {
		return Flags.enableHubModeSettingsOnMobile() && Utils.canCurrentUserDream(context);
		if (context.getResources().getBoolean(R.bool.config_show_communal_settings)) {
		return true;
		}

		return false;
		return com.android.systemui.Flags.glanceableHubV2()
		&& context.getResources().getBoolean(R.bool.config_show_communal_settings_mobile);
		}
		}

tests/robotests/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -77,6 +77,7 @@ android_robolectric_test {
		"platform-test-annotations",
		"testables",
		"android.app.flags-aconfig-java",
		"com_android_systemui_flags_lib",
		],

		libs: [

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

+6 −6

Original line number	Diff line number	Diff line
		@@ -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.annotations.EnableFlags;
		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 @@ public class CommunalPreferenceControllerTest {
		}

		@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 @@ public class CommunalPreferenceControllerTest {
		}

		@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 @@ public class CommunalPreferenceControllerTest {
		}

		@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 @@ public class CommunalPreferenceControllerTest {
		}

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