diff options
| author | Svetoslav <svetoslavganov@google.com> | 2015-11-20 14:00:11 -0800 |
|---|---|---|
| committer | Svetoslav <svetoslavganov@google.com> | 2015-11-20 14:02:19 -0800 |
| commit | ef861375eebd9ac6cce7c0bb163380ab1c951063 (patch) | |
| tree | 870ae89605e49658de3e5abca2797b68c5efbb26 /res/values-television | |
| parent | 9c78316fe6baa4f7fd7d5108349ecf8a2532b047 (diff) | |
| download | android_packages_apps_PackageInstaller-ef861375eebd9ac6cce7c0bb163380ab1c951063.tar.gz android_packages_apps_PackageInstaller-ef861375eebd9ac6cce7c0bb163380ab1c951063.tar.bz2 android_packages_apps_PackageInstaller-ef861375eebd9ac6cce7c0bb163380ab1c951063.zip | |
resolve merge conflicts of c10abb25f3 to cw-e-dev.
Change-Id: I3fe38a9ac62466b38efec834dceb712d2782c518
Diffstat (limited to 'res/values-television')
| -rw-r--r-- | res/values-television/colors.xml | 7 | ||||
| -rw-r--r-- | res/values-television/styles.xml | 37 |
2 files changed, 44 insertions, 0 deletions
diff --git a/res/values-television/colors.xml b/res/values-television/colors.xml index eb6bfa7d..08209600 100644 --- a/res/values-television/colors.xml +++ b/res/values-television/colors.xml @@ -15,6 +15,13 @@ --> <resources> + + <color name="lb_content_title_text_color">#FFF1F1F1</color> + <color name="lb_content_breadcrumb_text_color">#88F1F1F1</color> + <color name="lb_content_description_text_color">#88F1F1F1</color> + <color name="lb_action_fragment_background">#FF111111</color> + <color name="lb_dialog_activity_background">#77000000</color> + <color name="grant_permissions_background_color">#ff263238</color> <color name="grant_permissions_app_color">@color/grant_permissions_white_text_alpha_100</color> <color name="grant_permissions_progress_color">@color/grant_permissions_white_text_alpha_100</color> diff --git a/res/values-television/styles.xml b/res/values-television/styles.xml new file mode 100644 index 00000000..5f712f7d --- /dev/null +++ b/res/values-television/styles.xml @@ -0,0 +1,37 @@ +<?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. +--> + +<resources> + + <style name="PreferenceThemeOverlay.v14.Permissions"> + <item name="preferenceStyle">@style/Preference.Permissions</item> + <item name="preferenceCategoryStyle">@style/Preference.Category.Permissions</item> + <item name="switchPreferenceStyle">@style/Preference.SwitchPreference.Permissions</item> + </style> + + <style name="Preference.Permissions"> + <item name="layout">@layout/preference_permissions</item> + </style> + + <style name="Preference.Category.Permissions"> + <item name="layout">@layout/preference_category_material</item> + </style> + + <style name="Preference.SwitchPreference.Permissions"> + <item name="layout">@layout/preference_permissions_switch</item> + </style> + +</resources> |