Remove duplicate layout file

PiperOrigin-RevId: 236645446
This commit is contained in:
olly 2019-03-04 15:00:03 +00:00 committed by Oliver Woodman
parent 28c7cb3716
commit d68c861b21
3 changed files with 14 additions and 29 deletions

View File

@ -304,9 +304,8 @@ public final class TrackSelectionDialog extends DialogFragment {
@Nullable Bundle savedInstanceState) { @Nullable Bundle savedInstanceState) {
View rootView = View rootView =
inflater.inflate( inflater.inflate(
R.layout.track_selection_dialog_tab, container, /* attachToRoot= */ false); R.layout.exo_track_selection_dialog, container, /* attachToRoot= */ false);
TrackSelectionView trackSelectionView = TrackSelectionView trackSelectionView = rootView.findViewById(R.id.exo_track_selection_view);
rootView.findViewById(R.id.download_dialog_track_selection_view);
trackSelectionView.setShowDisableOption(true); trackSelectionView.setShowDisableOption(true);
trackSelectionView.setAllowMultipleOverrides(allowMultipleOverrides); trackSelectionView.setAllowMultipleOverrides(allowMultipleOverrides);
trackSelectionView.setAllowAdaptiveSelections(allowAdaptiveSelections); trackSelectionView.setAllowAdaptiveSelections(allowAdaptiveSelections);

View File

@ -14,35 +14,46 @@
limitations under the License. limitations under the License.
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<androidx.viewpager.widget.ViewPager <androidx.viewpager.widget.ViewPager
android:id="@+id/track_selection_dialog_view_pager" android:id="@+id/track_selection_dialog_view_pager"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1"> android:layout_weight="1">
<com.google.android.material.tabs.TabLayout <com.google.android.material.tabs.TabLayout
android:id="@+id/track_selection_dialog_tab_layout" android:id="@+id/track_selection_dialog_tab_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"
app:tabGravity="fill"
app:tabMode="fixed"/>
</androidx.viewpager.widget.ViewPager> </androidx.viewpager.widget.ViewPager>
<LinearLayout <LinearLayout
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="end"> android:gravity="end">
<Button <Button
android:id="@+id/track_selection_dialog_cancel_button" android:id="@+id/track_selection_dialog_cancel_button"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@android:string/cancel" android:text="@android:string/cancel"
style="?android:attr/borderlessButtonStyle"/> style="?android:attr/borderlessButtonStyle"/>
<Button <Button
android:id="@+id/track_selection_dialog_ok_button" android:id="@+id/track_selection_dialog_ok_button"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@android:string/ok" android:text="@android:string/ok"
style="?android:attr/borderlessButtonStyle"/> style="?android:attr/borderlessButtonStyle"/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

View File

@ -1,25 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 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.
-->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.google.android.exoplayer2.ui.TrackSelectionView
android:id="@+id/download_dialog_track_selection_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</ScrollView>