Add temporary link to PermissionController for new default apps UI.
This change adds a temporary link in the default apps settings to allow launching the new default apps UI in PermissionController during the process we migrate default apps to use roles. Bug: 110557011 Test: manually tested the UI Change-Id: I0ac340acd5a077c74b48b28c97f517adb2084a36
This commit is contained in:
@@ -8389,6 +8389,12 @@
|
|||||||
<!-- Title for Default Phone app settings [CHAR LIMIT=30] -->
|
<!-- Title for Default Phone app settings [CHAR LIMIT=30] -->
|
||||||
<string name="default_phone_title">Phone app</string>
|
<string name="default_phone_title">Phone app</string>
|
||||||
|
|
||||||
|
<!--
|
||||||
|
~ STOPSHIP(b/110557011): Remove once the new UI is ready.
|
||||||
|
-->
|
||||||
|
<!-- Title for Roles settings [CHAR LIMIT=30] -->
|
||||||
|
<string name="roles_title">Roles</string>
|
||||||
|
|
||||||
<!-- Label of default app for current setting [CHAR LIMIT=40] -->
|
<!-- Label of default app for current setting [CHAR LIMIT=40] -->
|
||||||
<string name="default_app">(Default)</string>
|
<string name="default_app">(Default)</string>
|
||||||
|
|
||||||
|
@@ -79,6 +79,14 @@
|
|||||||
android:fragment="com.android.settings.applications.managedomainurls.ManageDomainUrls"
|
android:fragment="com.android.settings.applications.managedomainurls.ManageDomainUrls"
|
||||||
settings:keywords="@string/keywords_default_links"/>
|
settings:keywords="@string/keywords_default_links"/>
|
||||||
|
|
||||||
|
<!--
|
||||||
|
~ STOPSHIP(b/110557011): Remove once the new UI is ready.
|
||||||
|
-->
|
||||||
|
<Preference
|
||||||
|
android:key="roles"
|
||||||
|
android:title="@string/roles_title"
|
||||||
|
settings:controller="com.android.settings.applications.defaultapps.RolesPreferenceController" />
|
||||||
|
|
||||||
<com.android.settings.widget.WorkOnlyCategory
|
<com.android.settings.widget.WorkOnlyCategory
|
||||||
android:key="work_app_defaults"
|
android:key="work_app_defaults"
|
||||||
android:title="@string/default_for_work">
|
android:title="@string/default_for_work">
|
||||||
|
@@ -0,0 +1,62 @@
|
|||||||
|
/*
|
||||||
|
* 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.applications.defaultapps;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.content.Intent;
|
||||||
|
import android.content.pm.PackageManager;
|
||||||
|
import android.provider.Settings;
|
||||||
|
import android.text.TextUtils;
|
||||||
|
|
||||||
|
import androidx.preference.Preference;
|
||||||
|
|
||||||
|
import com.android.settings.core.BasePreferenceController;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* STOPSHIP(b/110557011): Remove once the new UI is ready.
|
||||||
|
*/
|
||||||
|
public class RolesPreferenceController extends BasePreferenceController {
|
||||||
|
|
||||||
|
private Intent mIntent;
|
||||||
|
|
||||||
|
public RolesPreferenceController(Context context, String preferenceKey) {
|
||||||
|
super(context, preferenceKey);
|
||||||
|
|
||||||
|
PackageManager packageManager = context.getPackageManager();
|
||||||
|
String packageName = packageManager.getPermissionControllerPackageName();
|
||||||
|
if (packageName != null) {
|
||||||
|
mIntent = new Intent(Settings.ACTION_MANAGE_DEFAULT_APPS_SETTINGS)
|
||||||
|
.setPackage(packageName);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getAvailabilityStatus() {
|
||||||
|
return mIntent != null ? AVAILABLE_UNSEARCHABLE : UNSUPPORTED_ON_DEVICE;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean handlePreferenceTreeClick(Preference preference) {
|
||||||
|
if (TextUtils.equals(preference.getKey(), mPreferenceKey)) {
|
||||||
|
if (mIntent != null) {
|
||||||
|
mContext.startActivity(mIntent);
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,136 @@
|
|||||||
|
/*
|
||||||
|
* 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.applications.defaultapps;
|
||||||
|
|
||||||
|
import static com.google.common.truth.Truth.assertThat;
|
||||||
|
|
||||||
|
import static org.mockito.ArgumentMatchers.any;
|
||||||
|
import static org.mockito.Mockito.mock;
|
||||||
|
import static org.mockito.Mockito.never;
|
||||||
|
import static org.mockito.Mockito.verify;
|
||||||
|
import static org.mockito.Mockito.when;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.content.Intent;
|
||||||
|
import android.content.pm.PackageManager;
|
||||||
|
import android.provider.Settings;
|
||||||
|
|
||||||
|
import androidx.preference.Preference;
|
||||||
|
|
||||||
|
import com.android.settings.core.BasePreferenceController;
|
||||||
|
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||||
|
|
||||||
|
import org.junit.Before;
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.runner.RunWith;
|
||||||
|
import org.mockito.ArgumentCaptor;
|
||||||
|
import org.mockito.Mock;
|
||||||
|
import org.mockito.MockitoAnnotations;
|
||||||
|
|
||||||
|
@RunWith(SettingsRobolectricTestRunner.class)
|
||||||
|
public class RolesPreferenceControllerTest {
|
||||||
|
|
||||||
|
private static final String PREFERENCE_KEY = "roles";
|
||||||
|
private static final String DIFFERENT_PREFERENCE_KEY = "different";
|
||||||
|
private static final String PERMISSION_CONTROLLER_PACKAGE_NAME =
|
||||||
|
"com.android.permissioncontroller";
|
||||||
|
|
||||||
|
@Mock
|
||||||
|
private Context mContext;
|
||||||
|
@Mock
|
||||||
|
private PackageManager mPackageManager;
|
||||||
|
|
||||||
|
@Before
|
||||||
|
public void setUp() {
|
||||||
|
MockitoAnnotations.initMocks(this);
|
||||||
|
when(mContext.getPackageManager()).thenReturn(mPackageManager);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void getAvailabilityStatus_noPermissionController_shouldReturnUnsupportedOnDevice() {
|
||||||
|
when(mPackageManager.getPermissionControllerPackageName()).thenReturn(null);
|
||||||
|
RolesPreferenceController controller = new RolesPreferenceController(mContext,
|
||||||
|
PREFERENCE_KEY);
|
||||||
|
|
||||||
|
assertThat(controller.getAvailabilityStatus())
|
||||||
|
.isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void getAvailabilityStatus_hasPermissionController_shouldReturnAvailableUnsearchable() {
|
||||||
|
when(mPackageManager.getPermissionControllerPackageName())
|
||||||
|
.thenReturn(PERMISSION_CONTROLLER_PACKAGE_NAME);
|
||||||
|
RolesPreferenceController controller = new RolesPreferenceController(mContext,
|
||||||
|
PREFERENCE_KEY);
|
||||||
|
|
||||||
|
assertThat(controller.getAvailabilityStatus())
|
||||||
|
.isEqualTo(BasePreferenceController.AVAILABLE_UNSEARCHABLE);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void handlePreferenceTreeClick_differentKey_shouldReturnFalse() {
|
||||||
|
when(mPackageManager.getPermissionControllerPackageName())
|
||||||
|
.thenReturn(PERMISSION_CONTROLLER_PACKAGE_NAME);
|
||||||
|
RolesPreferenceController controller = new RolesPreferenceController(mContext,
|
||||||
|
PREFERENCE_KEY);
|
||||||
|
Preference preference = mock(Preference.class);
|
||||||
|
when(preference.getKey()).thenReturn(DIFFERENT_PREFERENCE_KEY);
|
||||||
|
|
||||||
|
assertThat(controller.handlePreferenceTreeClick(preference)).isFalse();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void handlePreferenceTreeClick_sameKey_shouldReturnTrue() {
|
||||||
|
when(mPackageManager.getPermissionControllerPackageName())
|
||||||
|
.thenReturn(PERMISSION_CONTROLLER_PACKAGE_NAME);
|
||||||
|
RolesPreferenceController controller = new RolesPreferenceController(mContext,
|
||||||
|
PREFERENCE_KEY);
|
||||||
|
Preference preference = mock(Preference.class);
|
||||||
|
when(preference.getKey()).thenReturn(PREFERENCE_KEY);
|
||||||
|
|
||||||
|
assertThat(controller.handlePreferenceTreeClick(preference)).isTrue();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void handlePreferenceTreeClick_noPermissionController_shouldNotStartActivity() {
|
||||||
|
when(mPackageManager.getPermissionControllerPackageName()).thenReturn(null);
|
||||||
|
RolesPreferenceController controller = new RolesPreferenceController(mContext,
|
||||||
|
PREFERENCE_KEY);
|
||||||
|
Preference preference = mock(Preference.class);
|
||||||
|
when(preference.getKey()).thenReturn(PREFERENCE_KEY);
|
||||||
|
controller.handlePreferenceTreeClick(preference);
|
||||||
|
|
||||||
|
verify(mContext, never()).startActivity(any(Intent.class));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void handlePreferenceTreeClick_hasPermissionController_shouldStartActivityWithIntent() {
|
||||||
|
when(mPackageManager.getPermissionControllerPackageName())
|
||||||
|
.thenReturn(PERMISSION_CONTROLLER_PACKAGE_NAME);
|
||||||
|
RolesPreferenceController controller = new RolesPreferenceController(mContext,
|
||||||
|
PREFERENCE_KEY);
|
||||||
|
Preference preference = mock(Preference.class);
|
||||||
|
when(preference.getKey()).thenReturn(PREFERENCE_KEY);
|
||||||
|
controller.handlePreferenceTreeClick(preference);
|
||||||
|
ArgumentCaptor<Intent> intent = ArgumentCaptor.forClass(Intent.class);
|
||||||
|
|
||||||
|
verify(mContext).startActivity(intent.capture());
|
||||||
|
assertThat(intent.getValue().getAction())
|
||||||
|
.isEqualTo(Settings.ACTION_MANAGE_DEFAULT_APPS_SETTINGS);
|
||||||
|
assertThat(intent.getValue().getPackage()).isEqualTo(PERMISSION_CONTROLLER_PACKAGE_NAME);
|
||||||
|
}
|
||||||
|
}
|
Reference in New Issue
Block a user