summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2018-03-28 19:52:15 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-03-28 19:52:15 +0000
commit08067b18398c5a8e1d4897bc02906eca38b642ae (patch)
treecc4eaa8e200944910905bffaaace615d1392e161
parent61b4e5e1723c94753aa5ad5ff906399836a150d9 (diff)
parent41a702664d99255bc808ba30a7d902feddb9b861 (diff)
downloadandroid_packages_apps_PackageInstaller-08067b18398c5a8e1d4897bc02906eca38b642ae.tar.gz
android_packages_apps_PackageInstaller-08067b18398c5a8e1d4897bc02906eca38b642ae.tar.bz2
android_packages_apps_PackageInstaller-08067b18398c5a8e1d4897bc02906eca38b642ae.zip
Merge "Properly define info button in App Permissions" into pi-dev
-rw-r--r--res/drawable/ic_info_outline.xml8
-rw-r--r--res/layout/header.xml1
-rw-r--r--res/values/strings.xml3
3 files changed, 6 insertions, 6 deletions
diff --git a/res/drawable/ic_info_outline.xml b/res/drawable/ic_info_outline.xml
index 029ff1b5..86597586 100644
--- a/res/drawable/ic_info_outline.xml
+++ b/res/drawable/ic_info_outline.xml
@@ -17,12 +17,8 @@ Copyright (C) 2015 The Android Open Source Project
android:width="24.0dp"
android:height="24.0dp"
android:viewportWidth="24.0"
- android:viewportHeight="24.0"
- android:tint="?attr/colorControlNormal">
+ android:viewportHeight="24.0">
<path
- android:pathData="M0 0h24v24H0z"
- android:fillColor="#00000000"/>
- <path
- android:fillColor="#FFFFFFFF"
+ android:fillColor="?android:attr/colorAccent"
android:pathData="M11.0,17.0l2.0,0.0l0.0,-6.0l-2.0,0.0l0.0,6.0zm1.0,-15.0C6.48,2.0 2.0,6.48 2.0,12.0s4.48,10.0 10.0,10.0 10.0,-4.48 10.0,-10.0S17.52,2.0 12.0,2.0zm0.0,18.0c-4.41,0.0 -8.0,-3.59 -8.0,-8.0s3.59,-8.0 8.0,-8.0 8.0,3.59 8.0,8.0 -3.59,8.0 -8.0,8.0zM11.0,9.0l2.0,0.0L13.0,7.0l-2.0,0.0l0.0,2.0z"/>
</vector>
diff --git a/res/layout/header.xml b/res/layout/header.xml
index 1c42476b..45e6972c 100644
--- a/res/layout/header.xml
+++ b/res/layout/header.xml
@@ -48,6 +48,7 @@
android:minWidth="0dp"
android:scaleType="center"
android:src="@drawable/ic_info_outline"
+ android:contentDescription="@string/app_permissions_info_button_label"
style="?android:attr/borderlessButtonStyle" />
</RelativeLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ea28de68..8a2f878b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -231,6 +231,9 @@
<!-- Label for button that leads to more permissions [CHAR LIMIT=40] -->
<string name="additional_permissions">Additional permissions</string>
+ <!-- Accessibility label for button opening the app-info when clicked [CHAR LIMIT=none] -->
+ <string name="app_permissions_info_button_label">Open app info</string>
+
<!-- Description of how many more permissions to view on next page [CHAR LIMIT=30] -->
<plurals name="additional_permissions_more">
<item quantity="one"><xliff:g id="count" example="1">%1$d</xliff:g> more</item>