diff options
author | Kathy Kam <kkam@google.com> | 2017-09-14 01:16:34 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-09-14 01:16:34 +0000 |
commit | 349b268ac22eccabdae011ff6b17ae78aba201ce (patch) | |
tree | c99b4b217f331908703cfc739a544d41188f2d91 | |
parent | c5de7c899753968df364a1ec311056f72edb596e (diff) | |
parent | 0ce7811a4defd2bf065700019e931b75ed9415a6 (diff) | |
download | sdk-349b268ac22eccabdae011ff6b17ae78aba201ce.tar.gz |
DO NOT MERGE: Import Support Library from build 4304934 (26.0.2)
am: 0ce7811a4d
Change-Id: Ibf66b70a5e4d08bcacb25b81ced388da47683296
51 files changed, 5 insertions, 5 deletions
diff --git a/current/support/annotations/android-support-annotations.jar b/current/support/annotations/android-support-annotations.jar Binary files differindex eeb477af7..12d306bf3 100644 --- a/current/support/annotations/android-support-annotations.jar +++ b/current/support/annotations/android-support-annotations.jar diff --git a/current/support/compat/libs/android-support-compat.jar b/current/support/compat/libs/android-support-compat.jar Binary files differindex ffcdcfcdc..d4151ca27 100644 --- a/current/support/compat/libs/android-support-compat.jar +++ b/current/support/compat/libs/android-support-compat.jar diff --git a/current/support/core-ui/android-support-core-ui.jar b/current/support/core-ui/android-support-core-ui.jar Binary files differindex 1957ff42a..533c97998 100644 --- a/current/support/core-ui/android-support-core-ui.jar +++ b/current/support/core-ui/android-support-core-ui.jar diff --git a/current/support/core-utils/android-support-core-utils.jar b/current/support/core-utils/android-support-core-utils.jar Binary files differindex f803b80b8..8c84f847a 100644 --- a/current/support/core-utils/android-support-core-utils.jar +++ b/current/support/core-utils/android-support-core-utils.jar diff --git a/current/support/customtabs/android-support-customtabs.jar b/current/support/customtabs/android-support-customtabs.jar Binary files differindex 1f00849f0..181f72877 100644 --- a/current/support/customtabs/android-support-customtabs.jar +++ b/current/support/customtabs/android-support-customtabs.jar diff --git a/current/support/design/libs/android-support-design.jar b/current/support/design/libs/android-support-design.jar Binary files differindex 9ec3ac8f5..6eb84ec57 100644 --- a/current/support/design/libs/android-support-design.jar +++ b/current/support/design/libs/android-support-design.jar diff --git a/current/support/design/res/values/values.xml b/current/support/design/res/values/values.xml index ab1e38bd3..121f64a76 100644 --- a/current/support/design/res/values/values.xml +++ b/current/support/design/res/values/values.xml @@ -300,7 +300,6 @@ <item name="windowNoTitle">true</item> </style> <style name="Widget.Design.AppBarLayout" parent="Base.Widget.Design.AppBarLayout"> - <item name="android:paddingLeft">300px</item> </style> <style name="Widget.Design.BottomNavigationView" parent=""> <item name="itemBackground">?attr/selectableItemBackgroundBorderless</item> diff --git a/current/support/dynamic-animation/android-support-dynamic-animation.jar b/current/support/dynamic-animation/android-support-dynamic-animation.jar Binary files differindex 893a1fef4..b45909be8 100644 --- a/current/support/dynamic-animation/android-support-dynamic-animation.jar +++ b/current/support/dynamic-animation/android-support-dynamic-animation.jar diff --git a/current/support/emoji-appcompat/android-support-emoji-appcompat.jar b/current/support/emoji-appcompat/android-support-emoji-appcompat.jar Binary files differindex 0717037a8..f8e9021a1 100644 --- a/current/support/emoji-appcompat/android-support-emoji-appcompat.jar +++ b/current/support/emoji-appcompat/android-support-emoji-appcompat.jar diff --git a/current/support/emoji-bundled/android-support-emoji-bundled.jar b/current/support/emoji-bundled/android-support-emoji-bundled.jar Binary files differindex 77960442d..795b302e6 100644 --- a/current/support/emoji-bundled/android-support-emoji-bundled.jar +++ b/current/support/emoji-bundled/android-support-emoji-bundled.jar diff --git a/current/support/emoji/libs/android-support-emoji.jar b/current/support/emoji/libs/android-support-emoji.jar Binary files differindex b285357a6..cba20b85a 100644 --- a/current/support/emoji/libs/android-support-emoji.jar +++ b/current/support/emoji/libs/android-support-emoji.jar diff --git a/current/support/exifinterface/android-support-exifinterface.jar b/current/support/exifinterface/android-support-exifinterface.jar Binary files differindex 0a0a85494..de57644c9 100644 --- a/current/support/exifinterface/android-support-exifinterface.jar +++ b/current/support/exifinterface/android-support-exifinterface.jar diff --git a/current/support/fragment/android-support-fragment.jar b/current/support/fragment/android-support-fragment.jar Binary files differindex b12c75f32..951271f43 100644 --- a/current/support/fragment/android-support-fragment.jar +++ b/current/support/fragment/android-support-fragment.jar diff --git a/current/support/graphics/drawable/android-support-animatedvectordrawable.jar b/current/support/graphics/drawable/android-support-animatedvectordrawable.jar Binary files differindex c7e56c320..83b6440cb 100644 --- a/current/support/graphics/drawable/android-support-animatedvectordrawable.jar +++ b/current/support/graphics/drawable/android-support-animatedvectordrawable.jar diff --git a/current/support/graphics/drawable/android-support-vectordrawable.jar b/current/support/graphics/drawable/android-support-vectordrawable.jar Binary files differindex e8cabd9df..ddb425c3c 100644 --- a/current/support/graphics/drawable/android-support-vectordrawable.jar +++ b/current/support/graphics/drawable/android-support-vectordrawable.jar diff --git a/current/support/media-compat/libs/android-support-media-compat.jar b/current/support/media-compat/libs/android-support-media-compat.jar Binary files differindex 9e18c8cb4..ba40ccad8 100644 --- a/current/support/media-compat/libs/android-support-media-compat.jar +++ b/current/support/media-compat/libs/android-support-media-compat.jar diff --git a/current/support/percent/libs/android-support-percent.jar b/current/support/percent/libs/android-support-percent.jar Binary files differindex ea2c24766..3536c3f11 100644 --- a/current/support/percent/libs/android-support-percent.jar +++ b/current/support/percent/libs/android-support-percent.jar diff --git a/current/support/recommendation/android-support-recommendation.jar b/current/support/recommendation/android-support-recommendation.jar Binary files differindex db223fbc5..21ef0899c 100644 --- a/current/support/recommendation/android-support-recommendation.jar +++ b/current/support/recommendation/android-support-recommendation.jar diff --git a/current/support/transition/libs/android-support-transition.jar b/current/support/transition/libs/android-support-transition.jar Binary files differindex 0a6c5db43..df98bd97b 100644 --- a/current/support/transition/libs/android-support-transition.jar +++ b/current/support/transition/libs/android-support-transition.jar diff --git a/current/support/tv-provider/android-support-tv-provider.jar b/current/support/tv-provider/android-support-tv-provider.jar Binary files differindex 5d6cad01f..933726e5f 100644 --- a/current/support/tv-provider/android-support-tv-provider.jar +++ b/current/support/tv-provider/android-support-tv-provider.jar diff --git a/current/support/v13/android-support-v13-nodeps.jar b/current/support/v13/android-support-v13-nodeps.jar Binary files differindex fe4a2c432..e1091481f 100644 --- a/current/support/v13/android-support-v13-nodeps.jar +++ b/current/support/v13/android-support-v13-nodeps.jar diff --git a/current/support/v14/preference/libs/android-support-v14-preference.jar b/current/support/v14/preference/libs/android-support-v14-preference.jar Binary files differindex 729e8a4fc..c2c77f1ec 100644 --- a/current/support/v14/preference/libs/android-support-v14-preference.jar +++ b/current/support/v14/preference/libs/android-support-v14-preference.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 304325f29..9d513d342 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/layout/lb_playback_transport_controls_row.xml b/current/support/v17/leanback/res/layout/lb_playback_transport_controls_row.xml index c8852e8c9..8b692f3b1 100644 --- a/current/support/v17/leanback/res/layout/lb_playback_transport_controls_row.xml +++ b/current/support/v17/leanback/res/layout/lb_playback_transport_controls_row.xml @@ -18,7 +18,7 @@ <!-- Note: clipChildren/clipToPadding false are needed to apply shadows to child views with no padding of their own. Also to allow for negative margin on description. --> -<android.support.v17.leanback.widget.PlaybackTransportRowView +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -68,9 +68,10 @@ android:layout_marginBottom="@dimen/lb_playback_transport_thumbs_bottom_margin" /> </FrameLayout> - <LinearLayout + <android.support.v17.leanback.widget.PlaybackTransportRowView android:layout_width="match_parent" android:layout_height="match_parent" + android:id="@+id/transport_row" android:orientation="vertical" android:paddingStart="?attr/browsePaddingStart" android:paddingEnd="?attr/browsePaddingEnd" @@ -134,5 +135,5 @@ </RelativeLayout> - </LinearLayout> -</android.support.v17.leanback.widget.PlaybackTransportRowView> + </android.support.v17.leanback.widget.PlaybackTransportRowView> +</LinearLayout> diff --git a/current/support/v17/preference-leanback/libs/android-support-v17-preference-leanback.jar b/current/support/v17/preference-leanback/libs/android-support-v17-preference-leanback.jar Binary files differindex 58a55fb70..74a4925d0 100644 --- a/current/support/v17/preference-leanback/libs/android-support-v17-preference-leanback.jar +++ b/current/support/v17/preference-leanback/libs/android-support-v17-preference-leanback.jar diff --git a/current/support/v7/appcompat/libs/android-support-v7-appcompat-nodeps.jar b/current/support/v7/appcompat/libs/android-support-v7-appcompat-nodeps.jar Binary files differindex 024e280a4..410c9e102 100644 --- a/current/support/v7/appcompat/libs/android-support-v7-appcompat-nodeps.jar +++ b/current/support/v7/appcompat/libs/android-support-v7-appcompat-nodeps.jar 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 df3a297ba..1b28b66d5 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 8b8a09e45..8f3e56cc9 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 473bb7b5a..eec351d5d 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/android-support-v7-palette.jar b/current/support/v7/palette/android-support-v7-palette.jar Binary files differindex 8d752c68f..1bb3809cd 100644 --- a/current/support/v7/palette/android-support-v7-palette.jar +++ b/current/support/v7/palette/android-support-v7-palette.jar diff --git a/current/support/v7/preference/libs/android-support-v7-preference.jar b/current/support/v7/preference/libs/android-support-v7-preference.jar Binary files differindex 1985bb8ce..d8b1ce50e 100644 --- a/current/support/v7/preference/libs/android-support-v7-preference.jar +++ b/current/support/v7/preference/libs/android-support-v7-preference.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 46ae01282..2ffe1e9f5 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/support/wear/libs/android-support-wear.jar b/current/support/wear/libs/android-support-wear.jar Binary files differindex 23b527713..f44b78dd7 100644 --- a/current/support/wear/libs/android-support-wear.jar +++ b/current/support/wear/libs/android-support-wear.jar diff --git a/current/support/wear/res/drawable-hdpi-v4/ws_switch_thumb_mtrl_14w.png b/current/support/wear/res/drawable-hdpi-v4/ws_switch_thumb_mtrl_14w.png Binary files differindex 371469c43..035e901b8 100644 --- a/current/support/wear/res/drawable-hdpi-v4/ws_switch_thumb_mtrl_14w.png +++ b/current/support/wear/res/drawable-hdpi-v4/ws_switch_thumb_mtrl_14w.png diff --git a/current/support/wear/res/drawable-hdpi-v4/ws_switch_thumb_mtrl_15w.png b/current/support/wear/res/drawable-hdpi-v4/ws_switch_thumb_mtrl_15w.png Binary files differindex e47726058..6688631af 100644 --- a/current/support/wear/res/drawable-hdpi-v4/ws_switch_thumb_mtrl_15w.png +++ b/current/support/wear/res/drawable-hdpi-v4/ws_switch_thumb_mtrl_15w.png diff --git a/current/support/wear/res/drawable-hdpi-v4/ws_switch_thumb_mtrl_16w.png b/current/support/wear/res/drawable-hdpi-v4/ws_switch_thumb_mtrl_16w.png Binary files differindex 19a1bd317..0dd9fce22 100644 --- a/current/support/wear/res/drawable-hdpi-v4/ws_switch_thumb_mtrl_16w.png +++ b/current/support/wear/res/drawable-hdpi-v4/ws_switch_thumb_mtrl_16w.png diff --git a/current/support/wear/res/drawable-hdpi-v4/ws_switch_thumb_mtrl_17w.png b/current/support/wear/res/drawable-hdpi-v4/ws_switch_thumb_mtrl_17w.png Binary files differindex 79dc7332b..a15b133e1 100644 --- a/current/support/wear/res/drawable-hdpi-v4/ws_switch_thumb_mtrl_17w.png +++ b/current/support/wear/res/drawable-hdpi-v4/ws_switch_thumb_mtrl_17w.png diff --git a/current/support/wear/res/drawable-hdpi-v4/ws_switch_thumb_mtrl_18w.png b/current/support/wear/res/drawable-hdpi-v4/ws_switch_thumb_mtrl_18w.png Binary files differindex 6d921c070..1cd259e88 100644 --- a/current/support/wear/res/drawable-hdpi-v4/ws_switch_thumb_mtrl_18w.png +++ b/current/support/wear/res/drawable-hdpi-v4/ws_switch_thumb_mtrl_18w.png diff --git a/current/support/wear/res/drawable-hdpi-v4/ws_switch_track_mtrl.png b/current/support/wear/res/drawable-hdpi-v4/ws_switch_track_mtrl.png Binary files differindex ecee3e137..8ed1c97fe 100644 --- a/current/support/wear/res/drawable-hdpi-v4/ws_switch_track_mtrl.png +++ b/current/support/wear/res/drawable-hdpi-v4/ws_switch_track_mtrl.png diff --git a/current/support/wear/res/drawable-xhdpi-v4/ws_switch_thumb_mtrl_14w.png b/current/support/wear/res/drawable-xhdpi-v4/ws_switch_thumb_mtrl_14w.png Binary files differindex 7f7ca1416..119207b3a 100644 --- a/current/support/wear/res/drawable-xhdpi-v4/ws_switch_thumb_mtrl_14w.png +++ b/current/support/wear/res/drawable-xhdpi-v4/ws_switch_thumb_mtrl_14w.png diff --git a/current/support/wear/res/drawable-xhdpi-v4/ws_switch_thumb_mtrl_15w.png b/current/support/wear/res/drawable-xhdpi-v4/ws_switch_thumb_mtrl_15w.png Binary files differindex 52120b8be..b89c86a2b 100644 --- a/current/support/wear/res/drawable-xhdpi-v4/ws_switch_thumb_mtrl_15w.png +++ b/current/support/wear/res/drawable-xhdpi-v4/ws_switch_thumb_mtrl_15w.png diff --git a/current/support/wear/res/drawable-xhdpi-v4/ws_switch_thumb_mtrl_16w.png b/current/support/wear/res/drawable-xhdpi-v4/ws_switch_thumb_mtrl_16w.png Binary files differindex d6e9be9e5..752873136 100644 --- a/current/support/wear/res/drawable-xhdpi-v4/ws_switch_thumb_mtrl_16w.png +++ b/current/support/wear/res/drawable-xhdpi-v4/ws_switch_thumb_mtrl_16w.png diff --git a/current/support/wear/res/drawable-xhdpi-v4/ws_switch_thumb_mtrl_17w.png b/current/support/wear/res/drawable-xhdpi-v4/ws_switch_thumb_mtrl_17w.png Binary files differindex 8d76393a1..dba351f28 100644 --- a/current/support/wear/res/drawable-xhdpi-v4/ws_switch_thumb_mtrl_17w.png +++ b/current/support/wear/res/drawable-xhdpi-v4/ws_switch_thumb_mtrl_17w.png diff --git a/current/support/wear/res/drawable-xhdpi-v4/ws_switch_thumb_mtrl_18w.png b/current/support/wear/res/drawable-xhdpi-v4/ws_switch_thumb_mtrl_18w.png Binary files differindex ca9c66e99..ab7b1df85 100644 --- a/current/support/wear/res/drawable-xhdpi-v4/ws_switch_thumb_mtrl_18w.png +++ b/current/support/wear/res/drawable-xhdpi-v4/ws_switch_thumb_mtrl_18w.png diff --git a/current/support/wear/res/drawable-xhdpi-v4/ws_switch_track_mtrl.png b/current/support/wear/res/drawable-xhdpi-v4/ws_switch_track_mtrl.png Binary files differindex 1aa544227..176979529 100644 --- a/current/support/wear/res/drawable-xhdpi-v4/ws_switch_track_mtrl.png +++ b/current/support/wear/res/drawable-xhdpi-v4/ws_switch_track_mtrl.png diff --git a/current/support/wear/res/drawable-xxhdpi-v4/ws_switch_thumb_mtrl_14w.png b/current/support/wear/res/drawable-xxhdpi-v4/ws_switch_thumb_mtrl_14w.png Binary files differindex c0d72d70d..8a00760e1 100644 --- a/current/support/wear/res/drawable-xxhdpi-v4/ws_switch_thumb_mtrl_14w.png +++ b/current/support/wear/res/drawable-xxhdpi-v4/ws_switch_thumb_mtrl_14w.png diff --git a/current/support/wear/res/drawable-xxhdpi-v4/ws_switch_thumb_mtrl_15w.png b/current/support/wear/res/drawable-xxhdpi-v4/ws_switch_thumb_mtrl_15w.png Binary files differindex d7c0ec0fd..64a0cab06 100644 --- a/current/support/wear/res/drawable-xxhdpi-v4/ws_switch_thumb_mtrl_15w.png +++ b/current/support/wear/res/drawable-xxhdpi-v4/ws_switch_thumb_mtrl_15w.png diff --git a/current/support/wear/res/drawable-xxhdpi-v4/ws_switch_thumb_mtrl_16w.png b/current/support/wear/res/drawable-xxhdpi-v4/ws_switch_thumb_mtrl_16w.png Binary files differindex 5815ba9d3..ce7369e18 100644 --- a/current/support/wear/res/drawable-xxhdpi-v4/ws_switch_thumb_mtrl_16w.png +++ b/current/support/wear/res/drawable-xxhdpi-v4/ws_switch_thumb_mtrl_16w.png diff --git a/current/support/wear/res/drawable-xxhdpi-v4/ws_switch_thumb_mtrl_17w.png b/current/support/wear/res/drawable-xxhdpi-v4/ws_switch_thumb_mtrl_17w.png Binary files differindex 41da8c0ea..398e3f2ca 100644 --- a/current/support/wear/res/drawable-xxhdpi-v4/ws_switch_thumb_mtrl_17w.png +++ b/current/support/wear/res/drawable-xxhdpi-v4/ws_switch_thumb_mtrl_17w.png diff --git a/current/support/wear/res/drawable-xxhdpi-v4/ws_switch_thumb_mtrl_18w.png b/current/support/wear/res/drawable-xxhdpi-v4/ws_switch_thumb_mtrl_18w.png Binary files differindex 975eb01ce..1cf40e229 100644 --- a/current/support/wear/res/drawable-xxhdpi-v4/ws_switch_thumb_mtrl_18w.png +++ b/current/support/wear/res/drawable-xxhdpi-v4/ws_switch_thumb_mtrl_18w.png diff --git a/current/support/wear/res/drawable-xxhdpi-v4/ws_switch_track_mtrl.png b/current/support/wear/res/drawable-xxhdpi-v4/ws_switch_track_mtrl.png Binary files differindex af2042be7..a32981791 100644 --- a/current/support/wear/res/drawable-xxhdpi-v4/ws_switch_track_mtrl.png +++ b/current/support/wear/res/drawable-xxhdpi-v4/ws_switch_track_mtrl.png |