diff options
author | Todd Volkert <tvolkert@google.com> | 2015-06-24 17:59:36 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-24 17:59:36 +0000 |
commit | e26f22699bfd14f25ba50f7ef29bd746a2d9d8d0 (patch) | |
tree | 74e505bd1c9af9f8859bd01dc7ce510fc9ce10c3 /res | |
parent | 41f70997f384abd98e4a43d6100623ad2bf79e84 (diff) | |
parent | f9ffffb3b507a797ad1ead81cbff5f4935956e4c (diff) | |
download | android_packages_apps_PackageInstaller-e26f22699bfd14f25ba50f7ef29bd746a2d9d8d0.tar.gz android_packages_apps_PackageInstaller-e26f22699bfd14f25ba50f7ef29bd746a2d9d8d0.tar.bz2 android_packages_apps_PackageInstaller-e26f22699bfd14f25ba50f7ef29bd746a2d9d8d0.zip |
Merge "Make ManagePermissionsFragment more TV-friendly." into mnc-dev
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable/ic_lock.xml | 31 | ||||
-rw-r--r-- | res/layout-television/permissions_frame.xml | 2 | ||||
-rw-r--r-- | res/values-television/colors.xml | 4 | ||||
-rw-r--r-- | res/values/strings.xml | 3 |
4 files changed, 38 insertions, 2 deletions
diff --git a/res/drawable/ic_lock.xml b/res/drawable/ic_lock.xml new file mode 100644 index 00000000..396bd988 --- /dev/null +++ b/res/drawable/ic_lock.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +Copyright (C) 2015 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. +--> + +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="48" + android:viewportHeight="48"> + <path + android:pathData="M0 0h48v48H0z" /> + <path + android:fillColor="#000000" + android:pathData="M36 16h-2v-4c0-5.52-4.48-10-10-10S14 6.48 14 12v4h-2c-2.21 0-4 1.79-4 4v20c0 +2.21 1.79 4 4 4h24c2.21 0 4-1.79 4-4V20c0-2.21-1.79-4-4-4zM24 34c-2.21 +0-4-1.79-4-4s1.79-4 4-4 4 1.79 4 4-1.79 4-4 4zm6.2-18H17.8v-4c0-3.42 2.78-6.2 +6.2-6.2 3.42 0 6.2 2.78 6.2 6.2v4z" /> +</vector> diff --git a/res/layout-television/permissions_frame.xml b/res/layout-television/permissions_frame.xml index d32d6280..14cb0883 100644 --- a/res/layout-television/permissions_frame.xml +++ b/res/layout-television/permissions_frame.xml @@ -50,7 +50,7 @@ <ImageView android:id="@+id/lb_icon" android:layout_width="@dimen/lb_content_fragment_icon_width" - android:layout_height="wrap_content" + android:layout_height="@dimen/lb_content_fragment_icon_width" android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:layout_marginStart="@dimen/lb_content_fragment_delimiter_padding" diff --git a/res/values-television/colors.xml b/res/values-television/colors.xml index 1fe60dc7..eb6bfa7d 100644 --- a/res/values-television/colors.xml +++ b/res/values-television/colors.xml @@ -23,6 +23,8 @@ <color name="grant_permissions_button_color">@color/grant_permissions_white_text_alpha_100</color> <color name="grant_permissions_focus_highlight">#26eeeeee</color> - <color name="grant_permissions_white_text_alpha_100">#ffeeeeee</color> + <color name="grant_permissions_white_text_alpha_100">@color/off_white</color> <color name="grant_permissions_white_text_alpha_70">#b2eeeeee</color> + + <color name="off_white">#ffeeeeee</color> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 72ac495c..47cea64d 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -197,6 +197,9 @@ <string name="permdesc_togglePermissions" translatable="false">Allows the holder to launch the UI for toggling app permissions. Should never be needed for normal apps.</string> + <!-- Breadcrumb for page of managing application permissions [CHAR LIMIT=50] --> + <string name="app_permissions_breadcrumb">Apps</string> + <!-- Title for page of managing application permissions --> <string name="app_permissions">App permissions</string> <!-- Checkbox that allows user to not be questioned about this permission |