Merge "Make "Action not allowed" dialog compliant with Material Spec and replace full screen activities with the dialog." into pi-dev

tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelperTest.java

@@ -0,0 +1,186 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.enterprise;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import android.app.Activity;
+import android.app.admin.DevicePolicyManager;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.content.pm.UserInfo;
+import android.os.Process;
+import android.os.UserManager;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import android.widget.TextView;
+
+import com.android.settings.DeviceAdminAdd;
+import com.android.settings.R;
+import com.android.settings.Settings;
+import com.android.settings.testutils.CustomActivity;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowActivity;
+import com.android.settings.testutils.shadow.ShadowDevicePolicyManager;
+import com.android.settings.testutils.shadow.ShadowProcess;
+import com.android.settings.testutils.shadow.ShadowUserManager;
+import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.Shadows;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadow.api.Shadow;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(shadows = {
+        ShadowDevicePolicyManager.class,
+        ShadowUserManager.class,
+        ShadowActivity.class,
+        ShadowProcess.class
+})
+public class ActionDisabledByAdminDialogHelperTest {
+    private ActionDisabledByAdminDialogHelper mHelper;
+    private Activity mActivity;
+    private org.robolectric.shadows.ShadowActivity mActivityShadow;
+
+    @Before
+    public void setUp() {
+        mActivity = Robolectric.buildActivity(CustomActivity.class).get();
+        mActivityShadow = Shadow.extract(mActivity);
+        mHelper = new ActionDisabledByAdminDialogHelper(mActivity);
+    }
+
+    @Test
+    public void testShowAdminPoliciesWithComponent() {
+        final int userId = 123;
+        final ComponentName component = new ComponentName("some.package.name",
+                "some.package.name.SomeClass");
+        final EnforcedAdmin admin = new EnforcedAdmin(component, userId);
+
+        mHelper.showAdminPolicies(admin, mActivity);
+
+        final Intent intent = mActivityShadow.getNextStartedActivity();
+        assertTrue(
+                intent.getBooleanExtra(DeviceAdminAdd.EXTRA_CALLED_FROM_SUPPORT_DIALOG, false));
+        assertEquals(component,
+                intent.getParcelableExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN));
+    }
+
+    @Test
+    public void testShowAdminPoliciesWithoutComponent() {
+        final int userId = 123;
+        final EnforcedAdmin admin = new EnforcedAdmin(null, userId);
+        mHelper.showAdminPolicies(admin, mActivity);
+        final Intent intent = mActivityShadow.getNextStartedActivity();
+        assertEquals(intent.getComponent(), new ComponentName(mActivity,
+                        Settings.DeviceAdminSettingsActivity.class.getName()));
+    }
+
+    @Test
+    public void testSetAdminSupportTitle() {
+        final ViewGroup view = new FrameLayout(mActivity);
+        final TextView textView = new TextView(mActivity);
+        textView.setId(R.id.admin_support_dialog_title);
+        view.addView(textView);
+
+        mHelper.setAdminSupportTitle(view, UserManager.DISALLOW_ADJUST_VOLUME);
+        assertEquals(Shadows.shadowOf(textView).innerText(),
+                mActivity.getString(R.string.disabled_by_policy_title_adjust_volume));
+
+        mHelper.setAdminSupportTitle(view, UserManager.DISALLOW_OUTGOING_CALLS);
+        assertEquals(Shadows.shadowOf(textView).innerText(),
+                mActivity.getString(R.string.disabled_by_policy_title_outgoing_calls));
+
+        mHelper.setAdminSupportTitle(view, UserManager.DISALLOW_SMS);
+        assertEquals(Shadows.shadowOf(textView).innerText(),
+                mActivity.getString(R.string.disabled_by_policy_title_sms));
+
+        mHelper.setAdminSupportTitle(view, DevicePolicyManager.POLICY_DISABLE_CAMERA);
+        assertEquals(Shadows.shadowOf(textView).innerText(),
+                mActivity.getString(R.string.disabled_by_policy_title_camera));
+
+        mHelper.setAdminSupportTitle(view, DevicePolicyManager.POLICY_DISABLE_SCREEN_CAPTURE);
+        assertEquals(Shadows.shadowOf(textView).innerText(),
+                mActivity.getString(R.string.disabled_by_policy_title_screen_capture));
+
+        mHelper.setAdminSupportTitle(view, DevicePolicyManager.POLICY_MANDATORY_BACKUPS);
+        assertEquals(Shadows.shadowOf(textView).innerText(),
+                mActivity.getString(R.string.disabled_by_policy_title_turn_off_backups));
+
+        mHelper.setAdminSupportTitle(view, "another restriction");
+        assertEquals(Shadows.shadowOf(textView).innerText(),
+                mActivity.getString(R.string.disabled_by_policy_title));
+
+        mHelper.setAdminSupportTitle(view, null);
+        assertEquals(Shadows.shadowOf(textView).innerText(),
+                mActivity.getString(R.string.disabled_by_policy_title));
+    }
+
+    @Test
+    public void testSetAdminSupportDetails() {
+        final DevicePolicyManager dpm = RuntimeEnvironment.application.getSystemService(
+                DevicePolicyManager.class);
+        final ShadowDevicePolicyManager dpmShadow = Shadow.extract(dpm);
+        final UserManager userManager = RuntimeEnvironment.application.getSystemService(
+                UserManager.class);
+        final ShadowUserManager userManagerShadow = Shadow.extract(userManager);
+        final ViewGroup view = new FrameLayout(mActivity);
+        final ComponentName component = new ComponentName("some.package.name",
+                "some.package.name.SomeClass");
+        final EnforcedAdmin admin = new EnforcedAdmin(component, 123);
+        final TextView textView = new TextView(mActivity);
+
+        textView.setId(R.id.admin_support_msg);
+        view.addView(textView);
+        dpmShadow.setShortSupportMessageForUser(component, 123, "some message");
+        dpmShadow.setIsAdminActiveAsUser(true);
+        userManagerShadow.addProfile(new UserInfo(123, null, 0));
+        ShadowProcess.setMyUid(Process.SYSTEM_UID);
+
+        mHelper.setAdminSupportDetails(mActivity, view, admin);
+        assertNotNull(admin.component);
+        assertEquals("some message", Shadows.shadowOf(textView).innerText());
+    }
+
+    @Test
+    public void testSetAdminSupportDetailsNotAdmin() {
+        final DevicePolicyManager dpm = RuntimeEnvironment.application.getSystemService(
+                DevicePolicyManager.class);
+        final ShadowDevicePolicyManager dpmShadow = Shadow.extract(dpm);
+        final UserManager userManager = RuntimeEnvironment.application.getSystemService(
+                UserManager.class);
+        final ShadowUserManager userManagerShadow = Shadow.extract(userManager);
+        final ComponentName component = new ComponentName("some.package.name",
+                "some.package.name.SomeClass");
+        final EnforcedAdmin admin = new EnforcedAdmin(component, 123);
+
+        dpmShadow.setShortSupportMessageForUser(component, 123, "some message");
+        dpmShadow.setIsAdminActiveAsUser(false);
+        userManagerShadow.addProfile(new UserInfo(123, null, 0));
+
+        mHelper.setAdminSupportDetails(mActivity, null, admin);
+        assertNull(admin.component);
+    }
+}
+

tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogTest.java

@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.enterprise;
+
+import android.app.admin.DevicePolicyManager;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.os.UserHandle;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class ActionDisabledByAdminDialogTest {
+
+    private ActionDisabledByAdminDialog mDialog;
+
+    @Before
+    public void setUp() {
+        mDialog = new ActionDisabledByAdminDialog();
+    }
+
+    @Test
+    public void testGetAdminDetailsFromIntent() {
+        final int userId = 123;
+        final ComponentName component = new ComponentName("com.some.package", ".SomeClass");
+        final EnforcedAdmin expectedAdmin = new EnforcedAdmin(component, userId);
+
+        final Intent intent = new Intent();
+        intent.putExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN, component);
+        intent.putExtra(Intent.EXTRA_USER_ID, userId);
+        Assert.assertEquals(expectedAdmin, mDialog.getAdminDetailsFromIntent(intent));
+    }
+
+    @Test
+    public void testGetAdminDetailsFromNullIntent() {
+        final int userId = UserHandle.myUserId();
+        final EnforcedAdmin expectedAdmin = new EnforcedAdmin(null, userId);
+
+        Assert.assertEquals(expectedAdmin, mDialog.getAdminDetailsFromIntent(null));
+    }
+
+    @Test
+    public void testGetRestrictionFromIntent() {
+        final String restriction = "someRestriction";
+        final Intent intent = new Intent();
+
+        intent.putExtra(DevicePolicyManager.EXTRA_RESTRICTION, restriction);
+        Assert.assertEquals(restriction, mDialog.getRestrictionFromIntent(intent));
+    }
+
+    @Test
+    public void testGetRestrictionFromNullIntent() {
+        Assert.assertEquals(null, mDialog.getRestrictionFromIntent(null));
+    }
+}

tests/robotests/src/com/android/settings/testutils/CustomActivity.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.testutils;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.UserHandle;
+
+public class CustomActivity extends Activity {
+    @Override
+    public void startActivityAsUser(Intent intent, UserHandle user) {}
+}

tests/robotests/src/com/android/settings/testutils/shadow/ShadowActivity.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.testutils.shadow;
+
+import android.content.Intent;
+import android.os.UserHandle;
+
+import com.android.settings.testutils.CustomActivity;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+import org.robolectric.shadows.ShadowApplication;
+
+@Implements(CustomActivity.class)
+public class ShadowActivity extends org.robolectric.shadows.ShadowActivity {
+
+    @Implementation
+    public void startActivityAsUser(Intent intent, UserHandle user) {
+        ShadowApplication.getInstance().startActivity(intent);
+    }
+}

tests/robotests/src/com/android/settings/testutils/shadow/ShadowDevicePolicyManager.java

@@ -0,0 +1,41 @@
+package com.android.settings.testutils.shadow;
+
+import android.annotation.NonNull;
+import android.annotation.Nullable;
+import android.app.admin.DevicePolicyManager;
+import android.content.ComponentName;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * This shadow if using {@link ShadowDevicePolicyManagerWrapper} is not possible.
+ */
+@Implements(DevicePolicyManager.class)
+public class ShadowDevicePolicyManager extends org.robolectric.shadows.ShadowDevicePolicyManager {
+    private Map<Integer, CharSequence> mSupportMessagesMap = new HashMap<>();
+    private boolean mIsAdminActiveAsUser = false;
+
+    public void setShortSupportMessageForUser(ComponentName admin, int userHandle, String message) {
+        mSupportMessagesMap.put(Objects.hash(admin, userHandle), message);
+    }
+
+    @Implementation
+    public @Nullable CharSequence getShortSupportMessageForUser(@NonNull ComponentName admin,
+            int userHandle) {
+        return mSupportMessagesMap.get(Objects.hash(admin, userHandle));
+    }
+
+    @Implementation
+    public boolean isAdminActiveAsUser(@NonNull ComponentName admin, int userId) {
+        return mIsAdminActiveAsUser;
+    }
+
+    public void setIsAdminActiveAsUser(boolean active) {
+        mIsAdminActiveAsUser = active;
+    }
+}

tests/robotests/src/com/android/settings/testutils/shadow/ShadowProcess.java

@@ -0,0 +1,18 @@
+package com.android.settings.testutils.shadow;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+@Implements(android.os.Process.class)
+public class ShadowProcess {
+    private static int sUid;
+
+    public static void setMyUid(int uid) {
+        sUid = uid;
+    }
+
+    @Implementation
+    public static int myUid() {
+        return sUid;
+    }
+}

tests/robotests/src/com/android/settings/testutils/shadow/ShadowUserManager.java

@@ -17,7 +17,6 @@
 package com.android.settings.testutils.shadow;
 
 import android.annotation.UserIdInt;
-import android.content.Context;
 import android.content.pm.UserInfo;
 import android.os.UserHandle;
 import android.os.UserManager;
@@ -31,7 +30,6 @@ import org.robolectric.annotation.Resetter;
 import org.robolectric.shadow.api.Shadow;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -42,10 +40,12 @@ public class ShadowUserManager extends org.robolectric.shadows.ShadowUserManager
     private SparseArray<UserInfo> mUserInfos = new SparseArray<>();
     private final List<String> mRestrictions = new ArrayList<>();
     private final Map<String, List<EnforcingUser>> mRestrictionSources = new HashMap<>();
+    private List<UserInfo> mUserProfileInfos = new ArrayList<>();
 
     @Resetter
     public void reset() {
         mRestrictions.clear();
+        mUserProfileInfos.clear();
     }
 
     public void setUserInfo(int userHandle, UserInfo userInfo) {
@@ -57,9 +57,13 @@ public class ShadowUserManager extends org.robolectric.shadows.ShadowUserManager
         return mUserInfos.get(userHandle);
     }
 
+    public void addProfile(UserInfo userInfo) {
+        mUserProfileInfos.add(userInfo);
+    }
+
     @Implementation
     public List<UserInfo> getProfiles(@UserIdInt int userHandle) {
-        return Collections.emptyList();
+        return mUserProfileInfos;
     }
 
     @Implementation