diff options
author | Sailesh Nepal <sail@google.com> | 2014-08-13 17:24:00 -0700 |
---|---|---|
committer | Sailesh Nepal <sail@google.com> | 2014-08-13 17:24:00 -0700 |
commit | 80f8b3c376b6d7e6e33828938661b91d48f07e66 (patch) | |
tree | 5ef026b411ebeca0097532c4bcc88a1c73a85741 /current/support | |
parent | 5bef9fefa800db216afa433c0bfa43f0aaa274cb (diff) | |
download | prebuilts_sdk-80f8b3c376b6d7e6e33828938661b91d48f07e66.zip prebuilts_sdk-80f8b3c376b6d7e6e33828938661b91d48f07e66.tar.gz prebuilts_sdk-80f8b3c376b6d7e6e33828938661b91d48f07e66.tar.bz2 |
DO NOT MERGE - Update prebuild current SDK
Copied files from lmp-dev branch at #1353236
http://android-build/builds/git_lmp-dev-linux-sdk_x86-sdk/1353236
Followed the instruction given at : goto/updateprebuilts
Change-Id: Ibb004c2653fa208abe8a5e8c97f92201a9299803
Diffstat (limited to 'current/support')
21 files changed, 87 insertions, 14 deletions
diff --git a/current/support/annotations/android-support-annotations.jar b/current/support/annotations/android-support-annotations.jar Binary files differindex cdffa08..b41262f 100644 --- a/current/support/annotations/android-support-annotations.jar +++ b/current/support/annotations/android-support-annotations.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 ec6570a..12f690c 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 4c35584..90ea75c 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/v13/android-support-v13.jar b/current/support/v13/android-support-v13.jar Binary files differindex 5322c66..c96bbfb 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 e352b9e..8935f9f 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/animator-v21/lb_playback_description_fade_out.xml b/current/support/v17/leanback/res/animator-v21/lb_playback_description_fade_out.xml new file mode 100644 index 0000000..6babde0 --- /dev/null +++ b/current/support/v17/leanback/res/animator-v21/lb_playback_description_fade_out.xml @@ -0,0 +1,23 @@ +<?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. +--> + +<animator xmlns:android="http://schemas.android.com/apk/res/android" + android:interpolator="@android:interpolator/fast_out_linear_in" + android:duration="@integer/lb_playback_description_fade_out_ms" + android:valueFrom="1" + android:valueTo="0" + android:valueType="floatType" /> diff --git a/current/support/v17/leanback/res/animator/lb_playback_description_fade_in.xml b/current/support/v17/leanback/res/animator/lb_playback_description_fade_in.xml new file mode 100644 index 0000000..dfa09d9 --- /dev/null +++ b/current/support/v17/leanback/res/animator/lb_playback_description_fade_in.xml @@ -0,0 +1,22 @@ +<?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. +--> + +<animator xmlns:android="http://schemas.android.com/apk/res/android" + android:duration="@integer/lb_playback_description_fade_in_ms" + android:valueFrom="0" + android:valueTo="1" + android:valueType="floatType" /> diff --git a/current/support/v17/leanback/res/animator/lb_playback_description_fade_out.xml b/current/support/v17/leanback/res/animator/lb_playback_description_fade_out.xml new file mode 100644 index 0000000..7fba44d --- /dev/null +++ b/current/support/v17/leanback/res/animator/lb_playback_description_fade_out.xml @@ -0,0 +1,23 @@ +<?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. +--> + +<animator xmlns:android="http://schemas.android.com/apk/res/android" + android:interpolator="@android:anim/linear_interpolator" + android:duration="@integer/lb_playback_description_fade_out_ms" + android:valueFrom="1" + android:valueTo="0" + android:valueType="floatType" /> diff --git a/current/support/v17/leanback/res/drawable-v21/lb_control_button_primary.xml b/current/support/v17/leanback/res/drawable-v21/lb_control_button_primary.xml index eb081a1..a006889 100644 --- a/current/support/v17/leanback/res/drawable-v21/lb_control_button_primary.xml +++ b/current/support/v17/leanback/res/drawable-v21/lb_control_button_primary.xml @@ -16,7 +16,7 @@ --> <ripple xmlns:android="http://schemas.android.com/apk/res/android" - android:color="?android:attr/colorControlHighlight" > + android:color="@color/lb_control_button_color" > <item android:id="@android:id/mask"> <selector android:constantSize="true" > @@ -24,7 +24,7 @@ <shape android:shape="oval" > <!-- Color not used since this is a ripple mask --> - <solid android:color="@color/lb_control_button_color" /> + <solid android:color="#000000" /> <size android:height="@dimen/lb_control_button_diameter" diff --git a/current/support/v17/leanback/res/drawable-v21/lb_control_button_secondary.xml b/current/support/v17/leanback/res/drawable-v21/lb_control_button_secondary.xml index 6c67206..6623f6e 100644 --- a/current/support/v17/leanback/res/drawable-v21/lb_control_button_secondary.xml +++ b/current/support/v17/leanback/res/drawable-v21/lb_control_button_secondary.xml @@ -16,7 +16,7 @@ --> <ripple xmlns:android="http://schemas.android.com/apk/res/android" - android:color="?android:attr/colorControlHighlight" > + android:color="@color/lb_control_button_color" > <item android:id="@android:id/mask"> <selector android:constantSize="true" > @@ -24,7 +24,7 @@ <shape android:shape="oval" > <!-- Color not used since this is a ripple mask --> - <solid android:color="@color/lb_control_button_color" /> + <solid android:color="#000000" /> <size android:height="@dimen/lb_control_button_secondary_diameter" diff --git a/current/support/v17/leanback/res/layout/lb_playback_controls_row.xml b/current/support/v17/leanback/res/layout/lb_playback_controls_row.xml index a4484a2..561b04f 100644 --- a/current/support/v17/leanback/res/layout/lb_playback_controls_row.xml +++ b/current/support/v17/leanback/res/layout/lb_playback_controls_row.xml @@ -18,7 +18,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:paddingBottom="@dimen/lb_playback_controls_margin_bottom" android:paddingLeft="@dimen/lb_playback_controls_margin_left" android:paddingRight="@dimen/lb_playback_controls_margin_right" > @@ -28,6 +27,7 @@ android:id="@+id/controls_card" android:layout_width="match_parent" android:layout_height="@dimen/lb_playback_controls_card_height" + android:layout_marginBottom="@dimen/lb_playback_controls_margin_bottom" android:orientation="horizontal" > <ImageView @@ -65,7 +65,6 @@ android:layout_height="wrap_content" android:layout_marginEnd="@dimen/lb_playback_description_margin_end" android:layout_marginStart="@dimen/lb_playback_description_margin_start" /> - </LinearLayout> </LinearLayout> @@ -73,7 +72,11 @@ android:id="@+id/secondary_controls_dock" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:layout_marginTop="@dimen/lb_secondary_controls_margin_top" /> + android:layout_gravity="center_horizontal" /> + + <Space + android:id="@+id/bottom_spacer" + android:layout_width="match_parent" + android:layout_height="@dimen/lb_playback_controls_margin_bottom" /> </LinearLayout>
\ No newline at end of file diff --git a/current/support/v17/leanback/res/values/dimens.xml b/current/support/v17/leanback/res/values/dimens.xml index 6b1404f..ca9ac34 100644 --- a/current/support/v17/leanback/res/values/dimens.xml +++ b/current/support/v17/leanback/res/values/dimens.xml @@ -105,8 +105,10 @@ <dimen name="lb_action_text_size">16sp</dimen> <dimen name="lb_action_button_corner_radius">2dp</dimen> - <dimen name="lb_playback_controls_align_bottom">48dp</dimen> - <dimen name="lb_playback_fade_translate_y">384dp</dimen> + <dimen name="lb_playback_controls_align_bottom">58dp</dimen> + <dimen name="lb_playback_controls_padding_bottom">28dp</dimen> + <dimen name="lb_playback_major_fade_translate_y">200dp</dimen> + <dimen name="lb_playback_minor_fade_translate_y">16dp</dimen> <dimen name="lb_playback_controls_card_height">176dp</dimen> <dimen name="lb_playback_controls_margin_left">132dp</dimen> <dimen name="lb_playback_controls_margin_right">132dp</dimen> @@ -118,7 +120,6 @@ <dimen name="lb_playback_current_time_margin_start">16dp</dimen> <dimen name="lb_playback_total_time_margin_end">16dp</dimen> <dimen name="lb_playback_time_padding_top">8dp</dimen> - <dimen name="lb_secondary_controls_margin_top">12dp</dimen> <dimen name="lb_playback_controls_child_margin_default">48dp</dimen> <dimen name="lb_playback_controls_child_margin_bigger">64dp</dimen> <dimen name="lb_playback_controls_child_margin_biggest">88dp</dimen> diff --git a/current/support/v17/leanback/res/values/integers.xml b/current/support/v17/leanback/res/values/integers.xml index 997d2a4..8547e22 100644 --- a/current/support/v17/leanback/res/values/integers.xml +++ b/current/support/v17/leanback/res/values/integers.xml @@ -22,9 +22,11 @@ <integer name="lb_playback_bg_fade_in_ms">325</integer> <integer name="lb_playback_bg_fade_out_ms">500</integer> <integer name="lb_playback_controls_fade_in_ms">250</integer> - <integer name="lb_playback_controls_fade_out_ms">400</integer> + <integer name="lb_playback_controls_fade_out_ms">325</integer> + <integer name="lb_playback_description_fade_in_ms">250</integer> + <integer name="lb_playback_description_fade_out_ms">200</integer> <integer name="lb_playback_rows_fade_in_ms">150</integer> - <integer name="lb_playback_rows_fade_out_ms">325</integer> + <integer name="lb_playback_rows_fade_out_ms">250</integer> <integer name="lb_playback_rows_fade_delay_ms">100</integer> <integer name="lb_playback_controls_show_time_ms">3000</integer> </resources> diff --git a/current/support/v17/leanback/res/values/styles.xml b/current/support/v17/leanback/res/values/styles.xml index ef0a2e5..c683a6e 100644 --- a/current/support/v17/leanback/res/values/styles.xml +++ b/current/support/v17/leanback/res/values/styles.xml @@ -33,7 +33,6 @@ </style> <style name="TextAppearance.Leanback.Row.Header" parent="TextAppearance.Leanback.Header"> - <item name="android:fontFamily">sans-serif</item> </style> <style name="TextAppearance.Leanback.SearchTextEdit" parent="TextAppearance.Leanback"> diff --git a/current/support/v4/android-support-v4.jar b/current/support/v4/android-support-v4.jar Binary files differindex 0d8019c..01b0275 100644 --- a/current/support/v4/android-support-v4.jar +++ b/current/support/v4/android-support-v4.jar 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 9105cd7..8ef83ca 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/cardview/libs/android-support-v7-cardview.jar b/current/support/v7/cardview/libs/android-support-v7-cardview.jar Binary files differindex 542a047..117f334 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 fbcca02..84ae75f 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 69f57dc..536bc97 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 5ad5aa9..b2f4599 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 67fc886..c9fdb4e 100644 --- a/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar +++ b/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar |