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, 64 insertions, 0 deletions

diff --git a/res/values-watch/themes.xml b/res/values-watch/themes.xml
new file mode 100644
index 00000000..dea42907
--- /dev/null
+++ b/res/values-watch/themes.xml
@@ -0,0 +1,64 @@
+<?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="Settings" parent="@android:style/Theme.DeviceDefault.NoActionBar">
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Permissions</item>
+        <item name="android:windowBackground">@color/cw_dark_gray</item>
+        <item name="android:colorBackground">@color/cw_dark_gray</item>
+    </style>
+
+    <style name="GrantPermissions" parent="Settings">
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowElevation">@dimen/action_dialog_z</item>
+        <item name="android:windowSwipeToDismiss">false</item>
+    </style>
+
+    <style name="GrantPermissions.BreadcrumbText">
+        <item name="android:fontFamily">sans-serif-condensed</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:textColor">@color/grant_permissions_progress_color</item>
+    </style>
+
+    <style name="GrantPermissions.TitleText">
+        <item name="android:fontFamily">sans-serif-condensed-light</item>
+        <item name="android:textSize">18sp</item>
+        <item name="android:textColor">@color/grant_permissions_title_color</item>
+        <item name="android:lineSpacingMultiplier">1.221</item>
+    </style>
+
+    <!-- Copied from WearableSupport lib -->
+    <style name="TextAppearance.WearDiag" parent="android:TextAppearance.Medium">
+        <item name="android:textColor">#FFFFFF</item>
+        <item name="android:textSize">16sp</item>
+    </style>
+    <style name="TextAppearance.WearDiag.Button">
+        <item name="android:textSize">16sp</item>
+    </style>
+    <style name="Widget.WearDiag.Button" parent="@android:style/Widget.DeviceDefault.Button">
+        <item name="android:fontFamily">sans-serif-condensed-light</item>
+        <item name="android:gravity">center_vertical|left</item>
+        <item name="android:textAppearance">@style/TextAppearance.WearDiag.Button</item>
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:minLines">1</item>
+        <item name="android:maxLines">3</item>
+        <item name="android:ellipsize">marquee</item>
+        <item name="android:layout_height">60dp</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:drawablePadding">12dp</item>
+    </style>
+</resources>