Merge "Fix the UI in the left side & right side inconsistent problem" into udc-dev (91053048) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/network/TopLevelNetworkEntryPreferenceController.java

+6 −1

Original line number	Diff line number	Diff line
		@@ -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

+3 −1

Original line number	Diff line number	Diff line
		@@ -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);
		}