summaryrefslogtreecommitdiffstats
path: root/current/support/v7/appcompat
diff options
context:
space:
mode:
authorQiwen Zhao <zhao@google.com>2014-08-27 08:11:29 -0700
committerQiwen Zhao <zhao@google.com>2014-08-27 08:11:29 -0700
commit97491907b9e3763ae53dedf73e29dadaaeebfc6b (patch)
treeedc6bf63b34971e1a621a35f10d799a158d166ef /current/support/v7/appcompat
parent43a83caba18ca5cd6ad9402b952a0fa82c6b82d1 (diff)
downloadprebuilts_sdk-97491907b9e3763ae53dedf73e29dadaaeebfc6b.zip
prebuilts_sdk-97491907b9e3763ae53dedf73e29dadaaeebfc6b.tar.gz
prebuilts_sdk-97491907b9e3763ae53dedf73e29dadaaeebfc6b.tar.bz2
DO NOT MERGER - Update prebuilt SDK to LRW58
Diffstat (limited to 'current/support/v7/appcompat')
-rw-r--r--current/support/v7/appcompat/libs/android-support-v7-appcompat.jarbin465746 -> 442437 bytes
-rw-r--r--current/support/v7/appcompat/res/layout/abc_action_bar_home.xml38
-rw-r--r--current/support/v7/appcompat/res/values-land/dimens.xml5
-rw-r--r--current/support/v7/appcompat/res/values-v11/themes_base.xml2
-rw-r--r--current/support/v7/appcompat/res/values/dimens_material.xml12
-rw-r--r--current/support/v7/appcompat/res/values/styles_base.xml20
6 files changed, 18 insertions, 59 deletions
diff --git a/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar b/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar
index 496b376..2415473 100644
--- a/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar
+++ b/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar
Binary files differ
diff --git a/current/support/v7/appcompat/res/layout/abc_action_bar_home.xml b/current/support/v7/appcompat/res/layout/abc_action_bar_home.xml
deleted file mode 100644
index 8a686b5..0000000
--- a/current/support/v7/appcompat/res/layout/abc_action_bar_home.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 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.
--->
-
-<view xmlns:android="http://schemas.android.com/apk/res/android"
- class="android.support.v7.internal.widget.ActionBarView$HomeView"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical|left">
- <ImageView android:id="@id/up"
- android:src="?attr/homeAsUpIndicator"
- android:layout_gravity="center_vertical|left"
- android:visibility="gone"
- android:layout_width="48dp"
- android:layout_height="48dp"
- android:scaleType="centerInside" />
- <ImageView android:id="@id/home"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginRight="8dip"
- android:layout_marginTop="@dimen/abc_action_bar_icon_vertical_padding"
- android:layout_marginBottom="@dimen/abc_action_bar_icon_vertical_padding"
- android:layout_gravity="center"
- android:adjustViewBounds="true"
- android:scaleType="fitCenter"/>
-</view>
diff --git a/current/support/v7/appcompat/res/values-land/dimens.xml b/current/support/v7/appcompat/res/values-land/dimens.xml
index 276476d..c82e8db 100644
--- a/current/support/v7/appcompat/res/values-land/dimens.xml
+++ b/current/support/v7/appcompat/res/values-land/dimens.xml
@@ -28,7 +28,8 @@
<!-- Size of the indeterminate Progress Bar -->
<dimen name="abc_action_bar_progress_bar_size">32dp</dimen>
- <!-- Default height of an action bar. -->
- <dimen name="action_bar_default_height_material">48dp</dimen>
+ <dimen name="abc_action_bar_default_height_material">48dp</dimen>
+ <dimen name="abc_text_size_title_material_toolbar">14dp</dimen>
+ <dimen name="abc_text_size_subtitle_material_toolbar">12dp</dimen>
</resources> \ No newline at end of file
diff --git a/current/support/v7/appcompat/res/values-v11/themes_base.xml b/current/support/v7/appcompat/res/values-v11/themes_base.xml
index cac5c60..3461198 100644
--- a/current/support/v7/appcompat/res/values-v11/themes_base.xml
+++ b/current/support/v7/appcompat/res/values-v11/themes_base.xml
@@ -197,7 +197,7 @@
<item name="isLightTheme">true</item>
<item name="selectableItemBackground">@drawable/abc_item_background_holo_light</item>
- <item name="selectableItemBackgroundBorderless">?attr/selectableItemBackgroundBorderless</item>
+ <item name="selectableItemBackgroundBorderless">?attr/selectableItemBackground</item>
<item name="homeAsUpIndicator">@drawable/abc_ic_ab_back_material_light</item>
<item name="android:listDivider">@drawable/abc_list_divider_material_light</item>
diff --git a/current/support/v7/appcompat/res/values/dimens_material.xml b/current/support/v7/appcompat/res/values/dimens_material.xml
index c604a5e..f147e65 100644
--- a/current/support/v7/appcompat/res/values/dimens_material.xml
+++ b/current/support/v7/appcompat/res/values/dimens_material.xml
@@ -16,8 +16,9 @@
-->
<resources>
- <!-- Default height of an action bar. -->
<dimen name="abc_action_bar_default_height_material">56dp</dimen>
+ <dimen name="abc_text_size_title_material_toolbar">20dp</dimen>
+ <dimen name="abc_text_size_subtitle_material_toolbar">16dp</dimen>
<dimen name="abc_action_button_min_width_material">48dp</dimen>
<dimen name="abc_action_button_min_height_material">48dp</dimen>
@@ -30,19 +31,14 @@
<dimen name="text_size_headline_material">24sp</dimen>
<dimen name="text_size_title_material">20sp</dimen>
<dimen name="text_size_subhead_material">16sp</dimen>
+ <dimen name="text_size_menu_material">16sp</dimen>
<dimen name="text_size_body_2_material">14sp</dimen>
<dimen name="text_size_body_1_material">14sp</dimen>
<dimen name="text_size_caption_material">12sp</dimen>
- <dimen name="text_size_menu_material">14sp</dimen>
<dimen name="text_size_button_material">14sp</dimen>
<dimen name="text_size_large_material">22sp</dimen>
<dimen name="text_size_medium_material">18sp</dimen>
<dimen name="text_size_small_material">14sp</dimen>
- <!-- Text size for action bar titles -->
- <dimen name="abc_action_bar_title_text_size_material">20sp</dimen>
- <!-- Text size for action bar subtitles -->
- <dimen name="abc_action_bar_subtitle_text_size_material">16sp</dimen>
-
-</resources> \ No newline at end of file
+</resources>
diff --git a/current/support/v7/appcompat/res/values/styles_base.xml b/current/support/v7/appcompat/res/values/styles_base.xml
index e8c6350..2e94758 100644
--- a/current/support/v7/appcompat/res/values/styles_base.xml
+++ b/current/support/v7/appcompat/res/values/styles_base.xml
@@ -25,7 +25,6 @@
<item name="displayOptions">showTitle</item>
<item name="divider">?attr/dividerVertical</item>
<item name="height">?attr/actionBarSize</item>
- <item name="homeLayout">@layout/abc_action_bar_home</item>
<item name="titleTextStyle">@style/TextAppearance.AppCompat.Widget.ActionBar.Title</item>
<item name="subtitleTextStyle">@style/TextAppearance.AppCompat.Widget.ActionBar.Subtitle</item>
@@ -147,11 +146,11 @@
</style>
<style name="Base.TextAppearance.AppCompat.Widget.ActionMode.Title" parent="TextAppearance.AppCompat.Medium">
- <item name="android:textSize">@dimen/abc_action_bar_title_text_size_material</item>
+ <item name="android:textSize">@dimen/abc_text_size_title_material_toolbar</item>
</style>
<style name="Base.TextAppearance.AppCompat.Widget.ActionMode.Subtitle" parent="TextAppearance.AppCompat.Small">
- <item name="android:textSize">@dimen/abc_action_bar_subtitle_text_size_material</item>
+ <item name="android:textSize">@dimen/abc_text_size_subtitle_material_toolbar</item>
</style>
<style name="Base.TextAppearance.AppCompat.Widget.ActionBar.Menu" parent="android:TextAppearance.Small">
@@ -161,20 +160,20 @@
</style>
<style name="Base.TextAppearance.AppCompat.Widget.ActionBar.Title" parent="TextAppearance.AppCompat.Medium">
- <item name="android:textSize">@dimen/abc_action_bar_title_text_size_material</item>
+ <item name="android:textSize">@dimen/abc_text_size_title_material_toolbar</item>
<item name="android:textColor">?android:attr/textColorPrimary</item>
</style>
<style name="Base.TextAppearance.AppCompat.Widget.ActionBar.Subtitle" parent="TextAppearance.AppCompat.Small">
- <item name="android:textSize">@dimen/abc_action_bar_subtitle_text_size_material</item>
+ <item name="android:textSize">@dimen/abc_text_size_subtitle_material_toolbar</item>
</style>
<style name="Base.TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse" parent="TextAppearance.AppCompat.Medium.Inverse">
- <item name="android:textSize">@dimen/abc_action_bar_title_text_size_material</item>
+ <item name="android:textSize">@dimen/abc_text_size_title_material_toolbar</item>
</style>
<style name="Base.TextAppearance.AppCompat.Widget.ActionBar.Subtitle.Inverse" parent="TextAppearance.AppCompat.Small.Inverse">
- <item name="android:textSize">@dimen/abc_action_bar_subtitle_text_size_material</item>
+ <item name="android:textSize">@dimen/abc_text_size_subtitle_material_toolbar</item>
</style>
<style name="Base.Widget.AppCompat.ProgressBar.Horizontal" parent="android:Widget.ProgressBar.Horizontal">
@@ -223,11 +222,12 @@
<style name="Base.Widget.AppCompat.ListView.DropDown" parent="android:Widget.ListView">
<item name="android:listSelector">@drawable/abc_list_selector_holo_dark</item>
+ <item name="android:divider">@null</item>
</style>
- <style name="Base.Widget.AppCompat.Light.ListView.DropDown"
- parent="android:Widget.ListView">
+ <style name="Base.Widget.AppCompat.Light.ListView.DropDown" parent="android:Widget.ListView">
<item name="android:listSelector">@drawable/abc_list_selector_holo_light</item>
+ <item name="android:divider">@null</item>
</style>
<style name="Base.TextAppearance.AppCompat.Widget.DropDownItem"
@@ -303,7 +303,7 @@
<style name="Base.Widget.AppCompat.AutoCompleteTextView" parent="android:Widget.AutoCompleteTextView">
<item name="android:textColor">?attr/actionMenuTextColor</item>
<item name="android:dropDownSelector">@drawable/abc_list_selector_holo_dark</item>
- <item name="android:popupBackground">@drawable/abc_popup_background_material_light</item>
+ <item name="android:popupBackground">@drawable/abc_popup_background_material_dark</item>
</style>
<style name="Base.Widget.AppCompat.Light.AutoCompleteTextView" parent="android:Widget.AutoCompleteTextView">