diff options
| author | Sandeep Siddhartha <sansid@google.com> | 2014-09-16 13:57:56 -0700 |
|---|---|---|
| committer | Sandeep Siddhartha <sansid@google.com> | 2014-09-16 14:00:49 -0700 |
| commit | fbcf102f82a4e9b9395dd4c4202cfeb035a5d3ad (patch) | |
| tree | fdbeb9f6074b21afaa8e662fef439ec5d87d6c25 /current/support/v17 | |
| parent | 6e45eda532f539af7c4ab3364d01a272bece4c94 (diff) | |
| download | prebuilts_sdk-fbcf102f82a4e9b9395dd4c4202cfeb035a5d3ad.zip prebuilts_sdk-fbcf102f82a4e9b9395dd4c4202cfeb035a5d3ad.tar.gz prebuilts_sdk-fbcf102f82a4e9b9395dd4c4202cfeb035a5d3ad.tar.bz2 | |
Drop SDK with support libraries from #1440061 master
builds/git_master-linux-sdk/1440061
Change-Id: Ib417ca59310b83128a5ae9afe11e5a56e8d42fae
Diffstat (limited to 'current/support/v17')
78 files changed, 1157 insertions, 53 deletions
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 5770035..7a7df0f 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_bg_fade_in.xml b/current/support/v17/leanback/res/animator-v21/lb_playback_bg_fade_in.xml new file mode 100644 index 0000000..bf68bc5 --- /dev/null +++ b/current/support/v17/leanback/res/animator-v21/lb_playback_bg_fade_in.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/linear_out_slow_in" + android:duration="@integer/lb_playback_bg_fade_in_ms" + android:valueFrom="0" + android:valueTo="255" + android:valueType="intType" /> diff --git a/current/support/v17/leanback/res/animator-v21/lb_playback_bg_fade_out.xml b/current/support/v17/leanback/res/animator-v21/lb_playback_bg_fade_out.xml new file mode 100644 index 0000000..888acc9 --- /dev/null +++ b/current/support/v17/leanback/res/animator-v21/lb_playback_bg_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_bg_fade_out_ms" + android:valueFrom="255" + android:valueTo="0" + android:valueType="intType" /> 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_bg_fade_in.xml b/current/support/v17/leanback/res/animator/lb_playback_bg_fade_in.xml new file mode 100644 index 0000000..f529509 --- /dev/null +++ b/current/support/v17/leanback/res/animator/lb_playback_bg_fade_in.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_bg_fade_in_ms" + android:valueFrom="0" + android:valueTo="255" + android:valueType="intType" /> diff --git a/current/support/v17/leanback/res/animator/lb_playback_bg_fade_out.xml b/current/support/v17/leanback/res/animator/lb_playback_bg_fade_out.xml new file mode 100644 index 0000000..005a58f --- /dev/null +++ b/current/support/v17/leanback/res/animator/lb_playback_bg_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_bg_fade_out_ms" + android:valueFrom="255" + android:valueTo="0" + android:valueType="intType" /> diff --git a/current/support/v17/leanback/res/animator/lb_playback_controls_fade_in.xml b/current/support/v17/leanback/res/animator/lb_playback_controls_fade_in.xml new file mode 100644 index 0000000..8ef6c27 --- /dev/null +++ b/current/support/v17/leanback/res/animator/lb_playback_controls_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_controls_fade_in_ms" + android:valueFrom="0" + android:valueTo="1" + android:valueType="floatType" /> diff --git a/current/support/v17/leanback/res/animator/lb_playback_controls_fade_out.xml b/current/support/v17/leanback/res/animator/lb_playback_controls_fade_out.xml new file mode 100644 index 0000000..1ac4f2a --- /dev/null +++ b/current/support/v17/leanback/res/animator/lb_playback_controls_fade_out.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_controls_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/animator/lb_playback_rows_fade_in.xml b/current/support/v17/leanback/res/animator/lb_playback_rows_fade_in.xml new file mode 100644 index 0000000..56bc700 --- /dev/null +++ b/current/support/v17/leanback/res/animator/lb_playback_rows_fade_in.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:duration="@integer/lb_playback_rows_fade_in_ms" + android:startOffset="@integer/lb_playback_rows_fade_delay_ms" + android:valueFrom="0" + android:valueTo="1" + android:valueType="floatType" /> diff --git a/current/support/v17/leanback/res/animator/lb_playback_rows_fade_out.xml b/current/support/v17/leanback/res/animator/lb_playback_rows_fade_out.xml new file mode 100644 index 0000000..eb066d2 --- /dev/null +++ b/current/support/v17/leanback/res/animator/lb_playback_rows_fade_out.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_rows_fade_out_ms" + android:valueFrom="1" + android:valueTo="0" + android:valueType="floatType" /> diff --git a/current/support/v17/leanback/res/drawable-hdpi/lb_bg_protection.png b/current/support/v17/leanback/res/drawable-hdpi/lb_bg_protection.png Binary files differdeleted file mode 100644 index 34fb6a2..0000000 --- a/current/support/v17/leanback/res/drawable-hdpi/lb_bg_protection.png +++ /dev/null diff --git a/current/support/v17/leanback/res/drawable-hdpi/lb_ic_sad_cloud.png b/current/support/v17/leanback/res/drawable-hdpi/lb_ic_sad_cloud.png Binary files differindex 620aba6..222b514 100644 --- a/current/support/v17/leanback/res/drawable-hdpi/lb_ic_sad_cloud.png +++ b/current/support/v17/leanback/res/drawable-hdpi/lb_ic_sad_cloud.png diff --git a/current/support/v17/leanback/res/drawable-mdpi/lb_bg_protection.png b/current/support/v17/leanback/res/drawable-mdpi/lb_bg_protection.png Binary files differdeleted file mode 100644 index 369e36a..0000000 --- a/current/support/v17/leanback/res/drawable-mdpi/lb_bg_protection.png +++ /dev/null diff --git a/current/support/v17/leanback/res/drawable-mdpi/lb_ic_sad_cloud.png b/current/support/v17/leanback/res/drawable-mdpi/lb_ic_sad_cloud.png Binary files differindex 5634efc..d2ec22a 100644 --- a/current/support/v17/leanback/res/drawable-mdpi/lb_ic_sad_cloud.png +++ b/current/support/v17/leanback/res/drawable-mdpi/lb_ic_sad_cloud.png diff --git a/current/support/v17/leanback/res/drawable-v21/lb_action_bg.xml b/current/support/v17/leanback/res/drawable-v21/lb_action_bg.xml new file mode 100644 index 0000000..b4b6a7b --- /dev/null +++ b/current/support/v17/leanback/res/drawable-v21/lb_action_bg.xml @@ -0,0 +1,28 @@ +<?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. +--> + +<ripple xmlns:android="http://schemas.android.com/apk/res/android" + android:color="?android:attr/colorControlHighlight" > + + <item android:id="@android:id/mask"> + <shape android:shape="rectangle" > + <corners android:radius="@dimen/lb_action_button_corner_radius" /> + <solid android:color="?android:attr/colorButtonNormal" /> + </shape> + </item> + +</ripple> diff --git a/current/support/v17/leanback/res/drawable-v21/lb_card_foreground.xml b/current/support/v17/leanback/res/drawable-v21/lb_card_foreground.xml new file mode 100644 index 0000000..3cd9699 --- /dev/null +++ b/current/support/v17/leanback/res/drawable-v21/lb_card_foreground.xml @@ -0,0 +1,20 @@ +<?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. +--> + +<ripple xmlns:android="http://schemas.android.com/apk/res/android" + android:color="?android:attr/colorControlHighlight" > +</ripple>
\ No newline at end of file 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 new file mode 100644 index 0000000..a006889 --- /dev/null +++ b/current/support/v17/leanback/res/drawable-v21/lb_control_button_primary.xml @@ -0,0 +1,37 @@ +<?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. +--> + +<ripple xmlns:android="http://schemas.android.com/apk/res/android" + android:color="@color/lb_control_button_color" > + + <item android:id="@android:id/mask"> + <selector android:constantSize="true" > + <item android:state_focused="true"> + <shape android:shape="oval" > + + <!-- Color not used since this is a ripple mask --> + <solid android:color="#000000" /> + + <size + android:height="@dimen/lb_control_button_diameter" + android:width="@dimen/lb_control_button_diameter" /> + </shape> + </item> + </selector> + </item> + +</ripple>
\ No newline at end of file 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 new file mode 100644 index 0000000..6623f6e --- /dev/null +++ b/current/support/v17/leanback/res/drawable-v21/lb_control_button_secondary.xml @@ -0,0 +1,37 @@ +<?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. +--> + +<ripple xmlns:android="http://schemas.android.com/apk/res/android" + android:color="@color/lb_control_button_color" > + + <item android:id="@android:id/mask"> + <selector android:constantSize="true" > + <item android:state_focused="true"> + <shape android:shape="oval" > + + <!-- Color not used since this is a ripple mask --> + <solid android:color="#000000" /> + + <size + android:height="@dimen/lb_control_button_secondary_diameter" + android:width="@dimen/lb_control_button_secondary_diameter" /> + </shape> + </item> + </selector> + </item> + +</ripple>
\ No newline at end of file diff --git a/current/support/v17/leanback/res/drawable-xhdpi/lb_bg_protection.png b/current/support/v17/leanback/res/drawable-xhdpi/lb_bg_protection.png Binary files differdeleted file mode 100644 index 5e9f150..0000000 --- a/current/support/v17/leanback/res/drawable-xhdpi/lb_bg_protection.png +++ /dev/null diff --git a/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_cc.png b/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_cc.png Binary files differnew file mode 100644 index 0000000..518c063 --- /dev/null +++ b/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_cc.png diff --git a/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_fast_forward.png b/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_fast_forward.png Binary files differnew file mode 100644 index 0000000..c5afb69 --- /dev/null +++ b/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_fast_forward.png diff --git a/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_fast_rewind.png b/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_fast_rewind.png Binary files differnew file mode 100644 index 0000000..d9774ef --- /dev/null +++ b/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_fast_rewind.png diff --git a/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_hq.png b/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_hq.png Binary files differnew file mode 100644 index 0000000..f797d38 --- /dev/null +++ b/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_hq.png diff --git a/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_loop.png b/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_loop.png Binary files differnew file mode 100644 index 0000000..988f572 --- /dev/null +++ b/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_loop.png diff --git a/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_loop_one.png b/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_loop_one.png Binary files differnew file mode 100644 index 0000000..4ae9faa --- /dev/null +++ b/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_loop_one.png diff --git a/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_more.png b/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_more.png Binary files differnew file mode 100644 index 0000000..ef62a69 --- /dev/null +++ b/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_more.png diff --git a/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_pause.png b/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_pause.png Binary files differnew file mode 100644 index 0000000..01e07f7 --- /dev/null +++ b/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_pause.png diff --git a/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_play.png b/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_play.png Binary files differnew file mode 100644 index 0000000..1556076 --- /dev/null +++ b/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_play.png diff --git a/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_playback_loop.png b/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_playback_loop.png Binary files differnew file mode 100644 index 0000000..f444ca4 --- /dev/null +++ b/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_playback_loop.png diff --git a/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_replay.png b/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_replay.png Binary files differnew file mode 100644 index 0000000..a76d8fe --- /dev/null +++ b/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_replay.png diff --git a/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_sad_cloud.png b/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_sad_cloud.png Binary files differindex e301816..b048503 100644 --- a/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_sad_cloud.png +++ b/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_sad_cloud.png diff --git a/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_search_mic.png b/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_search_mic.png Binary files differindex c987c25..a99d693 100644 --- a/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_search_mic.png +++ b/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_search_mic.png diff --git a/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_search_mic_out.png b/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_search_mic_out.png Binary files differindex 5904a4f..f8b3cca 100644 --- a/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_search_mic_out.png +++ b/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_search_mic_out.png diff --git a/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_shuffle.png b/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_shuffle.png Binary files differnew file mode 100644 index 0000000..32cf2dc --- /dev/null +++ b/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_shuffle.png diff --git a/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_skip_next.png b/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_skip_next.png Binary files differnew file mode 100644 index 0000000..2173375 --- /dev/null +++ b/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_skip_next.png diff --git a/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_skip_previous.png b/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_skip_previous.png Binary files differnew file mode 100644 index 0000000..2c6035a --- /dev/null +++ b/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_skip_previous.png diff --git a/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_stop.png b/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_stop.png Binary files differnew file mode 100644 index 0000000..b96f297 --- /dev/null +++ b/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_stop.png diff --git a/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_thumb_down.png b/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_thumb_down.png Binary files differnew file mode 100644 index 0000000..85dd902 --- /dev/null +++ b/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_thumb_down.png diff --git a/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_thumb_down_outline.png b/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_thumb_down_outline.png Binary files differnew file mode 100644 index 0000000..2208fdf --- /dev/null +++ b/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_thumb_down_outline.png diff --git a/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_thumb_up.png b/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_thumb_up.png Binary files differnew file mode 100644 index 0000000..b24b146 --- /dev/null +++ b/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_thumb_up.png diff --git a/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_thumb_up_outline.png b/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_thumb_up_outline.png Binary files differnew file mode 100644 index 0000000..d6a5240 --- /dev/null +++ b/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_thumb_up_outline.png diff --git a/current/support/v17/leanback/res/drawable-xxhdpi/lb_ic_sad_cloud.png b/current/support/v17/leanback/res/drawable-xxhdpi/lb_ic_sad_cloud.png Binary files differindex 8e7e111..825c693 100644 --- a/current/support/v17/leanback/res/drawable-xxhdpi/lb_ic_sad_cloud.png +++ b/current/support/v17/leanback/res/drawable-xxhdpi/lb_ic_sad_cloud.png diff --git a/current/support/v17/leanback/res/drawable/lb_action_bg.xml b/current/support/v17/leanback/res/drawable/lb_card_foreground.xml index 76fbd8f..894a3eb 100644 --- a/current/support/v17/leanback/res/drawable/lb_action_bg.xml +++ b/current/support/v17/leanback/res/drawable/lb_card_foreground.xml @@ -17,6 +17,4 @@ <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - <corners android:radius="2dp" /> - <solid android:color="@color/lb_action_bg_color" /> </shape> diff --git a/current/support/v17/leanback/res/drawable/lb_control_button_primary.xml b/current/support/v17/leanback/res/drawable/lb_control_button_primary.xml new file mode 100644 index 0000000..4528f95 --- /dev/null +++ b/current/support/v17/leanback/res/drawable/lb_control_button_primary.xml @@ -0,0 +1,27 @@ +<?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. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android" android:constantSize="true" > + <item android:state_focused="true"> + <shape android:shape="oval"> + <solid android:color="@color/lb_control_button_color" /> + <size + android:height="@dimen/lb_control_button_diameter" + android:width="@dimen/lb_control_button_diameter" /> + </shape> + </item> +</selector> diff --git a/current/support/v17/leanback/res/drawable/lb_control_button_secondary.xml b/current/support/v17/leanback/res/drawable/lb_control_button_secondary.xml new file mode 100644 index 0000000..9e52645 --- /dev/null +++ b/current/support/v17/leanback/res/drawable/lb_control_button_secondary.xml @@ -0,0 +1,27 @@ +<?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. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android" android:constantSize="true" > + <item android:state_focused="true"> + <shape android:shape="oval"> + <solid android:color="@color/lb_control_button_color" /> + <size + android:height="@dimen/lb_control_button_secondary_diameter" + android:width="@dimen/lb_control_button_secondary_diameter" /> + </shape> + </item> +</selector> diff --git a/current/support/v17/leanback/res/drawable/lb_headers_right_fading.xml b/current/support/v17/leanback/res/drawable/lb_headers_right_fading.xml new file mode 100644 index 0000000..96794db --- /dev/null +++ b/current/support/v17/leanback/res/drawable/lb_headers_right_fading.xml @@ -0,0 +1,25 @@ +<?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. +--> + +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle"> + <gradient + android:angle="0" + android:startColor="#00000000" + android:endColor="@color/lb_default_brand_color" + /> +</shape> diff --git a/current/support/v17/leanback/res/drawable/lb_playback_progress_bar.xml b/current/support/v17/leanback/res/drawable/lb_playback_progress_bar.xml new file mode 100644 index 0000000..04e72b6 --- /dev/null +++ b/current/support/v17/leanback/res/drawable/lb_playback_progress_bar.xml @@ -0,0 +1,31 @@ +<?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. +--> + +<layer-list xmlns:android="http://schemas.android.com/apk/res/android" > + + <item + android:id="@android:id/background" + android:drawable="@color/lb_playback_background_progress_color"/> + <item android:id="@android:id/secondaryProgress"> + <clip android:drawable="@color/lb_playback_secondary_progress_color" /> + </item> + <item android:id="@android:id/progress"> + <!-- Progress color set programmtically, this is just a placeholder. --> + <clip android:drawable="@color/lb_playback_progress_color_no_theme" /> + </item> + +</layer-list> diff --git a/current/support/v17/leanback/res/drawable/lb_rounded_rect_bg.xml b/current/support/v17/leanback/res/drawable/lb_rounded_rect_bg.xml new file mode 100644 index 0000000..ee0f2e8 --- /dev/null +++ b/current/support/v17/leanback/res/drawable/lb_rounded_rect_bg.xml @@ -0,0 +1,21 @@ +<?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. +--> + +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle"> + <corners android:radius="@dimen/lb_rounded_rect_corner_radius" /> +</shape> diff --git a/current/support/v17/leanback/res/layout/lb_browse_fragment.xml b/current/support/v17/leanback/res/layout/lb_browse_fragment.xml index 076a2f1..8ea9a53 100644 --- a/current/support/v17/leanback/res/layout/lb_browse_fragment.xml +++ b/current/support/v17/leanback/res/layout/lb_browse_fragment.xml @@ -32,11 +32,16 @@ <android.support.v17.leanback.app.BrowseRowsFrameLayout android:id="@+id/browse_container_dock" android:layout_width="match_parent" - android:layout_height="match_parent" /> + android:layout_height="match_parent" + android:clipChildren="false" /> + + <!-- Padding needed for shadow --> <FrameLayout android:id="@+id/browse_headers_dock" android:layout_width="wrap_content" - android:layout_height="match_parent" /> + android:layout_height="match_parent" + android:clipToPadding="false" + android:paddingEnd="50dp" /> <include layout="@layout/lb_browse_title" /> </android.support.v17.leanback.app.BrowseFrameLayout> </FrameLayout> diff --git a/current/support/v17/leanback/res/layout/lb_control_bar.xml b/current/support/v17/leanback/res/layout/lb_control_bar.xml new file mode 100644 index 0000000..b7ad3a3 --- /dev/null +++ b/current/support/v17/leanback/res/layout/lb_control_bar.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. +--> + +<android.support.v17.leanback.widget.ControlBar xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/control_bar" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="horizontal" /> diff --git a/current/support/v17/leanback/res/layout/lb_control_button_primary.xml b/current/support/v17/leanback/res/layout/lb_control_button_primary.xml new file mode 100644 index 0000000..86e3e0d --- /dev/null +++ b/current/support/v17/leanback/res/layout/lb_control_button_primary.xml @@ -0,0 +1,36 @@ +<?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. +--> + +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="wrap_content" + android:layout_height="wrap_content" > + + <ImageView + android:id="@+id/button" + style="?attr/playbackControlsButtonStyle" + android:layout_width="@dimen/lb_control_button_diameter" + android:layout_height="@dimen/lb_control_button_height" + android:scaleType="center" + android:src="@drawable/lb_control_button_primary" /> + + <ImageView + android:id="@+id/icon" + android:layout_width="@dimen/lb_control_icon_width" + android:layout_height="@dimen/lb_control_icon_height" + android:layout_gravity="center" /> + +</FrameLayout>
\ No newline at end of file diff --git a/current/support/v17/leanback/res/layout/lb_control_button_secondary.xml b/current/support/v17/leanback/res/layout/lb_control_button_secondary.xml new file mode 100644 index 0000000..4d0cafd --- /dev/null +++ b/current/support/v17/leanback/res/layout/lb_control_button_secondary.xml @@ -0,0 +1,36 @@ +<?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. +--> + +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="wrap_content" + android:layout_height="wrap_content" > + + <ImageView + android:id="@+id/button" + style="?attr/playbackControlsButtonStyle" + android:layout_width="@dimen/lb_control_button_secondary_diameter" + android:layout_height="@dimen/lb_control_button_secondary_height" + android:scaleType="center" + android:src="@drawable/lb_control_button_secondary" /> + + <ImageView + android:id="@+id/icon" + android:layout_width="@dimen/lb_control_icon_width" + android:layout_height="@dimen/lb_control_icon_height" + android:layout_gravity="center" /> + +</FrameLayout>
\ No newline at end of file diff --git a/current/support/v17/leanback/res/layout/lb_details_overview.xml b/current/support/v17/leanback/res/layout/lb_details_overview.xml index ae8cddd..ce337e8 100644 --- a/current/support/v17/leanback/res/layout/lb_details_overview.xml +++ b/current/support/v17/leanback/res/layout/lb_details_overview.xml @@ -22,6 +22,7 @@ android:paddingLeft="@dimen/lb_details_overview_margin_left" android:paddingRight="@dimen/lb_details_overview_margin_right" android:paddingBottom="@dimen/lb_details_overview_margin_bottom" + android:clipToPadding="false" > <!-- Background is applied to this inner layout --> @@ -41,10 +42,11 @@ /> <LinearLayout + android:id="@+id/details_overview_right_panel" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginBottom="@dimen/lb_details_overview_description_margin_bottom" - android:layout_marginTop="@dimen/lb_details_overview_description_margin_top" + android:paddingBottom="@dimen/lb_details_overview_description_margin_bottom" + android:paddingTop="@dimen/lb_details_overview_description_margin_top" android:orientation="vertical" > <FrameLayout diff --git a/current/support/v17/leanback/res/layout/lb_headers_fragment.xml b/current/support/v17/leanback/res/layout/lb_headers_fragment.xml index dbfbb8d..a621c0b 100644 --- a/current/support/v17/leanback/res/layout/lb_headers_fragment.xml +++ b/current/support/v17/leanback/res/layout/lb_headers_fragment.xml @@ -14,10 +14,23 @@ See the License for the specific language governing permissions and limitations under the License. --> -<android.support.v17.leanback.widget.VerticalGridView +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:lb="http://schemas.android.com/apk/res-auto" - android:id="@+id/browse_headers" android:layout_width="@dimen/lb_browse_headers_width" android:layout_height="match_parent" - style="?attr/headersVerticalGridStyle"/> + android:paddingRight="@dimen/lb_browse_header_padding_right" + android:elevation="@dimen/lb_browse_headers_z" + > + <android.support.v17.leanback.widget.VerticalGridView + android:id="@+id/browse_headers" + android:layout_width="@dimen/lb_browse_headers_width" + android:layout_height="match_parent" + style="?attr/headersVerticalGridStyle"/> + <View + android:id="@+id/fade_out_edge" + android:layout_alignParentRight="true" + android:layout_width="@dimen/lb_browse_header_fading_length" + android:layout_height="match_parent" + android:background="@drawable/lb_headers_right_fading" > + </View> +</RelativeLayout> 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 15f1164..d5591d1 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,13 +27,12 @@ android:scaleType="centerCrop" android:adjustViewBounds="true" android:contentDescription="@null" /> - <FrameLayout + <android.support.v17.leanback.widget.ImageCardViewInfo android:layout_width="match_parent" android:layout_height="wrap_content" lb:layout_viewType="info" > <RelativeLayout android:id="@+id/info_field" - android:background="@color/lb_basic_card_info_bg_color" android:layout_width="match_parent" android:layout_height="@dimen/lb_basic_card_info_height" android:padding="@dimen/lb_basic_card_info_padding" @@ -70,7 +69,6 @@ android:layout_alignParentBottom="true" android:layout_alignParentRight="true" android:scaleType="fitCenter" - android:background="@color/lb_basic_card_info_bg_color" android:visibility="gone" android:contentDescription="@null" /> <ImageView @@ -84,5 +82,5 @@ android:visibility="gone" android:contentDescription="@null" /> </RelativeLayout> - </FrameLayout> + </android.support.v17.leanback.widget.ImageCardViewInfo> </merge> diff --git a/current/support/v17/leanback/res/layout/lb_playback_controls.xml b/current/support/v17/leanback/res/layout/lb_playback_controls.xml new file mode 100644 index 0000000..e7ed643 --- /dev/null +++ b/current/support/v17/leanback/res/layout/lb_playback_controls.xml @@ -0,0 +1,70 @@ +<?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. +--> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" > + + <ProgressBar + android:id="@+id/playback_progress" + style="?android:attr/progressBarStyleHorizontal" + android:layout_width="match_parent" + android:layout_height="4dp" + android:maxHeight="4dp" + android:minHeight="4dp" + android:progressDrawable="@drawable/lb_playback_progress_bar" /> + + <FrameLayout + android:id="@+id/controls_container" + android:layout_width="match_parent" + android:layout_height="wrap_content" > + + <android.support.v17.leanback.widget.ControlBar + android:id="@+id/control_bar" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:orientation="horizontal" /> + + <FrameLayout + android:id="@+id/more_actions_dock" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" /> + + <TextView + android:id="@+id/current_time" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="top|start" + android:layout_marginStart="@dimen/lb_playback_current_time_margin_start" + android:paddingTop="@dimen/lb_playback_time_padding_top" + style="?attr/playbackControlsTimeStyle" /> + + <TextView + android:id="@+id/total_time" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="top|end" + android:layout_marginEnd="@dimen/lb_playback_total_time_margin_end" + android:paddingTop="@dimen/lb_playback_time_padding_top" + style="?attr/playbackControlsTimeStyle" /> + + </FrameLayout> + +</LinearLayout>
\ No newline at end of file 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 new file mode 100644 index 0000000..2875b51 --- /dev/null +++ b/current/support/v17/leanback/res/layout/lb_playback_controls_row.xml @@ -0,0 +1,90 @@ +<?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. +--> + +<!-- Note: clipChildren/clipToPadding false are needed to apply shadows to child + views with no padding of their own. --> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:clipChildren="false" + android:clipToPadding="false" + android:paddingLeft="@dimen/lb_playback_controls_margin_left" + android:paddingRight="@dimen/lb_playback_controls_margin_right" > + + <LinearLayout + 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:clipChildren="false" + android:clipToPadding="false" + android:orientation="horizontal" > + + <ImageView + android:id="@+id/image" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:adjustViewBounds="true" + android:scaleType="fitStart" /> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:clipChildren="false" + android:clipToPadding="false" + android:orientation="vertical" > + + <FrameLayout + android:id="@+id/description_dock" + android:layout_width="wrap_content" + android:layout_height="0dp" + android:layout_marginEnd="@dimen/lb_playback_description_margin_end" + android:layout_marginStart="@dimen/lb_playback_description_margin_start" + android:layout_marginTop="@dimen/lb_playback_description_margin_top" + android:layout_weight="1" + android:gravity="top" /> + + <!-- Space here prevents room only for title and subtitle above --> + + <Space + android:id="@+id/spacer" + android:layout_width="match_parent" + android:layout_height="12dp" /> + + <FrameLayout + android:id="@+id/controls_dock" + android:layout_width="match_parent" + 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> + + <FrameLayout + android:id="@+id/secondary_controls_dock" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + 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/layout/lb_row_container.xml b/current/support/v17/leanback/res/layout/lb_row_container.xml index 0f5dd5f..46eeef1 100644 --- a/current/support/v17/leanback/res/layout/lb_row_container.xml +++ b/current/support/v17/leanback/res/layout/lb_row_container.xml @@ -15,12 +15,12 @@ limitations under the License. --> <merge xmlns:android="http://schemas.android.com/apk/res/android"> -<LinearLayout +<android.support.v17.leanback.widget.RowContainerViewHeaderDock android:id="@+id/lb_row_container_header_dock" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:paddingLeft="?attr/browsePaddingLeft" android:clipToPadding="false"> -</LinearLayout> +</android.support.v17.leanback.widget.RowContainerViewHeaderDock> </merge>
\ No newline at end of file diff --git a/current/support/v17/leanback/res/layout/lb_search_bar.xml b/current/support/v17/leanback/res/layout/lb_search_bar.xml index 959d230..4dff716 100644 --- a/current/support/v17/leanback/res/layout/lb_search_bar.xml +++ b/current/support/v17/leanback/res/layout/lb_search_bar.xml @@ -34,7 +34,8 @@ android:layout_toRightOf="@+id/lb_search_bar_speech_orb" android:layout_centerVertical="true" android:layout_marginLeft="@dimen/lb_search_bar_items_margin_left" - android:orientation="horizontal" + android:layout_marginTop="@dimen/lb_search_bar_inner_margin_top" + android:layout_marginBottom="@dimen/lb_search_bar_inner_margin_bottom" android:background="@drawable/lb_in_app_search_bg" > @@ -66,8 +67,8 @@ android:imeOptions="normal|flagNoExtractUi|actionSearch" android:inputType="text|textAutoComplete" android:singleLine="true" - android:textColor="@color/lb_search_bar_text_color" - android:textColorHint="@color/lb_search_bar_hint_color" + android:textColor="@color/lb_search_bar_text" + android:textColorHint="@color/lb_search_bar_hint" android:textCursorDrawable="@null" android:hint="@string/lb_search_bar_hint" android:textSize="@dimen/lb_search_bar_text_size"/> diff --git a/current/support/v17/leanback/res/layout/lb_speech_orb.xml b/current/support/v17/leanback/res/layout/lb_speech_orb.xml index ff6129b..4806274 100644 --- a/current/support/v17/leanback/res/layout/lb_speech_orb.xml +++ b/current/support/v17/leanback/res/layout/lb_speech_orb.xml @@ -18,13 +18,13 @@ <merge xmlns:android="http://schemas.android.com/apk/res/android" > <View - android:id="@+id/lb_speech_orb" + android:id="@+id/search_orb" android:layout_width="@dimen/lb_search_bar_speech_orb_size" android:layout_height="@dimen/lb_search_bar_speech_orb_size" android:background="@drawable/lb_speech_orb" /> <ImageView - android:id="@+id/lb_speech_icon" + android:id="@+id/icon" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" diff --git a/current/support/v17/leanback/res/layout/lb_vertical_grid_fragment.xml b/current/support/v17/leanback/res/layout/lb_vertical_grid_fragment.xml index 4cd3a22..db43e22 100644 --- a/current/support/v17/leanback/res/layout/lb_vertical_grid_fragment.xml +++ b/current/support/v17/leanback/res/layout/lb_vertical_grid_fragment.xml @@ -23,6 +23,7 @@ android:id="@+id/browse_frame" android:focusable="true" android:focusableInTouchMode="true" + android:descendantFocusability="afterDescendants" android:layout_width="match_parent" android:layout_height="match_parent" > diff --git a/current/support/v17/leanback/res/transition-v21/lb_enter_transition.xml b/current/support/v17/leanback/res/transition-v21/lb_enter_transition.xml new file mode 100644 index 0000000..1572934 --- /dev/null +++ b/current/support/v17/leanback/res/transition-v21/lb_enter_transition.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. +--> + +<transitionSet xmlns:android="http://schemas.android.com/apk/res/android" > + <fade + android:interpolator="@android:interpolator/linear_out_slow_in" + android:startDelay="175" + android:duration="400"/> +</transitionSet>
\ No newline at end of file diff --git a/current/support/v17/leanback/res/transition-v21/lb_return_transition.xml b/current/support/v17/leanback/res/transition-v21/lb_return_transition.xml new file mode 100644 index 0000000..0165a18 --- /dev/null +++ b/current/support/v17/leanback/res/transition-v21/lb_return_transition.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. +--> + +<transitionSet xmlns:android="http://schemas.android.com/apk/res/android" > + <fade + android:interpolator="@android:interpolator/linear_out_slow_in" + android:startDelay="75" + android:duration="250"/> +</transitionSet> diff --git a/current/support/v17/leanback/res/transition-v21/lb_shared_element_enter_transition.xml b/current/support/v17/leanback/res/transition-v21/lb_shared_element_enter_transition.xml new file mode 100644 index 0000000..0ba4125 --- /dev/null +++ b/current/support/v17/leanback/res/transition-v21/lb_shared_element_enter_transition.xml @@ -0,0 +1,31 @@ +<?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. +--> + +<transitionSet xmlns:android="http://schemas.android.com/apk/res/android" + android:duration="500" > + <fade + android:interpolator="@android:interpolator/linear_out_slow_in" + android:startDelay="325" + android:duration="150"/> + <changeBounds + android:interpolator="@android:interpolator/linear_out_slow_in"> + </changeBounds> + <changeTransform + android:interpolator="@android:interpolator/linear_out_slow_in" /> + <changeImageTransform + android:interpolator="@android:interpolator/linear_out_slow_in"/> +</transitionSet>
\ No newline at end of file diff --git a/current/support/v17/leanback/res/transition-v21/lb_shared_element_return_transition.xml b/current/support/v17/leanback/res/transition-v21/lb_shared_element_return_transition.xml new file mode 100644 index 0000000..ee008e0 --- /dev/null +++ b/current/support/v17/leanback/res/transition-v21/lb_shared_element_return_transition.xml @@ -0,0 +1,32 @@ +<?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. +--> + +<transitionSet xmlns:android="http://schemas.android.com/apk/res/android" > + <fade + android:interpolator="@android:interpolator/linear_out_slow_in" + android:duration="75"/> + <changeBounds + android:interpolator="@android:interpolator/linear_out_slow_in" + android:duration="325"> + </changeBounds> + <changeTransform + android:interpolator="@android:interpolator/linear_out_slow_in" + android:duration="325"/> + <changeImageTransform + android:interpolator="@android:interpolator/linear_out_slow_in" + android:duration="325"/> +</transitionSet>
\ No newline at end of file diff --git a/current/support/v17/leanback/res/values-da/strings.xml b/current/support/v17/leanback/res/values-da/strings.xml index 51a195a..064be9a 100644 --- a/current/support/v17/leanback/res/values-da/strings.xml +++ b/current/support/v17/leanback/res/values-da/strings.xml @@ -17,7 +17,7 @@ limitations under the License. <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="orb_search_action" msgid="5651268540267663887">"Søgehandling"</string> + <string name="orb_search_action" msgid="5651268540267663887">"Søg handling"</string> <string name="lb_search_bar_hint" msgid="8325490927970116252">"Søg"</string> <string name="lb_search_bar_hint_speech" msgid="5511270823320183816">"Tal for at søge"</string> <string name="lb_search_bar_hint_with_title" msgid="1627103380996590035">"Søg efter <xliff:g id="SEARCH_CONTEXT">%1$s</xliff:g>"</string> diff --git a/current/support/v17/leanback/res/values-v19/themes.xml b/current/support/v17/leanback/res/values-v19/themes.xml new file mode 100644 index 0000000..a466ad7 --- /dev/null +++ b/current/support/v17/leanback/res/values-v19/themes.xml @@ -0,0 +1,24 @@ +<?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. +--> + +<resources> + <style name="Theme.LeanbackBase" parent="android:Theme.Holo.NoActionBar.TranslucentDecor"> + <item name="playbackProgressPrimaryColor">@color/lb_playback_progress_color_no_theme</item> + <item name="playbackControlsIconHighlightColor">@color/lb_playback_icon_highlight_no_theme</item> + <item name="defaultBrandColor">@color/lb_default_brand_color</item> + </style> +</resources> diff --git a/current/support/v17/leanback/res/values-v21/styles.xml b/current/support/v17/leanback/res/values-v21/styles.xml new file mode 100644 index 0000000..70aa93a --- /dev/null +++ b/current/support/v17/leanback/res/values-v21/styles.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. +--> + +<resources> + <style name="Widget.Leanback.DetailsActionButtonStyleBase" parent="android:Widget.Material.Button.Borderless"> + <item name="android:background">@drawable/lb_action_bg</item> + </style> + +</resources> diff --git a/current/support/v17/leanback/res/values-v21/themes.xml b/current/support/v17/leanback/res/values-v21/themes.xml index 9538d2b..9061674 100644 --- a/current/support/v17/leanback/res/values-v21/themes.xml +++ b/current/support/v17/leanback/res/values-v21/themes.xml @@ -17,5 +17,9 @@ <resources> <style name="Theme.LeanbackBase" parent="android:Theme.Material.NoActionBar"> + <item name="playbackProgressPrimaryColor">?android:attr/colorAccent</item> + <item name="playbackControlsIconHighlightColor">?android:attr/colorAccent</item> + <item name="defaultBrandColor">?android:attr/colorPrimary</item> + <item name="android:colorPrimary">@color/lb_default_brand_color</item> </style> </resources> diff --git a/current/support/v17/leanback/res/values/attrs.xml b/current/support/v17/leanback/res/values/attrs.xml index ecacc55..47211ea 100644 --- a/current/support/v17/leanback/res/values/attrs.xml +++ b/current/support/v17/leanback/res/values/attrs.xml @@ -115,6 +115,10 @@ </attr> </declare-styleable> + <declare-styleable name="lbImageCardView"> + <attr name="infoAreaBackground" format="reference|color"/> + </declare-styleable> + <declare-styleable name="lbSearchOrbView"> <!-- Defining icon of the search affordance --> <attr name="searchOrbIcon" format="reference"/> @@ -126,6 +130,24 @@ <attr name="searchOrbBrightColor" format="reference|color" /> </declare-styleable> + <declare-styleable name="lbPlaybackControlsActionIcons"> + <attr name="play" format="reference"/> + <attr name="pause" format="reference"/> + <attr name="fast_forward" format="reference"/> + <attr name="rewind" format="reference"/> + <attr name="skip_next" format="reference"/> + <attr name="skip_previous" format="reference"/> + <attr name="thumb_up_outline" format="reference"/> + <attr name="thumb_up" format="reference"/> + <attr name="thumb_down_outline" format="reference"/> + <attr name="thumb_down" format="reference"/> + <attr name="repeat" format="reference"/> + <attr name="repeat_one" format="reference"/> + <attr name="shuffle" format="reference"/> + <attr name="high_quality" format="reference"/> + <attr name="closed_captioning" format="reference"/> + </declare-styleable> + <declare-styleable name="LeanbackTheme"> <!-- left padding of BrowseFragment, RowsFragment, DetailsFragment --> @@ -180,14 +202,24 @@ <attr name="detailsDescriptionBodyStyle" format="reference" /> <attr name="detailsActionButtonStyle" format="reference" /> + <!-- for playback controls --> + <attr name="playbackControlsButtonStyle" format="reference" /> + <attr name="playbackControlsTimeStyle" format="reference" /> + <!-- style for a vertical grid of items --> <attr name="itemsVerticalGridStyle" format="reference" /> <!-- for messages in the error fragment --> <attr name="errorMessageStyle" format="reference" /> - <!-- Default colors --> + <!-- Default brand color used for the background of certain leanback visual elements + such as the headers fragment. If your app runs on: + a) SDK 21+: set colorPrimary, used by the leanback launcher and elsewhere, and defaultBrandColor will inherit it. + b) SDK < 21: set the brand color explicitly via defaultBrandColor, or programatically. + --> <attr name="defaultBrandColor" format="reference|color" /> + + <!-- Default colors --> <attr name="defaultSearchColor" format="reference|color" /> <!-- Default color that search orb pulses to. If not set, this color is determined programatically based on the defaultSearchColor --> <attr name="defaultSearchBrightColor" format="reference|color" /> @@ -195,6 +227,18 @@ <!-- Style for searchOrb --> <attr name="searchOrbViewStyle" format="reference"/> <attr name="defaultSearchIcon" format="reference" /> + + <attr name="playbackProgressPrimaryColor" format="reference|color" /> + <attr name="playbackControlsIconHighlightColor" format="reference|color" /> + <attr name="playbackControlsActionIcons" format="reference" /> + + <!-- Default color for dimmed views. --> + <attr name="overlayDimMaskColor" format="color" /> + <!-- Default level of dimming for active views. --> + <attr name="overlayDimActiveLevel" format="fraction" /> + <!-- Default level of dimming for dimmed views. --> + <attr name="overlayDimDimmedLevel" format="fraction" /> + </declare-styleable> diff --git a/current/support/v17/leanback/res/values/colors.xml b/current/support/v17/leanback/res/values/colors.xml index 5fc7e0a..e49b2a5 100644 --- a/current/support/v17/leanback/res/values/colors.xml +++ b/current/support/v17/leanback/res/values/colors.xml @@ -25,10 +25,10 @@ <color name="lb_background_protection">#99000000</color> <color name="lb_view_dim_mask_color">#000000</color> - <item name="lb_view_dimmed_level" type="dimen">60%</item> <color name="lb_details_overview_bg_color">#1B1B1B</color> <color name="lb_details_description_color">#EEEEEE</color> + <color name="lb_details_description_body_color">#B2EEEEEE</color> <color name="lb_error_background_color_opaque">#262626</color> <color name="lb_error_background_color_translucent">#E6000000</color> @@ -36,14 +36,16 @@ <color name="lb_error_message_color_on_translucent">#80555555</color> <color name="lb_action_text_color">#EEEEEE</color> - <color name="lb_action_bg_color">#3D3D3D</color> - <color name="lb_search_bar_text_color">#FFEEEEEE</color> - <color name="lb_search_bar_text_speech_color">#FF444444</color> - <color name="lb_search_bar_hint_color">#66222222</color> + <color name="lb_search_bar_text">#FFEEEEEE</color> + <color name="lb_search_bar_text_speech_mode">#FF444444</color> + <color name="lb_search_bar_hint">#FF888888</color> + <color name="lb_search_bar_hint_speech_mode">#66222222</color> - <color name="lb_speech_orb_not_recording">#33EEEEEE</color> - <color name="lb_speech_orb_recording">#33EE0000</color> + <color name="lb_speech_orb_not_recording">#CCCCCC</color> + <color name="lb_speech_orb_not_recording_pulsed">#EEEEEE</color> + <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> @@ -52,4 +54,14 @@ <color name="lb_default_brand_color">#FF455A64</color> <color name="lb_default_search_color">#FFFFAA3F</color> + + <color name="lb_control_button_color">#66EEEEEE</color> + <color name="lb_playback_progress_color_no_theme">#ff40c4ff</color> + <color name="lb_playback_icon_highlight_no_theme">#ff40c4ff</color> + <color name="lb_playback_secondary_progress_color">#33FFFFFF</color> + <color name="lb_playback_background_progress_color">#19FFFFFF</color> + <color name="lb_playback_controls_background_light">#80000000</color> + <color name="lb_playback_controls_background_dark">#c0000000</color> + <color name="lb_playback_controls_time_text_color">#B2EEEEEE</color> + </resources> diff --git a/current/support/v17/leanback/res/values/dimens.xml b/current/support/v17/leanback/res/values/dimens.xml index 30bc8e8..5e0b4ee 100644 --- a/current/support/v17/leanback/res/values/dimens.xml +++ b/current/support/v17/leanback/res/values/dimens.xml @@ -36,14 +36,15 @@ <dimen name="lb_browse_headers_width">270dp</dimen> <integer name="lb_browse_headers_transition_delay">150</integer> <integer name="lb_browse_headers_transition_duration">250</integer> - <integer name="lb_browse_rows_anim_duration">250</integer> + <item name="lb_browse_rows_scale" type="fraction">80%</item> <!-- Derived from the ux spec of 48dp baseline to baseline --> <dimen name="lb_browse_headers_vertical_margin">21dp</dimen> <dimen name="lb_browse_header_text_size">20sp</dimen> - <dimen name="lb_browse_header_padding_right">24dp</dimen> <dimen name="lb_browse_header_height">24dp</dimen> + <dimen name="lb_browse_header_fading_length">12dp</dimen> + <dimen name="lb_browse_header_padding_right">8dp</dimen> <item name="lb_browse_header_select_duration" format="integer" type="dimen">150</item> <item name="lb_browse_header_unselect_alpha" type="fraction">50%</item> @@ -58,9 +59,9 @@ <dimen name="lb_browse_expanded_selected_row_top_padding">16dp</dimen> <dimen name="lb_browse_expanded_row_no_hovercard_bottom_padding">28dp</dimen> - <item name="lb_focus_zoom_factor_small" type="fraction">106%</item> - <item name="lb_focus_zoom_factor_medium" type="fraction">110%</item> - <item name="lb_focus_zoom_factor_large" type="fraction">114%</item> + <item name="lb_focus_zoom_factor_small" type="fraction">110%</item> + <item name="lb_focus_zoom_factor_medium" type="fraction">114%</item> + <item name="lb_focus_zoom_factor_large" type="fraction">118%</item> <dimen name="lb_details_overview_height_large">274dp</dimen> <dimen name="lb_details_overview_height_small">159dp</dimen> @@ -74,7 +75,7 @@ <dimen name="lb_details_overview_description_margin_bottom">12dp</dimen> <dimen name="lb_details_overview_image_margin_horizontal">24dp</dimen> <dimen name="lb_details_overview_image_margin_vertical">24dp</dimen> - <dimen name="lb_details_overview_action_items_margin">0dp</dimen> + <dimen name="lb_details_overview_action_items_margin">16dp</dimen> <item name="lb_details_overview_action_select_duration" format="integer" type="dimen">150</item> <dimen name="lb_details_overview_actions_padding_left">294dp</dimen> <dimen name="lb_details_overview_actions_padding_right">132dp</dimen> @@ -98,11 +99,38 @@ <dimen name="lb_action_1_line_height">36dp</dimen> <dimen name="lb_action_2_lines_height">56dp</dimen> - <dimen name="lb_action_padding_horizontal">34dp</dimen> + <dimen name="lb_action_padding_horizontal">24dp</dimen> <dimen name="lb_action_with_icon_padding_left">14dp</dimen> <dimen name="lb_action_with_icon_padding_right">20dp</dimen> <dimen name="lb_action_icon_margin">12dp</dimen> <dimen name="lb_action_text_size">16sp</dimen> + <dimen name="lb_action_button_corner_radius">2dp</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> + <dimen name="lb_playback_controls_margin_bottom">20dp</dimen> + <dimen name="lb_playback_description_margin_top">24dp</dimen> + <dimen name="lb_playback_description_margin_start">24dp</dimen> + <dimen name="lb_playback_description_margin_end">24dp</dimen> + <dimen name="lb_playback_controls_time_text_size">12sp</dimen> + <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_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> + + <dimen name="lb_control_button_diameter">90dp</dimen> + <dimen name="lb_control_button_height">64dp</dimen> + <dimen name="lb_control_button_secondary_diameter">48dp</dimen> + <dimen name="lb_control_button_secondary_height">48dp</dimen> + <dimen name="lb_control_icon_width">32dp</dimen> + <dimen name="lb_control_icon_height">32dp</dimen> <dimen name="lb_error_image_max_height">120dp</dimen> <integer name="lb_error_message_max_lines">1</integer> @@ -111,6 +139,9 @@ <dimen name="lb_error_under_image_baseline_margin">36dp</dimen> <dimen name="lb_error_under_message_baseline_margin">24dp</dimen> + <item name="lb_view_active_level" type="fraction">0%</item> + <item name="lb_view_dimmed_level" type="fraction">60%</item> + <!-- Search bar --> <dimen name="lb_search_bar_height">60dp</dimen> <dimen name="lb_search_bar_padding_left">56dp</dimen> @@ -121,7 +152,9 @@ <dimen name="lb_search_bar_items_layout_margin_top">27dp</dimen> <dimen name="lb_search_bar_items_width">600dp</dimen> <dimen name="lb_search_bar_items_height">56dp</dimen> - <dimen name="lb_search_bar_items_margin_left">56dp</dimen> + <dimen name="lb_search_bar_items_margin_left">70dp</dimen> + <dimen name="lb_search_bar_inner_margin_top">2dp</dimen> + <dimen name="lb_search_bar_inner_margin_bottom">2dp</dimen> <dimen name="lb_search_bar_icon_height">32dp</dimen> <dimen name="lb_search_bar_icon_width">32dp</dimen> <dimen name="lb_search_bar_icon_margin_left">16dp</dimen> @@ -136,7 +169,7 @@ <dimen name="lb_search_orb_size">52dp</dimen> <item name="lb_search_orb_focused_zoom" type="fraction">120%</item> <item name="lb_search_orb_pulse_duration_ms" type="integer">1000</item> - <item name="lb_search_orb_scale_down_duration_ms" type="integer">100</item> + <item name="lb_search_orb_scale_duration_ms" type="integer">150</item> <dimen name="lb_search_orb_margin_top">4dp</dimen> <dimen name="lb_search_orb_margin_bottom">4dp</dimen> @@ -144,7 +177,6 @@ <dimen name="lb_search_orb_margin_right">4dp</dimen> <dimen name="lb_search_bar_speech_orb_size">52dp</dimen> - <item name="lb_search_bar_speech_orb_focused_zoom" type="fraction">120%</item> <item name="lb_search_bar_speech_orb_max_level_zoom" type="fraction">144%</item> <dimen name="lb_search_bar_speech_orb_margin_left">56dp</dimen> @@ -159,7 +191,15 @@ <dimen name="lb_basic_card_info_badge_size">16dp</dimen> <!-- z based shadow --> - <dimen name="lb_material_shadow_normal_z">2dp</dimen> - <dimen name="lb_material_shadow_focused_z">8dp</dimen> + <dimen name="lb_material_shadow_normal_z">6dp</dimen> + <dimen name="lb_material_shadow_focused_z">16dp</dimen> + <dimen name="lb_material_shadow_details_z">8dp</dimen> + <dimen name="lb_search_orb_unfocused_z">2dp</dimen> + <dimen name="lb_search_orb_focused_z">8dp</dimen> + <dimen name="lb_details_overview_z">@dimen/lb_material_shadow_details_z</dimen> + <dimen name="lb_playback_controls_z">@dimen/lb_material_shadow_details_z</dimen> + <dimen name="lb_browse_headers_z">@dimen/lb_material_shadow_focused_z</dimen> + + <dimen name="lb_rounded_rect_corner_radius">2dp</dimen> </resources> diff --git a/current/support/v17/leanback/res/values/ids.xml b/current/support/v17/leanback/res/values/ids.xml index 05a6304..6b67919 100644 --- a/current/support/v17/leanback/res/values/ids.xml +++ b/current/support/v17/leanback/res/values/ids.xml @@ -16,5 +16,19 @@ --> <resources> <item type="id" name="lb_focus_animator" /> - <item type="id" name="lb_header_transition_position" /> - </resources>
\ No newline at end of file + <item type="id" name="lb_slide_transition_value" /> + + <item type="id" name="lb_control_play_pause" /> + <item type="id" name="lb_control_fast_forward" /> + <item type="id" name="lb_control_fast_rewind" /> + <item type="id" name="lb_control_skip_next" /> + <item type="id" name="lb_control_skip_previous" /> + <item type="id" name="lb_control_more_actions" /> + <item type="id" name="lb_control_thumbs_up" /> + <item type="id" name="lb_control_thumbs_down" /> + <item type="id" name="lb_control_repeat" /> + <item type="id" name="lb_control_shuffle" /> + <item type="id" name="lb_control_high_quality" /> + <item type="id" name="lb_control_closed_captioning" /> + + </resources> diff --git a/current/support/v17/leanback/res/values/integers.xml b/current/support/v17/leanback/res/values/integers.xml index ff2cf89..8547e22 100644 --- a/current/support/v17/leanback/res/values/integers.xml +++ b/current/support/v17/leanback/res/values/integers.xml @@ -19,4 +19,14 @@ <integer name="lb_card_activated_animation_duration">150</integer> <integer name="lb_search_bar_text_mode_background_alpha">51</integer> <integer name="lb_search_bar_speech_mode_background_alpha">179</integer> + <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">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">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 1d43795..06f6a49 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"> @@ -43,7 +42,7 @@ <style name="TextAppearance.Leanback.DetailsDescriptionTitle"> <item name="android:textSize">@dimen/lb_details_description_title_text_size</item> <item name="android:textColor">@color/lb_details_description_color</item> - <item name="android:fontFamily">sans-serif</item> + <item name="android:fontFamily">sans-serif-light</item> </style> <style name="TextAppearance.Leanback.DetailsDescriptionSubtitle"> @@ -54,7 +53,7 @@ <style name="TextAppearance.Leanback.DetailsDescriptionBody"> <item name="android:textSize">@dimen/lb_details_description_body_text_size</item> - <item name="android:textColor">@color/lb_details_description_color</item> + <item name="android:textColor">@color/lb_details_description_body_color</item> <item name="android:fontFamily">sans-serif</item> </style> @@ -64,6 +63,12 @@ <item name="android:textAllCaps">true</item> </style> + <style name="TextAppearance.Leanback.PlaybackControlsTime"> + <item name="android:textSize">@dimen/lb_playback_controls_time_text_size</item> + <item name="android:textColor">@color/lb_playback_controls_time_text_color</item> + <item name="android:fontFamily">sans-serif</item> + </style> + <style name="TextAppearance.Leanback.ErrorMessage"> <item name="android:textSize">@dimen/lb_error_message_text_size</item> <item name="android:textColor">@color/lb_error_message_color_on_opaque</item> @@ -72,12 +77,15 @@ <style name="Widget.Leanback" parent="android:Widget.Holo" /> - <style name="Widget.Leanback.BaseCardViewStyle" /> + <style name="Widget.Leanback.BaseCardViewStyle"> + <item name="android:foreground">@drawable/lb_card_foreground</item> + </style> <style name="Widget.Leanback.ImageCardViewStyle" parent="Widget.Leanback.BaseCardViewStyle"> <item name="cardType">infoUnder</item> <item name="infoVisibility">activated</item> <item name="android:background">@color/lb_basic_card_bg_color</item> + <item name="infoAreaBackground">@color/lb_basic_card_info_bg_color</item> </style> <style name="Widget.Leanback.TitleView" > @@ -123,9 +131,7 @@ <item name="android:minHeight">@dimen/lb_browse_header_height</item> <item name="android:textAppearance">@style/TextAppearance.Leanback.Header</item> <item name="android:singleLine">true</item> - <item name="android:ellipsize">marquee</item> - <item name="android:marqueeRepeatLimit">0</item> - <item name="android:paddingRight">@dimen/lb_browse_header_padding_right</item> + <item name="android:ellipsize">none</item> </style> <style name="Widget.Leanback.Rows.VerticalGridView" > @@ -212,7 +218,10 @@ <item name="android:ellipsize">end</item> </style> - <style name="Widget.Leanback.DetailsActionButtonStyle" parent="android:Widget.Holo.Button.Borderless"> + <style name="Widget.Leanback.DetailsActionButtonStyleBase" parent="android:Widget.Holo.Button.Borderless"> + </style> + + <style name="Widget.Leanback.DetailsActionButtonStyle" parent="Widget.Leanback.DetailsActionButtonStyleBase"> <item name="android:textAppearance">@style/TextAppearance.Leanback.DetailsActionButton</item> <item name="android:includeFontPadding">false</item> <item name="android:drawablePadding">@dimen/lb_action_icon_margin</item> @@ -222,6 +231,15 @@ <item name="android:paddingRight">@dimen/lb_action_padding_horizontal</item> </style> + <style name="Widget.Leanback.PlaybackControlsButtonStyle" > + <item name="android:focusable">true</item> + <item name="android:focusableInTouchMode">true</item> + </style> + + <style name="Widget.Leanback.PlaybackControlsTimeStyle"> + <item name="android:textAppearance">@style/TextAppearance.Leanback.PlaybackControlsTime</item> + </style> + <style name="Widget.Leanback.ErrorMessageStyle"> <item name="android:textAppearance">@style/TextAppearance.Leanback.ErrorMessage</item> <item name="android:includeFontPadding">false</item> @@ -234,4 +252,23 @@ <item name="searchOrbColor">?attr/defaultSearchColor</item> <item name="searchOrbBrightColor">?attr/defaultSearchBrightColor</item> </style> + + <style name="Widget.Leanback.PlaybackControlsActionIconsStyle"> + <item name="play">@drawable/lb_ic_play</item> + <item name="pause">@drawable/lb_ic_pause</item> + <item name="fast_forward">@drawable/lb_ic_fast_forward</item> + <item name="rewind">@drawable/lb_ic_fast_rewind</item> + <item name="skip_next">@drawable/lb_ic_skip_next</item> + <item name="skip_previous">@drawable/lb_ic_skip_previous</item> + <item name="thumb_up_outline">@drawable/lb_ic_thumb_up_outline</item> + <item name="thumb_up">@drawable/lb_ic_thumb_up</item> + <item name="thumb_down_outline">@drawable/lb_ic_thumb_down_outline</item> + <item name="thumb_down">@drawable/lb_ic_thumb_down</item> + <item name="repeat">@drawable/lb_ic_loop</item> + <item name="repeat_one">@drawable/lb_ic_loop_one</item> + <item name="shuffle">@drawable/lb_ic_shuffle</item> + <item name="high_quality">@drawable/lb_ic_hq</item> + <item name="closed_captioning">@drawable/lb_ic_cc</item> + </style> + </resources> diff --git a/current/support/v17/leanback/res/values/themes.xml b/current/support/v17/leanback/res/values/themes.xml index fee4967..8b66edf 100644 --- a/current/support/v17/leanback/res/values/themes.xml +++ b/current/support/v17/leanback/res/values/themes.xml @@ -19,6 +19,9 @@ <!-- LeanbackBase may be overridden for specific api levels --> <style name="Theme.LeanbackBase" parent="android:Theme.Holo.NoActionBar"> + <item name="playbackProgressPrimaryColor">@color/lb_playback_progress_color_no_theme</item> + <item name="playbackControlsIconHighlightColor">@color/lb_playback_icon_highlight_no_theme</item> + <item name="defaultBrandColor">@color/lb_default_brand_color</item> </style> <style name="Theme.Leanback" parent="Theme.LeanbackBase"> @@ -57,15 +60,25 @@ <item name="detailsDescriptionSubtitleStyle">@style/Widget.Leanback.DetailsDescriptionSubtitleStyle</item> <item name="detailsDescriptionBodyStyle">@style/Widget.Leanback.DetailsDescriptionBodyStyle</item> <item name="detailsActionButtonStyle">@style/Widget.Leanback.DetailsActionButtonStyle</item> + <item name="playbackControlsButtonStyle">@style/Widget.Leanback.PlaybackControlsButtonStyle</item> + <item name="playbackControlsTimeStyle">@style/Widget.Leanback.PlaybackControlsTimeStyle</item> + <item name="playbackControlsActionIcons">@style/Widget.Leanback.PlaybackControlsActionIconsStyle</item> <item name="errorMessageStyle">@style/Widget.Leanback.ErrorMessageStyle</item> <!-- TODO should be null, and set programatically to avoid dependence on leanback theme --> - <item name="defaultBrandColor">@color/lb_default_brand_color</item> <item name="defaultSearchColor">@null</item> <item name="defaultSearchBrightColor">@null</item> <item name="defaultSearchIcon">@null</item> + <item name="android:windowSharedElementEnterTransition">@transition/lb_shared_element_enter_transition</item> + <item name="android:windowEnterTransition">@transition/lb_enter_transition</item> + <item name="android:windowSharedElementReturnTransition">@transition/lb_shared_element_return_transition</item> + <item name="android:windowReturnTransition">@transition/lb_return_transition</item> + + <item name="overlayDimMaskColor">@color/lb_view_dim_mask_color</item> + <item name="overlayDimActiveLevel">@fraction/lb_view_active_level</item> + <item name="overlayDimDimmedLevel">@fraction/lb_view_dimmed_level</item> </style> </resources> |
