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

Commit 2f34cb53 authored by Jin Seok Park's avatar Jin Seok Park Committed by android-build-merger
Browse files

Merge "MediaControlView2: Add support for Minimal Mode" into pi-dev am: 2ad6e528 

am: 6ca6ba71

Change-Id: I4de716f0b4d82119c091dafb25faa945917f95f3
parents 54c3f2ea 6ca6ba71

packages/MediaComponents/res/drawable/custom_progress_thumb.xml

+2 −2
Original line number Diff line number Diff line
@@ -17,6 +17,6 @@ 
    android:shape="oval" >

    <solid android:color="#ffffff" />

    <size

        android:height="12dp"

        android:width="12dp" />

        android:height="@dimen/mcv2_custom_progress_thumb_size"

        android:width="@dimen/mcv2_custom_progress_thumb_size" />

</shape>
 
 No newline at end of file

packages/MediaComponents/res/layout/media_controller.xml

+39 −10
Original line number Diff line number Diff line
@@ -17,12 +17,12 @@ 
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:background="#55000000"

    android:orientation="vertical"

    android:layoutDirection="ltr">



    <RelativeLayout

        android:id="@+id/title_bar"

        android:background="@layout/title_bar_gradient"

        style="@style/TitleBar">



        <LinearLayout
@@ -114,22 +114,51 @@ 
        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:layout_weight="1"

        android:gravity="center">

        android:gravity="center"

        android:orientation="vertical">

    </LinearLayout>



    <LinearLayout

        android:id="@+id/minimal_extra_view"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:gravity="right">



        <ImageButton

            android:id="@+id/fullscreen"

            android:gravity="right"

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

    </LinearLayout>



    <RelativeLayout

        android:layout_width="match_parent"

        android:layout_height="@dimen/mcv2_custom_progress_thumb_size">



        <SeekBar

        android:id="@+id/mediacontroller_progress"

            android:id="@+id/progress"

            android:layout_width="match_parent"

            android:layout_height="@dimen/mcv2_custom_progress_thumb_size"

            android:contentDescription="@string/mcv2_seek_bar_desc"

            android:padding="0dp"

            android:maxHeight="@dimen/mcv2_custom_progress_max_size"

            android:minHeight="@dimen/mcv2_custom_progress_max_size"

            android:elevation="10dp"/>



        <View

            android:id="@+id/progress_buffer"

            android:layout_width="match_parent"

        android:layout_height="12dp"

        android:maxHeight="2dp"

        android:minHeight="2dp"

        android:padding="0dp"/>

            android:layout_height="@dimen/mcv2_buffer_view_height"

            android:layout_alignParentBottom="true"

            android:background="@color/bottom_bar_background"

            android:elevation="0dp"/>

    </RelativeLayout>



    <RelativeLayout

        android:id="@+id/bottom_bar"

        android:layout_width="match_parent"

        android:layout_height="44dp"

        android:orientation="horizontal">

        android:orientation="horizontal"

        android:background="@color/bottom_bar_background">



        <LinearLayout

            android:id="@+id/bottom_bar_left"

packages/MediaComponents/res/layout/minimal_transport_controls.xml

+2 −3
Original line number Diff line number Diff line
@@ -18,8 +18,7 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:gravity="center"

    android:orientation="horizontal"

    android:visibility="visible">

    android:orientation="horizontal">



    <ImageButton android:id="@+id/pause" style="@style/MinimalTransportControlsButton.Pause" />

    <ImageButton android:id="@+id/pause" style="@style/MinimalTransportControlsButton" />

</LinearLayout>
 
 No newline at end of file

packages/MediaComponents/res/layout/title_bar_gradient.xml

0 → 100644
+23 −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.

-->



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

    android:shape="rectangle">

    <gradient

        android:startColor="@color/title_bar_gradient_start"

        android:endColor="@color/title_bar_gradient_end"

        android:angle="-270" />

</shape>
 
 No newline at end of file

packages/MediaComponents/res/values/colors.xml

+3 −0
Original line number Diff line number Diff line
@@ -19,4 +19,7 @@ 
    <color name="white">#ffffff</color>

    <color name="white_opacity_70">#B3ffffff</color>

    <color name="black_opacity_70">#B3000000</color>

    <color name="title_bar_gradient_start">#50000000</color>

    <color name="title_bar_gradient_end">#00000000</color>

    <color name="bottom_bar_background">#40202020</color>

</resources>
 
 No newline at end of file