Make "Action not allowed" dialog compliant with Material Spec and replace full screen activities with the dialog.
Bug: 64893948 Test: make ROBOTEST_FILTER=ActionDisabledByAdminDialogTest -j40 RunSettingsRoboTests Test: make ROBOTEST_FILTER=ActionDisabledByAdminDialogHelperTest -j40 RunSettingsRoboTests Change-Id: I9308d8d86a3789b8f2c92b9f4f20cf00cce71d14
This commit is contained in:
committed by
Antoan Angelov
parent
22a39c2b93
commit
e35badd9d5
@@ -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));
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user