Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/packages/apps/PackageInstaller into cm-13.0staging/cm-13.0+r22

Android 6.0.1 release 22

1 files changed, 36 insertions, 0 deletions

diff --git a/res/values-watch/colors.xml b/res/values-watch/colors.xml
new file mode 100644
index 00000000..b81d6e3b
--- /dev/null
+++ b/res/values-watch/colors.xml
@@ -0,0 +1,36 @@
+<?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>
+    <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>
+    <color name="grant_permissions_title_color">@color/grant_permissions_white_text_alpha_70</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="permissions_settings_item_color">#FFFFFFFF</color>
+
+    <color name="off_white">#ffeeeeee</color>
+
+    <color name="primary_text_light">#424242</color>
+
+    <!-- Copied from wearable support -->
+    <color name="circular_button_disabled">#757575</color>
+
+    <!-- Copied from wearable Clockwork Settings -->
+    <color name="cw_dark_gray">#424242</color>
+</resources>