From aeb42d143878112009fec9093acc0563f0ce0e0d Mon Sep 17 00:00:00 2001 From: Sunny Shao Date: Wed, 3 May 2023 19:47:58 +0800 Subject: [PATCH] Fix the UI in the left side & right side inconsistent problem - Let the homepage show "Network & Internet" item in demo mode on large screen device. Fixes: 276157240 Test: atest TopLevelNetworkEntryPreferenceControllerTest Change-Id: Ife8bce28e6bc47caf3f06b1027579ea0e52172a3 --- .../network/TopLevelNetworkEntryPreferenceController.java | 7 ++++++- .../TopLevelNetworkEntryPreferenceControllerTest.java | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/network/TopLevelNetworkEntryPreferenceController.java b/src/com/android/settings/network/TopLevelNetworkEntryPreferenceController.java index 868c79ec77a..a5c19adcd99 100644 --- a/src/com/android/settings/network/TopLevelNetworkEntryPreferenceController.java +++ b/src/com/android/settings/network/TopLevelNetworkEntryPreferenceController.java @@ -21,6 +21,7 @@ import android.text.BidiFormatter; import com.android.settings.R; import com.android.settings.Utils; +import com.android.settings.activityembedding.ActivityEmbeddingUtils; import com.android.settings.core.BasePreferenceController; public class TopLevelNetworkEntryPreferenceController extends BasePreferenceController { @@ -34,7 +35,11 @@ public class TopLevelNetworkEntryPreferenceController extends BasePreferenceCont @Override public int getAvailabilityStatus() { - return Utils.isDemoUser(mContext) ? UNSUPPORTED_ON_DEVICE : AVAILABLE; + // TODO(b/281597506): Update the ActivityEmbeddingUtils.isEmbeddingActivityEnabled + // while getting the new API. + return (Utils.isDemoUser(mContext) + && !ActivityEmbeddingUtils.isEmbeddingActivityEnabled(mContext)) + ? UNSUPPORTED_ON_DEVICE : AVAILABLE; } @Override diff --git a/tests/robotests/src/com/android/settings/network/TopLevelNetworkEntryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/TopLevelNetworkEntryPreferenceControllerTest.java index a2bac8511cf..43b961c18ff 100644 --- a/tests/robotests/src/com/android/settings/network/TopLevelNetworkEntryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/TopLevelNetworkEntryPreferenceControllerTest.java @@ -25,6 +25,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserManager; import android.text.BidiFormatter; +import android.util.FeatureFlagUtils; import com.android.settings.R; import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal; @@ -73,8 +74,9 @@ public class TopLevelNetworkEntryPreferenceControllerTest { } @Test - public void getAvailabilityStatus_demoUser_unsupported() { + public void getAvailabilityStatus_demoUser_nonLargeScreen_unsupported() { ShadowUtils.setIsDemoUser(true); + FeatureFlagUtils.setEnabled(mContext, "settings_support_large_screen", false); assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE); }