Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d60ae274 authored by Sungsoo Lim's avatar Sungsoo Lim
Browse files

Remove TAG_INCLUDE in layout xml 

When access resources in updatable apk, the context from app apk
is used instead of updatable apk. Therefore, recursive parsing
of updatable layouts with app context could cause resource not
found exceptions.

Test: build
Change-Id: Idb67c48a1b817a6bb00d98689d1383470b70061a
parent bf6a5836

packages/MediaComponents/res/layout/mr_controller_material_dialog_b.xml

+172 −67
Original line number Diff line number Diff line
@@ -75,16 +75,82 @@ 
                    android:paddingBottom="16dp"

                    android:layout_gravity="bottom"

                    android:theme="?attr/mediaRouteControlPanelThemeOverlay">

                    <include android:id="@+id/mr_playback_control"

                             layout="@layout/mr_playback_control" />

                    <RelativeLayout

                        android:id="@+id/mr_playback_control"

                        android:layout_width="fill_parent"

                        android:layout_height="wrap_content"

                        android:orientation="horizontal"

                        android:paddingLeft="24dp"

                        android:paddingRight="12dp" >

                        <ImageButton android:id="@+id/mr_control_playback_ctrl"

                            android:layout_width="wrap_content"

                            android:layout_height="wrap_content"

                            android:layout_marginLeft="12dp"

                            android:layout_alignParentRight="true"

                            android:layout_centerVertical="true"

                            android:contentDescription="@string/mr_controller_play"

                            android:background="?attr/selectableItemBackgroundBorderless"

                            android:visibility="gone" />

                        <LinearLayout android:id="@+id/mr_control_title_container"

                            android:orientation="vertical"

                            android:layout_width="wrap_content"

                            android:layout_height="wrap_content"

                            android:layout_toLeftOf="@id/mr_control_playback_ctrl"

                            android:layout_alignParentLeft="true"

                            android:layout_centerVertical="true">

                            <TextView android:id="@+id/mr_control_title"

                                android:layout_width="wrap_content"

                                android:layout_height="wrap_content"

                                android:textAppearance="@style/TextAppearance.MediaRouter.PrimaryText"

                                android:singleLine="true" />

                            <TextView android:id="@+id/mr_control_subtitle"

                                android:layout_width="wrap_content"

                                android:layout_height="wrap_content"

                                android:textAppearance="@style/TextAppearance.MediaRouter.SecondaryText"

                                android:singleLine="true" />

                        </LinearLayout>

                    </RelativeLayout>

                    <View android:id="@+id/mr_control_divider"

                        android:layout_width="fill_parent"

                        android:layout_height="8dp"

                        android:visibility="gone" />

                    <include android:id="@+id/mr_volume_control"

                             layout="@layout/mr_volume_control" />

                    <LinearLayout

                        android:id="@+id/mr_volume_control"

                        android:layout_width="fill_parent"

                        android:layout_height="wrap_content"

                        android:minHeight="48dp"

                        android:gravity="center_vertical"

                        android:paddingLeft="24dp"

                        android:paddingRight="12dp"

                        android:splitMotionEvents="false">

                        <ImageView

                            android:layout_width="24dp"

                            android:layout_height="24dp"

                            android:src="?attr/mediaRouteAudioTrackDrawable"

                            android:gravity="center"

                            android:scaleType="center"/>

                        <!-- Since dialog's top layout mr_expandable_area is clickable, it propagates pressed state

                             to its non-clickable children. Specify android:clickable="true" to prevent volume slider

                             from having false pressed state. -->

                        <com.android.support.mediarouter.app.MediaRouteVolumeSlider

                            android:id="@+id/mr_volume_slider"

                            android:layout_width="0dp"

                            android:layout_height="wrap_content"

                            android:minHeight="48dp"

                            android:maxHeight="48dp"

                            android:layout_weight="1"

                            android:clickable="true"

                            android:contentDescription="@string/mr_controller_volume_slider" />

                        <com.android.support.mediarouter.app.MediaRouteExpandCollapseButton

                            android:id="@+id/mr_group_expand_collapse"

                            android:layout_width="48dp"

                            android:layout_height="48dp"

                            android:padding="12dp"

                            android:background="?attr/selectableItemBackgroundBorderless"

                            android:visibility="gone"/>

                    </LinearLayout>

                </LinearLayout>

                <android.support.v7.app.OverlayListView

                <com.android.support.mediarouter.app.OverlayListView

                    android:id="@+id/mr_volume_group_list"

                    android:layout_width="fill_parent"

                    android:layout_height="wrap_content"
@@ -96,6 +162,45 @@ 
                    android:theme="?attr/mediaRouteControlPanelThemeOverlay" />

            </LinearLayout>

        </FrameLayout>

        <include layout="@layout/abc_alert_dialog_button_bar_material" />

        <ScrollView

            android:id="@+id/buttonPanel"

            style="?attr/buttonBarStyle"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:fillViewport="true"

            android:scrollIndicators="top|bottom">

            <android.support.v7.widget.ButtonBarLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:gravity="bottom"

                android:layoutDirection="locale"

                android:orientation="horizontal"

                android:paddingBottom="4dp"

                android:paddingLeft="12dp"

                android:paddingRight="12dp"

                android:paddingTop="4dp">

                <Button

                    android:id="@android:id/button3"

                    style="?attr/buttonBarNeutralButtonStyle"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"/>

                <android.support.v4.widget.Space

                    android:id="@+id/spacer"

                    android:layout_width="0dp"

                    android:layout_height="0dp"

                    android:layout_weight="1"

                    android:visibility="invisible"/>

                <Button

                    android:id="@android:id/button2"

                    style="?android:attr/buttonBarNegativeButtonStyle"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"/>

                <Button

                    android:id="@android:id/button1"

                    style="?attr/buttonBarPositiveButtonStyle"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"/>

            </android.support.v7.widget.ButtonBarLayout>

        </ScrollView>

    </LinearLayout>

</FrameLayout>

packages/MediaComponents/res/layout/mr_playback_control.xml

deleted100644 → 0
+0 −50
Original line number Diff line number Diff line 
<?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.

-->



<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"

                android:layout_width="fill_parent"

                android:layout_height="wrap_content"

                android:orientation="horizontal"

                android:paddingLeft="24dp"

                android:paddingRight="12dp" >

    <ImageButton android:id="@+id/mr_control_playback_ctrl"

                 android:layout_width="wrap_content"

                 android:layout_height="wrap_content"

                 android:layout_marginLeft="12dp"

                 android:layout_alignParentRight="true"

                 android:layout_centerVertical="true"

                 android:contentDescription="@string/mr_controller_play"

                 android:background="?attr/selectableItemBackgroundBorderless"

                 android:visibility="gone" />

    <LinearLayout android:id="@+id/mr_control_title_container"

                  android:orientation="vertical"

                  android:layout_width="wrap_content"

                  android:layout_height="wrap_content"

                  android:layout_toLeftOf="@id/mr_control_playback_ctrl"

                  android:layout_alignParentLeft="true"

                  android:layout_centerVertical="true">

        <TextView android:id="@+id/mr_control_title"

                  android:layout_width="wrap_content"

                  android:layout_height="wrap_content"

                  android:textAppearance="@style/TextAppearance.MediaRouter.PrimaryText"

                  android:singleLine="true" />

        <TextView android:id="@+id/mr_control_subtitle"

                  android:layout_width="wrap_content"

                  android:layout_height="wrap_content"

                  android:textAppearance="@style/TextAppearance.MediaRouter.SecondaryText"

                  android:singleLine="true" />

    </LinearLayout>

</RelativeLayout>

packages/MediaComponents/res/layout/mr_volume_control.xml

deleted100644 → 0
+0 −50
Original line number Diff line number Diff line 
<?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:layout_width="fill_parent"

        android:layout_height="wrap_content"

        android:minHeight="48dp"

        android:gravity="center_vertical"

        android:paddingLeft="24dp"

        android:paddingRight="12dp"

        android:splitMotionEvents="false">

    <ImageView

            android:layout_width="24dp"

            android:layout_height="24dp"

            android:src="?attr/mediaRouteAudioTrackDrawable"

            android:gravity="center"

            android:scaleType="center"/>

    <!-- Since dialog's top layout mr_expandable_area is clickable, it propagates pressed state

         to its non-clickable children. Specify android:clickable="true" to prevent volume slider

         from having false pressed state. -->

    <android.support.v7.app.MediaRouteVolumeSlider

            android:id="@+id/mr_volume_slider"

            android:layout_width="0dp"

            android:layout_height="wrap_content"

            android:minHeight="48dp"

            android:maxHeight="48dp"

            android:layout_weight="1"

            android:clickable="true"

            android:contentDescription="@string/mr_controller_volume_slider" />

    <android.support.v7.app.MediaRouteExpandCollapseButton

            android:id="@+id/mr_group_expand_collapse"

            android:layout_width="48dp"

            android:layout_height="48dp"

            android:padding="12dp"

            android:background="?attr/selectableItemBackgroundBorderless"

            android:visibility="gone"/>

</LinearLayout>