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

Commit 9e49771d authored by Jin Seok Park's avatar Jin Seok Park
Browse files

MediaControlView2: Final Settings UX addition 

This CL does the following things:

1. Make the check button visibility in Settings window dynamic
2. Send command to VideoView2 when choosing item for Subtitle, Audio
Track, and Playback Speed.
3. Make pressing Subtitle & Video Quality buttons open Settings
window.
4. Place Subtitle & Video Quality buttons outside the Settings
window.

Also, this CL remove Aspect Ratio button (function support has been punted)

Bug: 73703113
Test: manually run VideoViewTest.apk
Change-Id: I9c8ca3f7e3c6aae8c69ca6b6ff0973a3377a88fa
parent de95aaa1

packages/MediaComponents/res/drawable/ic_replay_circle_filled.xml

+2 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

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

    android:width="24dp"

    android:height="24dp"

    android:width="40dp"

    android:height="40dp"

    android:viewportWidth="24"

    android:viewportHeight="24">

packages/MediaComponents/res/layout/media_controller.xml

+1 −3
Original line number Diff line number Diff line
@@ -199,6 +199,7 @@ 
            <ImageButton

                android:id="@+id/subtitle"

                android:scaleType="fitCenter"

                android:visibility="gone"

                style="@style/BottomBarButton.CC" />

            <ImageButton

                android:id="@+id/fullscreen"
@@ -223,9 +224,6 @@ 
                android:layout_width="wrap_content"

                android:layout_height="wrap_content" />



            <ImageButton

                android:id="@+id/aspect_ratio"

                style="@style/BottomBarButton.AspectRatio" />

            <ImageButton

                android:id="@+id/video_quality"

                style="@style/BottomBarButton.VideoQuality" />

packages/MediaComponents/res/layout/settings_list_item.xml

+0 −8
Original line number Diff line number Diff line
@@ -27,14 +27,6 @@ 
        android:gravity="center"

        android:orientation="horizontal">



        <ImageView

            android:id="@+id/check"

            android:layout_width="@dimen/MediaControlView2_settings_icon_size"

            android:layout_height="@dimen/MediaControlView2_settings_icon_size"

            android:gravity="center"

            android:paddingLeft="2dp"

            android:src="@drawable/ic_check"/>



        <ImageView

            android:id="@+id/icon"

            android:layout_width="@dimen/MediaControlView2_settings_icon_size"

packages/MediaComponents/res/layout/sub_settings_list_item.xml

0 → 100644
+54 −0
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="@dimen/MediaControlView2_settings_width"

    android:layout_height="@dimen/MediaControlView2_settings_height"

    android:orientation="horizontal"

    android:background="@color/black_transparent_70">



    <LinearLayout

        android:layout_width="wrap_content"

        android:layout_height="@dimen/MediaControlView2_settings_height"

        android:paddingRight="2dp"

        android:gravity="center"

        android:orientation="horizontal">



        <ImageView

            android:id="@+id/check"

            android:layout_width="@dimen/MediaControlView2_settings_icon_size"

            android:layout_height="@dimen/MediaControlView2_settings_icon_size"

            android:gravity="center"

            android:paddingLeft="2dp"

            android:src="@drawable/ic_check"/>

    </LinearLayout>



    <RelativeLayout

        android:layout_width="wrap_content"

        android:layout_height="@dimen/MediaControlView2_settings_height"

        android:gravity="center"

        android:orientation="vertical">



        <TextView

            android:id="@+id/text"

            android:layout_width="wrap_content"

            android:layout_height="@dimen/MediaControlView2_text_width"

            android:paddingLeft="2dp"

            android:textColor="@color/white"

            android:textSize="@dimen/MediaControlView2_settings_main_text_size"/>

    </RelativeLayout>



</LinearLayout>