summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaj Yengisetty <rajesh@cyngn.com>2015-08-04 09:32:19 -0700
committerRaj Yengisetty <rajesh@cyngn.com>2015-08-04 09:32:19 -0700
commita88269c345c1ab38f101e44884a455c749f641b4 (patch)
treef04ed12a8825280dd095722d5abb99f06bdf9685
parent3f3f929ac88f2b2f52678fa3b54bf4fa0c924d18 (diff)
downloadexternal_android_support-prebuilt-stable/master-YOG7D.tar.gz
external_android_support-prebuilt-stable/master-YOG7D.tar.bz2
external_android_support-prebuilt-stable/master-YOG7D.zip
Change-Id: I06ae7723ae180e2f444183126500b53a1cae8207
-rw-r--r--appcompat/android-support-v4.jarbin1184450 -> 1184670 bytes
-rw-r--r--appcompat/android-support-v7-appcompat.jarbin586330 -> 586153 bytes
-rw-r--r--appcompat/res/values-v21/styles_base.xml2
-rw-r--r--appcompat/res/values/styles.xml4
-rw-r--r--appcompat/res/values/themes_base.xml2
-rw-r--r--support-design/android-support-design.jarbin207812 -> 212540 bytes
-rw-r--r--support-design/res/layout-sw600dp/layout_snackbar.xml2
-rw-r--r--support-design/res/layout/design_navigation_item.xml2
-rw-r--r--support-design/res/layout/design_navigation_item_subheader.xml2
-rw-r--r--support-design/res/layout/layout_tab_icon.xml21
-rw-r--r--support-design/res/layout/layout_tab_text.xml23
11 files changed, 51 insertions, 7 deletions
diff --git a/appcompat/android-support-v4.jar b/appcompat/android-support-v4.jar
index e74b0d7..7b78bb8 100644
--- a/appcompat/android-support-v4.jar
+++ b/appcompat/android-support-v4.jar
Binary files differ
diff --git a/appcompat/android-support-v7-appcompat.jar b/appcompat/android-support-v7-appcompat.jar
index b9dca8a..830a493 100644
--- a/appcompat/android-support-v7-appcompat.jar
+++ b/appcompat/android-support-v7-appcompat.jar
Binary files differ
diff --git a/appcompat/res/values-v21/styles_base.xml b/appcompat/res/values-v21/styles_base.xml
index 1bf90ef..241cb04 100644
--- a/appcompat/res/values-v21/styles_base.xml
+++ b/appcompat/res/values-v21/styles_base.xml
@@ -174,6 +174,8 @@
<style name="Base.Widget.AppCompat.AutoCompleteTextView" parent="android:Widget.Material.AutoCompleteTextView" />
+ <style name="Base.Widget.AppCompat.EditText" parent="android:Widget.Material.EditText" />
+
<style name="Base.Widget.AppCompat.RatingBar" parent="android:Widget.Material.RatingBar" />
<style name="Base.Widget.AppCompat.Button" parent="android:Widget.Material.Button" />
diff --git a/appcompat/res/values/styles.xml b/appcompat/res/values/styles.xml
index b38c6ad..0ac20d5 100644
--- a/appcompat/res/values/styles.xml
+++ b/appcompat/res/values/styles.xml
@@ -194,9 +194,7 @@
<style name="Widget.AppCompat.SearchView" parent="Base.Widget.AppCompat.SearchView" />
<style name="Widget.AppCompat.SearchView.ActionBar" parent="Base.Widget.AppCompat.SearchView.ActionBar" />
- <style name="Widget.AppCompat.EditText"
- parent="Base.Widget.AppCompat.EditText">
- </style>
+ <style name="Widget.AppCompat.EditText" parent="Base.Widget.AppCompat.EditText"/>
<style name="Widget.AppCompat.CompoundButton.Switch" parent="Base.Widget.AppCompat.CompoundButton.Switch" />
diff --git a/appcompat/res/values/themes_base.xml b/appcompat/res/values/themes_base.xml
index 3e2c841..5db9d05 100644
--- a/appcompat/res/values/themes_base.xml
+++ b/appcompat/res/values/themes_base.xml
@@ -571,7 +571,7 @@
<item name="isLightTheme">true</item>
</style>
- <style name="Base.ThemeOverlay.AppCompat.Dark">
+ <style name="Base.ThemeOverlay.AppCompat.Dark" parent="Platform.ThemeOverlay.AppCompat.Dark">
<item name="android:windowBackground">@color/background_material_dark</item>
<item name="android:colorForeground">@color/bright_foreground_material_dark</item>
<item name="android:colorForegroundInverse">@color/bright_foreground_material_light</item>
diff --git a/support-design/android-support-design.jar b/support-design/android-support-design.jar
index 5686e97..a02d808 100644
--- a/support-design/android-support-design.jar
+++ b/support-design/android-support-design.jar
Binary files differ
diff --git a/support-design/res/layout-sw600dp/layout_snackbar.xml b/support-design/res/layout-sw600dp/layout_snackbar.xml
index 6605408..b68395a 100644
--- a/support-design/res/layout-sw600dp/layout_snackbar.xml
+++ b/support-design/res/layout-sw600dp/layout_snackbar.xml
@@ -19,5 +19,5 @@
class="android.support.design.widget.Snackbar$SnackbarLayout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="bottom|center_vertical"
+ android:layout_gravity="bottom|center_horizontal"
style="@style/Widget.Design.Snackbar" /> \ No newline at end of file
diff --git a/support-design/res/layout/design_navigation_item.xml b/support-design/res/layout/design_navigation_item.xml
index 6f86719..59ee05c 100644
--- a/support-design/res/layout/design_navigation_item.xml
+++ b/support-design/res/layout/design_navigation_item.xml
@@ -23,4 +23,4 @@
android:drawablePadding="@dimen/navigation_icon_padding"
android:gravity="center_vertical|start"
android:maxLines="1"
- android:textAppearance="?attr/textAppearanceListItem"/>
+ android:textAppearance="@style/TextAppearance.AppCompat.Body2"/>
diff --git a/support-design/res/layout/design_navigation_item_subheader.xml b/support-design/res/layout/design_navigation_item_subheader.xml
index 9a1a810..707ec6a 100644
--- a/support-design/res/layout/design_navigation_item_subheader.xml
+++ b/support-design/res/layout/design_navigation_item_subheader.xml
@@ -21,5 +21,5 @@
android:maxLines="1"
android:paddingLeft="?attr/listPreferredItemPaddingLeft"
android:paddingRight="?attr/listPreferredItemPaddingRight"
- android:textAppearance="?attr/textAppearanceListItem"
+ android:textAppearance="@style/TextAppearance.AppCompat.Body2"
android:textColor="?android:textColorSecondary"/>
diff --git a/support-design/res/layout/layout_tab_icon.xml b/support-design/res/layout/layout_tab_icon.xml
new file mode 100644
index 0000000..6464d1f
--- /dev/null
+++ b/support-design/res/layout/layout_tab_icon.xml
@@ -0,0 +1,21 @@
+<?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.
+ -->
+
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"/> \ No newline at end of file
diff --git a/support-design/res/layout/layout_tab_text.xml b/support-design/res/layout/layout_tab_text.xml
new file mode 100644
index 0000000..a83bb3d
--- /dev/null
+++ b/support-design/res/layout/layout_tab_text.xml
@@ -0,0 +1,23 @@
+<?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.
+-->
+
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:gravity="center"
+ android:maxLines="2"/> \ No newline at end of file