Merge "Mass clean up: don't cast class when not needed."
diff --git a/res/layout/homepage_slice_deferred_setup_tile.xml b/res/layout/homepage_slice_deferred_setup_tile.xml
index 8c83c09..73199d4 100644
--- a/res/layout/homepage_slice_deferred_setup_tile.xml
+++ b/res/layout/homepage_slice_deferred_setup_tile.xml
@@ -32,10 +32,10 @@
android:layout_height="match_parent"
android:gravity="left"
android:orientation="vertical"
- android:paddingBottom="@dimen/homepage_deferred_setup_card_padding_bottom"
- android:paddingEnd="@dimen/homepage_card_padding_end"
android:paddingStart="@dimen/homepage_card_padding_start"
- android:paddingTop="@dimen/homepage_deferred_setup_card_padding_top">
+ android:paddingEnd="@dimen/homepage_card_padding_end"
+ android:paddingTop="@dimen/homepage_deferred_setup_card_padding_top"
+ android:paddingBottom="@dimen/homepage_deferred_setup_card_padding_bottom">
<ImageView
android:id="@android:id/icon"
diff --git a/res/layout/homepage_slice_tile.xml b/res/layout/homepage_slice_tile.xml
index 2b7c1b0..7d108e1 100644
--- a/res/layout/homepage_slice_tile.xml
+++ b/res/layout/homepage_slice_tile.xml
@@ -31,8 +31,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
- android:paddingStart="@dimen/homepage_card_padding_start"
- android:paddingEnd="@dimen/homepage_card_padding_end"/>
+ style="@style/slice_view_style"/>
<!--dismissal view-->
<include layout="@layout/homepage_dismissal_view"/>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 281389d..88f66ff 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -10636,6 +10636,15 @@
<!-- Text for permission bar chart details in Privacy page. [CHAR LIMIT=NONE] -->
<string name="permission_bar_chart_details">See all usage</string>
+ <!-- Title for the accessibility usage preference in the Privacy page. [CHAR LIMIT=NONE] -->
+ <string name="accessibility_usage_title">Accessibility usage</string>
+
+ <!-- Summary for the accessibility usage preference in the Privacy page. [CHAR LIMIT=NONE] -->
+ <plurals name="accessibility_usage_summary">
+ <item quantity="one">1 service has full access to your device</item>
+ <item quantity="other"><xliff:g id="service_count">%1$d</xliff:g> services have full access to your device</item>
+ </plurals>
+
<!-- Title for notification channel slice. [CHAR LIMIT=NONE] -->
<string name="manage_app_notification">Manage <xliff:g id="app_name" example="Settings">%1$s</xliff:g> Notifications</string>
<!-- Title for no suggested app in notification channel slice. [CHAR LIMIT=NONE] -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 323d39b..52e3e92 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -476,4 +476,36 @@
<item name="android:textSize">14sp</item>
</style>
+ <style name="slice_view_style">
+ <!-- 4dp start padding for the start icon -->
+ <item name="android:paddingStart">4dp</item>
+
+ <!-- End margin of content without end items is 24dp.
+ android:paddingEnd = 24 - 16(contentEndPadding) -->
+ <item name="android:paddingEnd">8dp</item>
+
+ <item name="rowStyle">@style/slice_row_style</item>
+ </style>
+
+ <style name="slice_row_style">
+ <item name="titleItemEndPadding">0dp</item>
+
+ <!-- Padding between content and the start icon is 12dp. -->
+ <item name="contentStartPadding">12dp</item>
+ <!-- Padding between content and end items is 16dp. -->
+ <item name="contentEndPadding">16dp</item>
+
+ <!-- Both side margins of end item are 16dp.
+ endItemEndPadding = 16 - 8(android:paddingEnd) -->
+ <item name="endItemStartPadding">16dp</item>
+ <item name="endItemEndPadding">8dp</item>
+
+ <!-- Both side margins of bottom divider are 12dp.
+ bottomDividerStartPadding = 12 - 4(android:paddingStart)
+ bottomDividerEndPadding = 12 - 8(android:paddingEnd) -->
+ <item name="bottomDividerStartPadding">8dp</item>
+ <item name="bottomDividerEndPadding">4dp</item>
+
+ <item name="actionDividerHeight">32dp</item>
+ </style>
</resources>
diff --git a/res/xml/privacy_dashboard_settings.xml b/res/xml/privacy_dashboard_settings.xml
index 44ac10a..eaca161 100644
--- a/res/xml/privacy_dashboard_settings.xml
+++ b/res/xml/privacy_dashboard_settings.xml
@@ -20,13 +20,22 @@
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="privacy_dashboard_page"
android:title="@string/privacy_dashboard_title"
- settings:initialExpandedChildrenCount="3">
+ settings:initialExpandedChildrenCount="4">
<com.android.settingslib.widget.BarChartPreference
android:key="permission_bar_chart"
android:title="@string/privacy_dashboard_title"
settings:controller="com.android.settings.privacy.PermissionBarChartPreferenceController"/>
+ <!-- Accessibility usage -->
+ <Preference
+ android:key="privacy_accessibility_usage"
+ android:title="@string/accessibility_usage_title"
+ settings:allowDividerAbove="true"
+ settings:controller="com.android.settings.privacy.AccessibilityUsagePreferenceController">
+ <intent android:action="android.intent.action.REVIEW_ACCESSIBILITY_SERVICES"/>
+ </Preference>
+
<!-- App permissions -->
<Preference
android:key="privacy_manage_perms"
diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java
index 58bc58c..8dad57f 100644
--- a/src/com/android/settings/MasterClear.java
+++ b/src/com/android/settings/MasterClear.java
@@ -65,10 +65,10 @@
import com.android.settings.password.ConfirmLockPattern;
import com.android.settingslib.RestrictedLockUtilsInternal;
+import com.google.android.setupcompat.TemplateLayout;
import com.google.android.setupcompat.template.FooterBarMixin;
import com.google.android.setupcompat.template.FooterButton;
import com.google.android.setupcompat.template.FooterButton.ButtonType;
-import com.google.android.setupdesign.GlifLayout;
import java.util.List;
@@ -416,7 +416,7 @@
return;
}
- final GlifLayout layout = mContentView.findViewById(R.id.setup_wizard_layout);
+ final TemplateLayout layout = mContentView.findViewById(R.id.setup_wizard_layout);
final FooterBarMixin mixin = layout.getMixin(FooterBarMixin.class);
mixin.setPrimaryButton(
new FooterButton.Builder(getActivity())
diff --git a/src/com/android/settings/MasterClearConfirm.java b/src/com/android/settings/MasterClearConfirm.java
index 618dd2c..c25f2af 100644
--- a/src/com/android/settings/MasterClearConfirm.java
+++ b/src/com/android/settings/MasterClearConfirm.java
@@ -44,10 +44,10 @@
import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
import com.android.settingslib.RestrictedLockUtilsInternal;
+import com.google.android.setupcompat.TemplateLayout;
import com.google.android.setupcompat.template.FooterBarMixin;
import com.google.android.setupcompat.template.FooterButton;
import com.google.android.setupcompat.template.FooterButton.ButtonType;
-import com.google.android.setupdesign.GlifLayout;
/**
* Confirm and execute a reset of the device to a clean "just out of the box"
@@ -152,7 +152,7 @@
* Configure the UI for the final confirmation interaction
*/
private void establishFinalConfirmationState() {
- final GlifLayout layout = mContentView.findViewById(R.id.setup_wizard_layout);
+ final TemplateLayout layout = mContentView.findViewById(R.id.setup_wizard_layout);
final FooterBarMixin mixin = layout.getMixin(FooterBarMixin.class);
mixin.setPrimaryButton(
diff --git a/src/com/android/settings/privacy/AccessibilityUsagePreferenceController.java b/src/com/android/settings/privacy/AccessibilityUsagePreferenceController.java
new file mode 100644
index 0000000..8aff223
--- /dev/null
+++ b/src/com/android/settings/privacy/AccessibilityUsagePreferenceController.java
@@ -0,0 +1,55 @@
+/*
+ * 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.privacy;
+
+import android.accessibilityservice.AccessibilityServiceInfo;
+import android.content.Context;
+import android.view.accessibility.AccessibilityManager;
+
+import androidx.annotation.NonNull;
+import androidx.preference.Preference;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+
+import java.util.List;
+
+
+public class AccessibilityUsagePreferenceController extends BasePreferenceController {
+
+ private final @NonNull List<AccessibilityServiceInfo> mEnabledServiceInfos;
+
+ public AccessibilityUsagePreferenceController(Context context, String preferenceKey) {
+ super(context, preferenceKey);
+
+ final AccessibilityManager accessibilityManager = context.getSystemService(
+ AccessibilityManager.class);
+ mEnabledServiceInfos = accessibilityManager.getEnabledAccessibilityServiceList(
+ AccessibilityServiceInfo.FEEDBACK_ALL_MASK);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return mEnabledServiceInfos.isEmpty() ? UNSUPPORTED_ON_DEVICE : AVAILABLE;
+ }
+
+ @Override
+ public CharSequence getSummary() {
+ return mContext.getResources().getQuantityString(R.plurals.accessibility_usage_summary,
+ mEnabledServiceInfos.size(), mEnabledServiceInfos.size());
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/privacy/AccessibilityUsagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/privacy/AccessibilityUsagePreferenceControllerTest.java
new file mode 100644
index 0000000..1033446
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/privacy/AccessibilityUsagePreferenceControllerTest.java
@@ -0,0 +1,77 @@
+/*
+ * 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.privacy;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
+
+import static com.google.common.truth.Truth.assertThat;
+import android.accessibilityservice.AccessibilityServiceInfo;
+import android.content.Context;
+import android.view.accessibility.AccessibilityManager;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.shadow.api.Shadow;
+import org.robolectric.shadows.ShadowAccessibilityManager;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+@RunWith(RobolectricTestRunner.class)
+public class AccessibilityUsagePreferenceControllerTest {
+
+ private Context mContext;
+ private ShadowAccessibilityManager mAccessibilityManager;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.application;
+ mAccessibilityManager = Shadow.extract(
+ RuntimeEnvironment.application.getSystemService(AccessibilityManager.class));
+ }
+
+ @After
+ public void tearDown() {
+ ShadowAccessibilityManager.reset();
+ }
+
+ @Test
+ public void getAvailabilityStatus_noEnabledServices_shouldReturnUnsupported() {
+ mAccessibilityManager.setEnabledAccessibilityServiceList(new ArrayList<>());
+ AccessibilityUsagePreferenceController controller =
+ new AccessibilityUsagePreferenceController(mContext, "test_key");
+
+ assertThat(controller.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
+ }
+
+ @Test
+ public void getAvailabilityStatus_enabledServices_shouldReturnAvailableUnsearchable() {
+ mAccessibilityManager.setEnabledAccessibilityServiceList(
+ new ArrayList<>(Arrays.asList(new AccessibilityServiceInfo())));
+ AccessibilityUsagePreferenceController controller =
+ new AccessibilityUsagePreferenceController(mContext, "test_key");
+
+ assertThat(controller.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+ }
+}