diff options
27 files changed, 77 insertions, 48 deletions
diff --git a/current/android.jar b/current/android.jar Binary files differindex 695a5a4..6122196 100644 --- a/current/android.jar +++ b/current/android.jar diff --git a/current/support/annotations/android-support-annotations.jar b/current/support/annotations/android-support-annotations.jar Binary files differindex 132f44c..64e64fd 100644 --- a/current/support/annotations/android-support-annotations.jar +++ b/current/support/annotations/android-support-annotations.jar diff --git a/current/support/design/libs/android-support-design.jar b/current/support/design/libs/android-support-design.jar Binary files differindex 7449ec5..9632538 100644 --- a/current/support/design/libs/android-support-design.jar +++ b/current/support/design/libs/android-support-design.jar diff --git a/current/support/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar b/current/support/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar Binary files differindex 1ea1fd1..af6983b 100644 --- a/current/support/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar +++ b/current/support/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar diff --git a/current/support/multidex/library/libs/android-support-multidex.jar b/current/support/multidex/library/libs/android-support-multidex.jar Binary files differindex 5460a3e..571c199 100644 --- a/current/support/multidex/library/libs/android-support-multidex.jar +++ b/current/support/multidex/library/libs/android-support-multidex.jar diff --git a/current/support/percent/libs/android-support-percent.jar b/current/support/percent/libs/android-support-percent.jar Binary files differindex cc71ba3..a9dde2c 100644 --- a/current/support/percent/libs/android-support-percent.jar +++ b/current/support/percent/libs/android-support-percent.jar diff --git a/current/support/v13/android-support-v13.jar b/current/support/v13/android-support-v13.jar Binary files differindex 3e9374d..98484d2 100644 --- a/current/support/v13/android-support-v13.jar +++ b/current/support/v13/android-support-v13.jar diff --git a/current/support/v17/leanback/libs/android-support-v17-leanback.jar b/current/support/v17/leanback/libs/android-support-v17-leanback.jar Binary files differindex 2c9366f..f2504b3 100644 --- a/current/support/v17/leanback/libs/android-support-v17-leanback.jar +++ b/current/support/v17/leanback/libs/android-support-v17-leanback.jar diff --git a/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_card_info_text_fade.png b/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_card_info_text_fade.png Binary files differdeleted file mode 100644 index a09fdee..0000000 --- a/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_card_info_text_fade.png +++ /dev/null diff --git a/current/support/v17/leanback/res/layout/lb_image_card_view.xml b/current/support/v17/leanback/res/layout/lb_image_card_view.xml index 38cfd4b..2261965 100644 --- a/current/support/v17/leanback/res/layout/lb_image_card_view.xml +++ b/current/support/v17/leanback/res/layout/lb_image_card_view.xml @@ -27,23 +27,21 @@ android:scaleType="centerCrop" android:adjustViewBounds="true" android:contentDescription="@null" /> - <android.support.v17.leanback.widget.NonOverlappingFrameLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - lb:layout_viewType="info" > - <RelativeLayout + <android.support.v17.leanback.widget.NonOverlappingRelativeLayout + lb:layout_viewType="info" android:id="@+id/info_field" android:layout_width="match_parent" android:layout_height="@dimen/lb_basic_card_info_height" - android:padding="@dimen/lb_basic_card_info_padding" + android:paddingStart="@dimen/lb_basic_card_info_padding_horizontal" + android:paddingEnd="@dimen/lb_basic_card_info_padding_horizontal" + android:paddingTop="@dimen/lb_basic_card_info_padding_top" android:layout_centerHorizontal="true" > <TextView android:id="@+id/title_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentStart="true" - android:layout_marginTop="@dimen/lb_basic_card_info_text_margin" - android:layout_marginStart="@dimen/lb_basic_card_info_text_margin" + android:layout_marginBottom="@dimen/lb_basic_card_info_text_margin" android:maxLines="1" android:fontFamily="sans-serif-condensed" android:textColor="@color/lb_basic_card_title_text_color" @@ -53,10 +51,9 @@ android:id="@+id/content_text" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_below="@id/title_text" android:layout_alignParentStart="true" - android:layout_alignParentBottom="true" - android:layout_marginStart="@dimen/lb_basic_card_info_text_margin" - android:layout_marginBottom="@dimen/lb_basic_card_info_text_margin" + android:layout_toStartOf="@+id/extra_badge" android:maxLines="1" android:fontFamily="sans-serif-condensed" android:textColor="@color/lb_basic_card_content_text_color" @@ -66,21 +63,11 @@ android:id="@+id/extra_badge" android:layout_width="@dimen/lb_basic_card_info_badge_size" android:layout_height="@dimen/lb_basic_card_info_badge_size" - android:layout_alignParentBottom="true" + android:layout_marginStart="@dimen/lb_basic_card_info_badge_margin" + android:layout_alignBottom="@id/content_text" android:layout_alignParentEnd="true" android:scaleType="fitCenter" android:visibility="gone" android:contentDescription="@null" /> - <ImageView - android:id="@+id/fade_mask" - android:src="@drawable/lb_ic_card_info_text_fade" - android:layout_width="wrap_content" - android:layout_height="@dimen/lb_basic_card_info_badge_size" - android:layout_alignParentBottom="true" - android:layout_toStartOf="@id/extra_badge" - android:scaleType="fitCenter" - android:visibility="gone" - android:contentDescription="@null" /> - </RelativeLayout> - </android.support.v17.leanback.widget.NonOverlappingFrameLayout> + </android.support.v17.leanback.widget.NonOverlappingRelativeLayout> </merge> diff --git a/current/support/v17/leanback/res/values/colors.xml b/current/support/v17/leanback/res/values/colors.xml index 1549af9..e63c58b 100644 --- a/current/support/v17/leanback/res/values/colors.xml +++ b/current/support/v17/leanback/res/values/colors.xml @@ -46,10 +46,10 @@ <color name="lb_speech_orb_recording">#ff4343</color> <color name="lb_speech_orb_not_recording_icon">#555555</color> - <color name="lb_basic_card_bg_color">#FF3B3B3B</color> - <color name="lb_basic_card_info_bg_color">#FF3B3B3B</color> + <color name="lb_basic_card_bg_color">#FF263238</color> + <color name="lb_basic_card_info_bg_color">#FF37474F</color> <color name="lb_basic_card_title_text_color">#FFEEEEEE</color> - <color name="lb_basic_card_content_text_color">#99EEEEEE</color> + <color name="lb_basic_card_content_text_color">#B3EEEEEE</color> <color name="lb_default_brand_color">#FF455A64</color> <color name="lb_default_search_color">#FFFFAA3F</color> diff --git a/current/support/v17/leanback/res/values/dimens.xml b/current/support/v17/leanback/res/values/dimens.xml index c7d9145..c7664b9 100644 --- a/current/support/v17/leanback/res/values/dimens.xml +++ b/current/support/v17/leanback/res/values/dimens.xml @@ -200,11 +200,14 @@ <dimen name="lb_basic_card_main_width">140dp</dimen> <dimen name="lb_basic_card_main_height">188dp</dimen> <dimen name="lb_basic_card_info_height">52dp</dimen> - <dimen name="lb_basic_card_info_padding">6dp</dimen> - <dimen name="lb_basic_card_info_text_margin">2dp</dimen> - <dimen name="lb_basic_card_title_text_size">16sp</dimen> + <dimen name="lb_basic_card_info_height_no_content">34dp</dimen> + <dimen name="lb_basic_card_info_padding_top">7dp</dimen> + <dimen name="lb_basic_card_info_padding_horizontal">11dp</dimen> + <dimen name="lb_basic_card_info_text_margin">1dp</dimen> + <dimen name="lb_basic_card_title_text_size">14sp</dimen> <dimen name="lb_basic_card_content_text_size">12sp</dimen> <dimen name="lb_basic_card_info_badge_size">16dp</dimen> + <dimen name="lb_basic_card_info_badge_margin">4dp</dimen> <!-- z based shadow --> <dimen name="lb_material_shadow_normal_z">6dp</dimen> diff --git a/current/support/v4/android-support-v4.jar b/current/support/v4/android-support-v4.jar Binary files differindex 43f03db..1d4efde 100644 --- a/current/support/v4/android-support-v4.jar +++ b/current/support/v4/android-support-v4.jar diff --git a/current/support/v4/src/api/current.txt b/current/support/v4/src/api/current.txt index c335c2b..17a1c4e 100644 --- a/current/support/v4/src/api/current.txt +++ b/current/support/v4/src/api/current.txt @@ -1147,11 +1147,13 @@ package android.support.v4.graphics.drawable { public class DrawableCompat { ctor public DrawableCompat(); + method public static int getLayoutDirection(android.graphics.drawable.Drawable); method public static boolean isAutoMirrored(android.graphics.drawable.Drawable); method public static void jumpToCurrentState(android.graphics.drawable.Drawable); method public static void setAutoMirrored(android.graphics.drawable.Drawable, boolean); method public static void setHotspot(android.graphics.drawable.Drawable, float, float); method public static void setHotspotBounds(android.graphics.drawable.Drawable, int, int, int, int); + method public static void setLayoutDirection(android.graphics.drawable.Drawable, int); method public static void setTint(android.graphics.drawable.Drawable, int); method public static void setTintList(android.graphics.drawable.Drawable, android.content.res.ColorStateList); method public static void setTintMode(android.graphics.drawable.Drawable, android.graphics.PorterDuff.Mode); @@ -3068,6 +3070,7 @@ package android.support.v4.widget { method public void closeDrawer(android.view.View); method public void closeDrawer(int); method public void closeDrawers(); + method public float getDrawerElevation(); method public int getDrawerLockMode(int); method public int getDrawerLockMode(android.view.View); method public java.lang.CharSequence getDrawerTitle(int); @@ -3080,6 +3083,7 @@ package android.support.v4.widget { method protected void onLayout(boolean, int, int, int, int); method public void openDrawer(android.view.View); method public void openDrawer(int); + method public void setDrawerElevation(float); method public void setDrawerListener(android.support.v4.widget.DrawerLayout.DrawerListener); method public void setDrawerLockMode(int); method public void setDrawerLockMode(int, int); diff --git a/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar b/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar Binary files differindex add7a8b..d0d65d8 100644 --- a/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar +++ b/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar 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 4c45186..9d193d5 100644 --- a/current/support/v7/appcompat/res/values-v21/themes_base.xml +++ b/current/support/v7/appcompat/res/values-v21/themes_base.xml @@ -52,7 +52,6 @@ <item name="actionMenuTextAppearance">?android:attr/actionMenuTextAppearance</item> <item name="actionModeBackground">?android:attr/actionModeBackground</item> <item name="actionModeCloseDrawable">?android:attr/actionModeCloseDrawable</item> - <item name="actionModeShareDrawable">?android:attr/actionModeShareDrawable</item> <item name="actionOverflowButtonStyle">?android:attr/actionOverflowButtonStyle</item> <item name="homeAsUpIndicator">?android:attr/homeAsUpIndicator</item> @@ -102,7 +101,6 @@ <item name="actionMenuTextAppearance">?android:attr/actionMenuTextAppearance</item> <item name="actionModeBackground">?android:attr/actionModeBackground</item> <item name="actionModeCloseDrawable">?android:attr/actionModeCloseDrawable</item> - <item name="actionModeShareDrawable">?android:attr/actionModeShareDrawable</item> <item name="actionOverflowButtonStyle">?android:attr/actionOverflowButtonStyle</item> <item name="homeAsUpIndicator">?android:attr/homeAsUpIndicator</item> @@ -153,7 +151,7 @@ <style name="Base.Theme.AppCompat.Dialog" parent="Base.V21.Theme.AppCompat.Dialog" /> <style name="Base.Theme.AppCompat.Light.Dialog" parent="Base.V21.Theme.AppCompat.Light.Dialog" /> - <style name="Platform.ThemeOverlay.AppCompat.Dark" parent=""> + <style name="Platform.ThemeOverlay.AppCompat" parent=""> <!-- Copy our color theme attributes to the framework --> <item name="android:colorPrimary">?attr/colorPrimary</item> <item name="android:colorPrimaryDark">?attr/colorPrimaryDark</item> @@ -164,15 +162,8 @@ <item name="android:colorButtonNormal">?attr/colorButtonNormal</item> </style> - <style name="Platform.ThemeOverlay.AppCompat.Light" parent=""> - <!-- Copy our color theme attributes to the framework --> - <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> + <style name="Platform.ThemeOverlay.AppCompat.Dark" /> + + <style name="Platform.ThemeOverlay.AppCompat.Light" /> </resources> diff --git a/current/support/v7/appcompat/res/values-v22/themes_base.xml b/current/support/v7/appcompat/res/values-v22/themes_base.xml new file mode 100644 index 0000000..8a38724 --- /dev/null +++ b/current/support/v7/appcompat/res/values-v22/themes_base.xml @@ -0,0 +1,31 @@ +<?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="Base.Theme.AppCompat" parent="Base.V22.Theme.AppCompat" /> + <style name="Base.Theme.AppCompat.Light" parent="Base.V22.Theme.AppCompat.Light" /> + + <style name="Base.V22.Theme.AppCompat" parent="Base.V21.Theme.AppCompat"> + <item name="actionModeShareDrawable">?android:attr/actionModeShareDrawable</item> + </style> + + <style name="Base.V22.Theme.AppCompat.Light" parent="Base.V21.Theme.AppCompat.Light"> + <item name="actionModeShareDrawable">?android:attr/actionModeShareDrawable</item> + </style> + +</resources> diff --git a/current/support/v7/appcompat/res/values-v23/themes_base.xml b/current/support/v7/appcompat/res/values-v23/themes_base.xml index 5a0074f..becb1f2 100644 --- a/current/support/v7/appcompat/res/values-v23/themes_base.xml +++ b/current/support/v7/appcompat/res/values-v23/themes_base.xml @@ -20,14 +20,14 @@ <style name="Base.Theme.AppCompat" parent="Base.V23.Theme.AppCompat" /> <style name="Base.Theme.AppCompat.Light" parent="Base.V23.Theme.AppCompat.Light" /> - <style name="Base.V23.Theme.AppCompat" parent="Base.V21.Theme.AppCompat"> + <style name="Base.V23.Theme.AppCompat" parent="Base.V22.Theme.AppCompat"> <!-- We can use the platform drawable on v23+ --> <item name="actionBarItemBackground">?android:attr/actionBarItemBackground</item> <item name="controlBackground">@drawable/abc_control_background_material</item> </style> - <style name="Base.V23.Theme.AppCompat.Light" parent="Base.V21.Theme.AppCompat.Light"> + <style name="Base.V23.Theme.AppCompat.Light" parent="Base.V22.Theme.AppCompat.Light"> <!-- We can use the platform drawable on v23+ --> <item name="actionBarItemBackground">?android:attr/actionBarItemBackground</item> diff --git a/current/support/v7/appcompat/res/values/attrs.xml b/current/support/v7/appcompat/res/values/attrs.xml index 0961045..c727a2a 100644 --- a/current/support/v7/appcompat/res/values/attrs.xml +++ b/current/support/v7/appcompat/res/values/attrs.xml @@ -840,6 +840,17 @@ <!-- Allows us to read in the minHeight attr pre-v16 --> <attr name="android:minHeight" /> + + <!-- Drawable to set as the logo that appears at the starting side of + the Toolbar, just after the navigation button. --> + <attr name="logo" /> + <!-- A content description string to describe the appearance of the + associated logo image. --> + <attr name="logoDescription" format="string" /> + <!-- A color to apply to the title string. --> + <attr name="titleTextColor" format="color" /> + <!-- A color to apply to the subtitle string. --> + <attr name="subtitleTextColor" format="color" /> </declare-styleable> <declare-styleable name="PopupWindowBackgroundState"> diff --git a/current/support/v7/appcompat/res/values/themes_base.xml b/current/support/v7/appcompat/res/values/themes_base.xml index d488025..9e9a4ab 100644 --- a/current/support/v7/appcompat/res/values/themes_base.xml +++ b/current/support/v7/appcompat/res/values/themes_base.xml @@ -521,9 +521,11 @@ <style name="Base.Theme.AppCompat.Light.DialogWhenLarge" parent="Theme.AppCompat.Light" /> <!-- Overlay themes --> - <style name="Base.ThemeOverlay.AppCompat" parent="" /> + <style name="Platform.ThemeOverlay.AppCompat" parent="" /> - <style name="Platform.ThemeOverlay.AppCompat.Dark" parent=""> + <style name="Base.ThemeOverlay.AppCompat" parent="Platform.ThemeOverlay.AppCompat" /> + + <style name="Platform.ThemeOverlay.AppCompat.Dark"> <!-- Action Bar styles --> <item name="actionBarItemBackground">@drawable/abc_item_background_holo_dark</item> <item name="actionDropDownStyle">@style/Widget.AppCompat.Spinner.DropDown.ActionBar</item> @@ -534,7 +536,7 @@ <item name="android:dropDownItemStyle">@style/Widget.AppCompat.DropDownItem.Spinner</item> </style> - <style name="Platform.ThemeOverlay.AppCompat.Light" parent=""> + <style name="Platform.ThemeOverlay.AppCompat.Light"> <item name="actionBarItemBackground">@drawable/abc_item_background_holo_light</item> <item name="actionDropDownStyle">@style/Widget.AppCompat.Light.Spinner.DropDown.ActionBar</item> <item name="selectableItemBackground">@drawable/abc_item_background_holo_light</item> diff --git a/current/support/v7/cardview/libs/android-support-v7-cardview.jar b/current/support/v7/cardview/libs/android-support-v7-cardview.jar Binary files differindex 7b61f11..d745e44 100644 --- a/current/support/v7/cardview/libs/android-support-v7-cardview.jar +++ b/current/support/v7/cardview/libs/android-support-v7-cardview.jar diff --git a/current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar b/current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar Binary files differindex 2f8b4bb..8ac1fa5 100644 --- a/current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar +++ b/current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar diff --git a/current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar b/current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar Binary files differindex 0009c9d..a7feea5 100644 --- a/current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar +++ b/current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar diff --git a/current/support/v7/palette/libs/android-support-v7-palette.jar b/current/support/v7/palette/libs/android-support-v7-palette.jar Binary files differindex 235e39e..f2c64f6 100644 --- a/current/support/v7/palette/libs/android-support-v7-palette.jar +++ b/current/support/v7/palette/libs/android-support-v7-palette.jar diff --git a/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar b/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar Binary files differindex 4377e1b..9b9f15f 100644 --- a/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar +++ b/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar diff --git a/current/uiautomator.jar b/current/uiautomator.jar Binary files differindex d26ca5b..17caff2 100644 --- a/current/uiautomator.jar +++ b/current/uiautomator.jar diff --git a/system_current/android.jar b/system_current/android.jar Binary files differindex 8cda20f..fbb3481 100644 --- a/system_current/android.jar +++ b/system_current/android.jar |
