Merge "Increasing char limit to 67 per linguists' request."
diff --git a/res/values/config.xml b/res/values/config.xml
index beeac0c..e6ada66 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -330,6 +330,9 @@
<!-- Whether device_model should be shown or not. -->
<bool name="config_show_device_model">true</bool>
+ <!-- Whether top_level_accessibility should be shown or not. -->
+ <bool name="config_show_top_level_accessibility">true</bool>
+
<!-- Whether top_level_battery should be shown or not. -->
<bool name="config_show_top_level_battery">true</bool>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index fd4b5f8..0d6eaeb 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -7092,8 +7092,8 @@
<!-- Search keyword for face settings. -->
<string name="keywords_face_settings">face</string>
- <!-- Search keyword for fingerprint settings. -->
- <string name="keywords_fingerprint_settings">fingerprint</string>
+ <!-- Search keyword for fingerprint settings. [CHAR_LIMIT=NONE]-->
+ <string name="keywords_fingerprint_settings">fingerprint, add fingerprint</string>
<!-- Search keywords for adaptive brightness setting [CHAR LIMIT=NONE]-->
<string name="keywords_display_auto_brightness">dim screen, touchscreen, battery, smart brightness, dynamic brightness</string>
diff --git a/res/xml/top_level_settings.xml b/res/xml/top_level_settings.xml
index 9f4f902..64b620a 100644
--- a/res/xml/top_level_settings.xml
+++ b/res/xml/top_level_settings.xml
@@ -123,7 +123,8 @@
android:summary="@string/accessibility_settings_summary"
android:icon="@drawable/ic_homepage_accessibility"
android:order="-20"
- android:fragment="com.android.settings.accessibility.AccessibilitySettings"/>
+ android:fragment="com.android.settings.accessibility.AccessibilitySettings"
+ settings:controller="com.android.settings.accessibility.TopLevelAccessibilityPreferenceController"/>
<Preference
android:key="top_level_system"
diff --git a/src/com/android/settings/accessibility/TopLevelAccessibilityPreferenceController.java b/src/com/android/settings/accessibility/TopLevelAccessibilityPreferenceController.java
new file mode 100644
index 0000000..41040a0
--- /dev/null
+++ b/src/com/android/settings/accessibility/TopLevelAccessibilityPreferenceController.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2019 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.accessibility;
+
+import android.content.Context;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+
+public class TopLevelAccessibilityPreferenceController extends BasePreferenceController {
+
+ public TopLevelAccessibilityPreferenceController(Context context,
+ String preferenceKey) {
+ super(context, preferenceKey);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return mContext.getResources().getBoolean(R.bool.config_show_top_level_accessibility)
+ ? AVAILABLE_UNSEARCHABLE
+ : UNSUPPORTED_ON_DEVICE;
+ }
+}
+
diff --git a/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java b/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java
index b056b20..ca8dda3 100644
--- a/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java
+++ b/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java
@@ -29,6 +29,8 @@
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
+import java.util.concurrent.Executor;
+
/*
* Abstract base controller for the default app shortcut preferences that launches the default app
* settings with the corresponding default app highlighted.
@@ -41,6 +43,8 @@
private final RoleManager mRoleManager;
+ private boolean mRoleVisible;
+
private boolean mAppQualified;
private PreferenceScreen mPreferenceScreen;
@@ -56,8 +60,13 @@
final PermissionControllerManager permissionControllerManager =
mContext.getSystemService(PermissionControllerManager.class);
- permissionControllerManager.isApplicationQualifiedForRole(mRoleName, mPackageName,
- mContext.getMainExecutor(), qualified -> {
+ final Executor executor = mContext.getMainExecutor();
+ permissionControllerManager.isRoleVisible(mRoleName, executor, visible -> {
+ mRoleVisible = visible;
+ refreshAvailability();
+ });
+ permissionControllerManager.isApplicationQualifiedForRole(mRoleName, mPackageName, executor,
+ qualified -> {
mAppQualified = qualified;
refreshAvailability();
});
@@ -85,7 +94,7 @@
if (mContext.getSystemService(UserManager.class).isManagedProfile()) {
return DISABLED_FOR_USER;
}
- return mAppQualified ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+ return mRoleVisible && mAppQualified ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
}
@Override
diff --git a/tests/robotests/res/values-mcc999/config.xml b/tests/robotests/res/values-mcc999/config.xml
index b54781d..776a4d0 100644
--- a/tests/robotests/res/values-mcc999/config.xml
+++ b/tests/robotests/res/values-mcc999/config.xml
@@ -57,6 +57,7 @@
<bool name="config_show_reset_dashboard">false</bool>
<bool name="config_show_system_update_settings">false</bool>
<bool name="config_show_device_model">false</bool>
+ <bool name="config_show_top_level_accessibility">false</bool>
<bool name="config_show_top_level_battery">false</bool>
<bool name="config_show_top_level_connected_devices">false</bool>
<bool name="config_show_top_level_display">false</bool>
diff --git a/tests/robotests/src/com/android/settings/accessibility/TopLevelAccessibilityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/TopLevelAccessibilityPreferenceControllerTest.java
new file mode 100644
index 0000000..809d8b4
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/TopLevelAccessibilityPreferenceControllerTest.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2019 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.accessibility;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+
+import com.android.settings.R;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+@RunWith(RobolectricTestRunner.class)
+public class TopLevelAccessibilityPreferenceControllerTest {
+
+ private Context mContext;
+ private TopLevelAccessibilityPreferenceController mController;
+
+ @Before
+ public void setUp() {
+ mContext = RuntimeEnvironment.application;
+ mController = new TopLevelAccessibilityPreferenceController(mContext, "test_key");
+ }
+
+ @Test
+ public void getAvailibilityStatus_availableByDefault() {
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE_UNSEARCHABLE);
+ }
+
+ @Test
+ @Config(qualifiers = "mcc999")
+ public void getAvailabilityStatus_unsupportedWhenSet() {
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java
index f3f4ca6..7b9bc25 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java
@@ -101,35 +101,72 @@
@Test
public void
- getAvailabilityStatus_noCallbackForIsApplicationNotQualifiedForRole_shouldReturnUnsupported() {
+ getAvailabilityStatus_noCallback_shouldReturnUnsupported() {
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(
+ DefaultAppShortcutPreferenceControllerBase.UNSUPPORTED_ON_DEVICE);
+ }
+
+ @Test
+ public void
+ getAvailabilityStatus_noCallbackForIsRoleNotVisible_shouldReturnUnsupported() {
+ setApplicationIsQualifiedForRole(true);
+
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(
+ DefaultAppShortcutPreferenceControllerBase.UNSUPPORTED_ON_DEVICE);
+ }
+
+ @Test
+ public void getAvailabilityStatus_RoleIsNotVisible_shouldReturnUnsupported() {
+ setRoleIsVisible(false);
+ setApplicationIsQualifiedForRole(true);
+
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(
+ DefaultAppShortcutPreferenceControllerBase.UNSUPPORTED_ON_DEVICE);
+ }
+
+ @Test
+ public void
+ getAvailabilityStatus_noCallbackForIsApplicationQualifiedForRole_shouldReturnUnsupported() {
+ setRoleIsVisible(true);
+
assertThat(mController.getAvailabilityStatus()).isEqualTo(
DefaultAppShortcutPreferenceControllerBase.UNSUPPORTED_ON_DEVICE);
}
@Test
public void getAvailabilityStatus_applicationIsNotQualifiedForRole_shouldReturnUnsupported() {
- final ArgumentCaptor<Consumer<Boolean>> callbackCaptor = ArgumentCaptor.forClass(
- Consumer.class);
- verify(mPermissionControllerManager).isApplicationQualifiedForRole(eq(TEST_ROLE_NAME), eq(
- TEST_PACKAGE_NAME), any(Executor.class), callbackCaptor.capture());
- final Consumer<Boolean> callback = callbackCaptor.getValue();
- callback.accept(false);
+ setRoleIsVisible(true);
+ setApplicationIsQualifiedForRole(false);
assertThat(mController.getAvailabilityStatus()).isEqualTo(
DefaultAppShortcutPreferenceControllerBase.UNSUPPORTED_ON_DEVICE);
}
@Test
- public void getAvailabilityStatus_applicationIsQualifiedForRole_shouldReturnAvailable() {
+ public void getAvailabilityStatus_RoleVisibleAndApplicationQualified_shouldReturnAvailable() {
+ setRoleIsVisible(true);
+ setApplicationIsQualifiedForRole(true);
+
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(
+ DefaultAppShortcutPreferenceControllerBase.AVAILABLE);
+ }
+
+ private void setRoleIsVisible(boolean visible) {
+ final ArgumentCaptor<Consumer<Boolean>> callbackCaptor = ArgumentCaptor.forClass(
+ Consumer.class);
+ verify(mPermissionControllerManager).isRoleVisible(eq(TEST_ROLE_NAME), any(Executor.class),
+ callbackCaptor.capture());
+ final Consumer<Boolean> callback = callbackCaptor.getValue();
+ callback.accept(visible);
+ }
+
+ private void setApplicationIsQualifiedForRole(boolean qualified) {
final ArgumentCaptor<Consumer<Boolean>> callbackCaptor = ArgumentCaptor.forClass(
Consumer.class);
verify(mPermissionControllerManager).isApplicationQualifiedForRole(eq(TEST_ROLE_NAME), eq(
TEST_PACKAGE_NAME), any(Executor.class), callbackCaptor.capture());
final Consumer<Boolean> callback = callbackCaptor.getValue();
- callback.accept(true);
-
- assertThat(mController.getAvailabilityStatus()).isEqualTo(
- DefaultAppShortcutPreferenceControllerBase.AVAILABLE);
+ callback.accept(qualified);
}
@Test