diff options
author | Roberto Perez <robertoalexis@google.com> | 2018-04-17 10:55:35 -0700 |
---|---|---|
committer | Roberto Perez <robertoalexis@google.com> | 2018-04-18 08:26:40 -0700 |
commit | 27683666b9c48dd8c53682f196351c9c1f7b7ee9 (patch) | |
tree | 623cb9738c657abe8ea5da33d369f889f8b64a18 /res | |
parent | 2125426c91cf65f45b4f32fe5d651d175024f3b6 (diff) | |
download | Media-27683666b9c48dd8c53682f196351c9c1f7b7ee9.tar.gz |
Showing/hiding playback depending whether the currently browsed source
is being played or not.
Bug: 77334804
Test: TBD
Change-Id: Ie614fc2a31fdebb5edbf7a2c30c3145b096e4241
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/fragment_playback.xml | 25 | ||||
-rw-r--r-- | res/layout/media_browse_grid_item.xml | 15 | ||||
-rw-r--r-- | res/layout/media_browse_header_item.xml | 15 | ||||
-rw-r--r-- | res/layout/media_browse_list_item.xml | 15 | ||||
-rw-r--r-- | res/layout/media_browse_more_footer.xml | 15 | ||||
-rw-r--r-- | res/layout/media_browse_panel_item.xml | 15 | ||||
-rw-r--r-- | res/layout/view_metadata.xml | 15 |
7 files changed, 113 insertions, 2 deletions
diff --git a/res/layout/fragment_playback.xml b/res/layout/fragment_playback.xml index 601844f..867d0e9 100644 --- a/res/layout/fragment_playback.xml +++ b/res/layout/fragment_playback.xml @@ -1,8 +1,24 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright 2018, 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.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/playback_container" + android:animateLayoutChanges="true" android:layout_width="match_parent" android:layout_height="match_parent"> @@ -38,15 +54,20 @@ app:layout_constraintTop_toBottomOf="@+id/playback_scrim_bottom" app:layout_constraintBottom_toBottomOf="parent"/> + <android.support.v4.widget.Space + android:id="@+id/app_bar_space" + android:layout_width="match_parent" + android:layout_height="@dimen/car_app_bar_height" + app:layout_constraintTop_toTopOf="parent"/> + <FrameLayout android:id="@+id/metadata_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/car_app_bar_height" android:fitsSystemWindows="true" android:layout_marginLeft="@dimen/car_margin" android:layout_marginRight="@dimen/car_margin" - app:layout_constraintTop_toTopOf="parent"> + app:layout_constraintTop_toBottomOf="@+id/app_bar_space"> <include layout="@layout/view_metadata"/> diff --git a/res/layout/media_browse_grid_item.xml b/res/layout/media_browse_grid_item.xml index 086f11a..c6112d6 100644 --- a/res/layout/media_browse_grid_item.xml +++ b/res/layout/media_browse_grid_item.xml @@ -1,4 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright 2018, 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" xmlns:app="http://schemas.android.com/apk/res-auto" diff --git a/res/layout/media_browse_header_item.xml b/res/layout/media_browse_header_item.xml index b4db506..7daf142 100644 --- a/res/layout/media_browse_header_item.xml +++ b/res/layout/media_browse_header_item.xml @@ -1,4 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright 2018, 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:id="@+id/container" diff --git a/res/layout/media_browse_list_item.xml b/res/layout/media_browse_list_item.xml index f20b20d..8f505e9 100644 --- a/res/layout/media_browse_list_item.xml +++ b/res/layout/media_browse_list_item.xml @@ -1,4 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright 2018, 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:id="@+id/container" diff --git a/res/layout/media_browse_more_footer.xml b/res/layout/media_browse_more_footer.xml index ea79378..5122da0 100644 --- a/res/layout/media_browse_more_footer.xml +++ b/res/layout/media_browse_more_footer.xml @@ -1,4 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright 2018, 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:id="@+id/container" diff --git a/res/layout/media_browse_panel_item.xml b/res/layout/media_browse_panel_item.xml index 3b56c36..28c9033 100644 --- a/res/layout/media_browse_panel_item.xml +++ b/res/layout/media_browse_panel_item.xml @@ -1,4 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright 2018, 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:id="@+id/container" diff --git a/res/layout/view_metadata.xml b/res/layout/view_metadata.xml index c503903..3b4341d 100644 --- a/res/layout/view_metadata.xml +++ b/res/layout/view_metadata.xml @@ -1,4 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright 2018, 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:id="@+id/metadata" |