summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorAnthony Hugh <ahugh@google.com>2015-09-17 20:00:32 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-17 20:00:32 +0000
commit2c259061f7afae63c29169fac47aeffe777cd1f1 (patch)
tree2261b0019defc2ef53e94e313ba54c4e7694e80c /res
parent36f25a83886477e4420c61b86d62c5c3c0ec661a (diff)
parentb0191050e62eba528467ad110329324cc2bf398a (diff)
downloadandroid_packages_apps_PackageInstaller-2c259061f7afae63c29169fac47aeffe777cd1f1.tar.gz
android_packages_apps_PackageInstaller-2c259061f7afae63c29169fac47aeffe777cd1f1.tar.bz2
android_packages_apps_PackageInstaller-2c259061f7afae63c29169fac47aeffe777cd1f1.zip
am b0191050: am 3f6b716e: am 736c82ba: Permissions Settings UI updates
* commit 'b0191050e62eba528467ad110329324cc2bf398a': Permissions Settings UI updates
Diffstat (limited to 'res')
-rw-r--r--res/layout-watch/permissions_settings_item.xml7
-rw-r--r--res/values-watch/colors.xml2
2 files changed, 6 insertions, 3 deletions
diff --git a/res/layout-watch/permissions_settings_item.xml b/res/layout-watch/permissions_settings_item.xml
index 1c57fd81..1dc4abf7 100644
--- a/res/layout-watch/permissions_settings_item.xml
+++ b/res/layout-watch/permissions_settings_item.xml
@@ -27,17 +27,18 @@
android:fontFamily="sans-serif-condensed-light"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textColor="#FFFFFFFF"
+ android:textColor="@color/permissions_settings_item_color"
android:textSize="14sp"
android:maxLines="2"
android:ellipsize="end"/>
<TextView
android:id="@+id/state"
+ android:alpha="0.5"
+ android:fontFamily="sans-serif-condensed-light"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:textColor="@color/permissions_settings_item_color"
android:textSize="14sp"
- android:textColor="#FFFFFFFF"
- android:fontFamily="sans-serif-condensed-light"
android:maxLines="1"
android:ellipsize="end"/>
</LinearLayout>
diff --git a/res/values-watch/colors.xml b/res/values-watch/colors.xml
index 39c3eb48..b81d6e3b 100644
--- a/res/values-watch/colors.xml
+++ b/res/values-watch/colors.xml
@@ -22,6 +22,8 @@
<color name="grant_permissions_white_text_alpha_100">@color/off_white</color>
<color name="grant_permissions_white_text_alpha_70">#b2eeeeee</color>
+ <color name="permissions_settings_item_color">#FFFFFFFF</color>
+
<color name="off_white">#ffeeeeee</color>
<color name="primary_text_light">#424242</color>