DO NOT MERGE - Update prebuild current SDK
Copied files from lmp-dev branch at #1305141
http://android-build/builds/git_lmp-dev-linux-sdk_x86_64-sdk/1305141
Followed the instruction given at : goto/updateprebuilts
Change-Id: I29479d6a623aaa86022383645ebc628adde06c19
diff --git a/current/support/v7/appcompat/res/values-v21/styles_base.xml b/current/support/v7/appcompat/res/values-v21/styles_base.xml
index e00b809..ab24116 100644
--- a/current/support/v7/appcompat/res/values-v21/styles_base.xml
+++ b/current/support/v7/appcompat/res/values-v21/styles_base.xml
@@ -94,9 +94,6 @@
parent="android:TextAppearance.Material.Widget.ActionBar.Subtitle">
</style>
-
- <!--
- TODO Hidden
<style name="TextAppearance.AppCompat.Widget.Base.ActionBar.Title.Inverse"
parent="android:TextAppearance.Material.Widget.ActionBar.Title.Inverse">
</style>
@@ -104,7 +101,6 @@
<style name="TextAppearance.AppCompat.Widget.Base.ActionBar.Subtitle.Inverse"
parent="android:TextAppearance.Material.Widget.ActionBar.Subtitle.Inverse">
</style>
- -->
<style name="TextAppearance.AppCompat.Widget.Base.ActionMode.Title"
parent="android:TextAppearance.Material.Widget.ActionMode.Title">
@@ -114,8 +110,6 @@
parent="android:TextAppearance.Material.Widget.ActionMode.Subtitle">
</style>
- <!--
- TODO Hidden
<style name="TextAppearance.AppCompat.Widget.Base.ActionMode.Title.Inverse"
parent="android:TextAppearance.Material.Widget.ActionMode.Title.Inverse">
</style>
@@ -123,7 +117,6 @@
<style name="TextAppearance.AppCompat.Widget.Base.ActionMode.Subtitle.Inverse"
parent="android:TextAppearance.Material.Widget.ActionMode.Subtitle.Inverse">
</style>
- -->
<!-- Action Button Styles -->
diff --git a/current/support/v7/appcompat/res/values-v21/styles_base_text.xml b/current/support/v7/appcompat/res/values-v21/styles_base_text.xml
new file mode 100644
index 0000000..86f3c03
--- /dev/null
+++ b/current/support/v7/appcompat/res/values-v21/styles_base_text.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2014 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="Base.TextAppearance.AppCompat" parent="android:TextAppearance.Material" />
+
+ <style name="Base.TextAppearance.AppCompat.Display4" parent="android:TextAppearance.Material.Display4" />
+
+ <style name="Base.TextAppearance.AppCompat.Display3" parent="android:TextAppearance.Material.Display3" />
+
+ <style name="Base.TextAppearance.AppCompat.Display2" parent="android:TextAppearance.Material.Display2" />
+
+ <style name="Base.TextAppearance.AppCompat.Display1" parent="android:TextAppearance.Material.Display1" />
+
+ <style name="Base.TextAppearance.AppCompat.Headline" parent="android:TextAppearance.Material.Headline" />
+
+ <style name="Base.TextAppearance.AppCompat.Title" parent="android:TextAppearance.Material.Title" />
+
+ <style name="Base.TextAppearance.AppCompat.Subhead" parent="android:TextAppearance.Material.Subhead" />
+
+ <style name="Base.TextAppearance.AppCompat.Body2" parent="android:TextAppearance.Material.Body2" />
+
+ <style name="Base.TextAppearance.AppCompat.Body1" parent="android:TextAppearance.Material.Body1" />
+
+ <style name="Base.TextAppearance.AppCompat.Caption" parent="android:TextAppearance.Material.Caption" />
+
+ <style name="Base.TextAppearance.AppCompat.Menu" parent="android:TextAppearance.Material.Menu" />
+
+ <!-- Now deprecated styles -->
+
+ <style name="Base.TextAppearance.AppCompat.Inverse" parent="android:TextAppearance.Material.Inverse" />
+
+ <style name="Base.TextAppearance.AppCompat.Large" parent="android:TextAppearance.Material.Large" />
+
+ <style name="Base.TextAppearance.AppCompat.Large.Inverse" parent="android:TextAppearance.Material.Large.Inverse" />
+
+ <style name="Base.TextAppearance.AppCompat.Medium" parent="android:TextAppearance.Material.Medium" />
+
+ <style name="Base.TextAppearance.AppCompat.Medium.Inverse" parent="android:TextAppearance.Material.Medium.Inverse" />
+
+ <style name="Base.TextAppearance.AppCompat.Small" parent="android:TextAppearance.Material.Small" />
+
+ <style name="Base.TextAppearance.AppCompat.Small.Inverse" parent="android:TextAppearance.Material.Small.Inverse" />
+
+</resources>
\ No newline at end of file
diff --git a/current/support/v7/appcompat/res/values-v21/themes_base.xml b/current/support/v7/appcompat/res/values-v21/themes_base.xml
index 6155225..f2991ef 100644
--- a/current/support/v7/appcompat/res/values-v21/themes_base.xml
+++ b/current/support/v7/appcompat/res/values-v21/themes_base.xml
@@ -42,4 +42,84 @@
<style name="Theme.Platform.AppCompat.Light.Dialog"
parent="android:Theme.Material.Light.Dialog" />
+ <style name="Base.Theme.AppCompat" parent="Theme.Platform.AppCompat">
+ <item name="windowActionBar">true</item>
+
+ <item name="android:colorPrimary">?attr/colorPrimary</item>
+ <item name="android:colorPrimaryDark">?attr/colorPrimaryDark</item>
+ <item name="android:colorAccent">?attr/colorAccent</item>
+ <item name="android:colorControlNormal">?attr/colorControlNormal</item>
+ <item name="android:colorControlActivated">?attr/colorControlActivated</item>
+ <item name="android:colorControlHighlight">?attr/colorControlHighlight</item>
+ <!-- TODO: <item name="android:colorButtonNormal">?attr/colorButtonNormal</item>-->
+ </style>
+
+ <style name="Base.Theme.AppCompat.Light" parent="Theme.Platform.AppCompat.Light">
+ <item name="windowActionBar">true</item>
+
+ <item name="android:colorPrimary">?attr/colorPrimary</item>
+ <item name="android:colorPrimaryDark">?attr/colorPrimaryDark</item>
+ <item name="android:colorAccent">?attr/colorAccent</item>
+ <item name="android:colorControlNormal">?attr/colorControlNormal</item>
+ <item name="android:colorControlActivated">?attr/colorControlActivated</item>
+ <item name="android:colorControlHighlight">?attr/colorControlHighlight</item>
+ <!-- TODO: <item name="android:colorButtonNormal">?attr/colorButtonNormal</item>-->
+ </style>
+
+ <style name="Base.Theme.AppCompat.Light.DarkActionBar" parent="Theme.Platform.AppCompat.Light.DarkActionBar">
+ <item name="windowActionBar">true</item>
+
+ <item name="android:colorPrimary">?attr/colorPrimary</item>
+ <item name="android:colorPrimaryDark">?attr/colorPrimaryDark</item>
+ <item name="android:colorAccent">?attr/colorAccent</item>
+ <item name="android:colorControlNormal">?attr/colorControlNormal</item>
+ <item name="android:colorControlActivated">?attr/colorControlActivated</item>
+ <item name="android:colorControlHighlight">?attr/colorControlHighlight</item>
+ <!-- TODO: <item name="android:colorButtonNormal">?attr/colorButtonNormal</item>-->
+ </style>
+
+ <style name="Base.Theme.AppCompat.DialogWhenLarge" parent="Theme.Platform.AppCompat.DialogWhenLarge">
+ <item name="windowActionBar">true</item>
+
+ <item name="android:colorPrimary">?attr/colorPrimary</item>
+ <item name="android:colorPrimaryDark">?attr/colorPrimaryDark</item>
+ <item name="android:colorAccent">?attr/colorAccent</item>
+ <item name="android:colorControlNormal">?attr/colorControlNormal</item>
+ <item name="android:colorControlActivated">?attr/colorControlActivated</item>
+ <item name="android:colorControlHighlight">?attr/colorControlHighlight</item>
+ <!-- TODO: <item name="android:colorButtonNormal">?attr/colorButtonNormal</item>-->
+ </style>
+
+ <style name="Base.Theme.AppCompat.Light.DialogWhenLarge" parent="Theme.Platform.AppCompat.Light.DialogWhenLarge">
+ <item name="windowActionBar">true</item>
+
+ <item name="android:colorPrimary">?attr/colorPrimary</item>
+ <item name="android:colorPrimaryDark">?attr/colorPrimaryDark</item>
+ <item name="android:colorAccent">?attr/colorAccent</item>
+ <item name="android:colorControlNormal">?attr/colorControlNormal</item>
+ <item name="android:colorControlActivated">?attr/colorControlActivated</item>
+ <item name="android:colorControlHighlight">?attr/colorControlHighlight</item>
+ <!-- TODO: <item name="android:colorButtonNormal">?attr/colorButtonNormal</item>-->
+ </style>
+
+ <style name="Base.Theme.AppCompat.Dialog" parent="Theme.Platform.AppCompat.Dialog">
+ <item name="android:colorPrimary">?attr/colorPrimary</item>
+ <item name="android:colorPrimaryDark">?attr/colorPrimaryDark</item>
+ <item name="android:colorAccent">?attr/colorAccent</item>
+ <item name="android:colorControlNormal">?attr/colorControlNormal</item>
+ <item name="android:colorControlActivated">?attr/colorControlActivated</item>
+ <item name="android:colorControlHighlight">?attr/colorControlHighlight</item>
+ <!-- TODO: <item name="android:colorButtonNormal">?attr/colorButtonNormal</item>-->
+ </style>
+
+ <style name="Base.Theme.AppCompat.Light.Dialog" parent="Theme.Platform.AppCompat.Light.Dialog">
+ <item name="android:colorPrimary">?attr/colorPrimary</item>
+ <item name="android:colorPrimaryDark">?attr/colorPrimaryDark</item>
+ <item name="android:colorAccent">?attr/colorAccent</item>
+ <item name="android:colorControlNormal">?attr/colorControlNormal</item>
+ <item name="android:colorControlActivated">?attr/colorControlActivated</item>
+ <item name="android:colorControlHighlight">?attr/colorControlHighlight</item>
+ <item name="android:colorButtonNormal">?attr/colorButtonNormal</item>
+ </style>
+
</resources>