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

Commit d7049e10 authored by Jin Seok Park's avatar Jin Seok Park
Browse files

MediaControlView2: Add Music UX 

1. Create Music View inside VideoView2
   - Dynamically change layouts based on size and orientation
   - Disable touch when Full size mode
2. Create Music Mode button settings inside MediaControlView2

Bug: 73873457
Test: Manually run VideoViewTest.apk
Change-Id: Iba47ab40b7eb24147c09efbe997bd8e765719d69
parent a5e13d9f

packages/MediaComponents/res/drawable/ic_default_album_image.xml

0 → 100644
+14 −0
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="512dp"

    android:height="512dp"

    android:viewportWidth="512"

    android:viewportHeight="512">



    <path

        android:fillColor="#616161"

        android:pathData="M 0 0 H 512 V 512 H 0 V 0 Z" />

    <path

        android:fillColor="#525252"

        android:pathData="M256,151v123.14c-6.88-4.02-14.82-6.48-23.33-6.48 c-25.78,0-46.67,20.88-46.67,46.67c0,25.78,20.88,46.67,46.67,46.67s46.67-20.88,46.67-46.67V197.67H326V151H256z" />

</vector>

packages/MediaComponents/res/layout/embedded_music.xml

0 → 100644
+39 −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="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical">



    <View

        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:layout_weight="0.25"/>



    <ImageView

        android:id="@+id/album"

        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:layout_weight="0.5"

        android:scaleType="fitCenter"

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



    <View

        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:layout_weight="0.25"/>

</LinearLayout>
 
 No newline at end of file

packages/MediaComponents/res/layout/full_landscape_music.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="match_parent"

    android:layout_height="match_parent"

    android:background="#B300FF00"

    android:orientation="horizontal">



    <LinearLayout

        android:id="@+id/music_image"

        style="@style/FullMusicLandscape.Image">



        <ImageView

            android:id="@+id/album"

            android:layout_width="@dimen/mcv2_full_album_image_landscape_size"

            android:layout_height="@dimen/mcv2_full_album_image_landscape_size"

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

    </LinearLayout>



    <LinearLayout

        android:id="@+id/music_text"

        style="@style/FullMusicLandscape.Text">



        <TextView

            android:id="@+id/title"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:text="@string/mcv2_music_title_unknown_text"

            android:textSize="20sp"

            android:textStyle="bold"

            android:textColor="#FFFFFF" />

        <TextView

            android:id="@+id/artist"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:text="@string/mcv2_music_artist_unknown_text"

            android:textSize="16sp"

            android:textColor="#BBBBBB" />

    </LinearLayout>

</LinearLayout>
 
 No newline at end of file

packages/MediaComponents/res/layout/full_portrait_music.xml

0 → 100644
+53 −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="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical">



    <LinearLayout

        android:id="@+id/music_image"

        style="@style/FullMusicPortrait.Image">



        <ImageView

            android:id="@+id/album"

            android:layout_width="@dimen/mcv2_full_album_image_portrait_size"

            android:layout_height="@dimen/mcv2_full_album_image_portrait_size"

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

    </LinearLayout>



    <LinearLayout

        android:id="@+id/music_text"

        style="@style/FullMusicPortrait.Text">



        <TextView

            android:id="@+id/title"

            android:layout_width="@dimen/mcv2_full_album_image_portrait_size"

            android:layout_height="wrap_content"

            android:text="@string/mcv2_music_title_unknown_text"

            android:textSize="20sp"

            android:textStyle="bold"

            android:textColor="#FFFFFF" />

        <TextView

            android:id="@+id/artist"

            android:layout_width="@dimen/mcv2_full_album_image_portrait_size"

            android:layout_height="wrap_content"

            android:text="@string/mcv2_music_artist_unknown_text"

            android:textSize="16sp"

            android:textColor="#BBBBBB" />

    </LinearLayout>

</LinearLayout>
 
 No newline at end of file

packages/MediaComponents/res/layout/media_controller.xml

+0 −2
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ 


    <RelativeLayout

        android:id="@+id/title_bar"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        style="@style/TitleBar">



        <LinearLayout