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

Commit ff07fa36 authored by Galia Peycheva's avatar Galia Peycheva
Browse files

Fix TV volume dialog 

Bug: 181864498
Test: m && check volume dialog looks right
Change-Id: Ia7011db6d5c2c74536e6c6cbaa888bbde55805de
parent 98f75fd2

packages/SystemUI/res/drawable/tv_volume_row_seek_bar.xml→packages/SystemUI/res/drawable-television/volume_row_seekbar.xml

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

<!--

    Copyright (C) 2020 The Android Open Source Project

    Copyright (C) 2021 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.
@@ -14,19 +14,24 @@ 
    See the License for the specific language governing permissions and

    limitations under the License.

-->

<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:id="@android:id/background">

        <shape android:shape="rectangle">

<layer-list xmlns:android="http://schemas.android.com/apk/res/android"

            android:paddingMode="stack">

    <item android:id="@android:id/background"

        android:gravity="center_vertical|fill_horizontal">

        <layer-list>

            <item android:id="@+id/volume_seekbar_background_solid">

                <shape>

                    <size android:height="@dimen/volume_dialog_slider_width" />

                    <solid android:color="@color/tv_volume_dialog_seek_bar_background"/>

            <corners android:radius="@dimen/tv_volume_seek_bar_width" />

                    <corners android:radius="@dimen/volume_dialog_slider_corner_radius" />

                </shape>

            </item>

    <item android:id="@android:id/progress">

        <clip>

            <shape android:shape="rectangle">

                <solid android:color="@color/tv_volume_dialog_seek_bar_fill" />

                <corners android:radius="@dimen/tv_volume_seek_bar_width" />

            </shape>

        </clip>

        </layer-list>

    </item>

    <item android:id="@android:id/progress"

          android:gravity="center_vertical|fill_horizontal">

            <com.android.systemui.util.RoundedCornerProgressDrawable

                android:drawable="@drawable/volume_row_seekbar_progress"

            />

    </item>

</layer-list>

packages/SystemUI/res/drawable-television/volume_row_seekbar_progress.xml

0 → 100644
+29 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2021 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.

  -->



<!-- Progress drawable for volume row SeekBars. This is the accent-colored round rect that moves up

     and down as the progress value changes. -->

<layer-list xmlns:android="http://schemas.android.com/apk/res/android"

    android:autoMirrored="true">

    <item android:id="@+id/volume_seekbar_progress_solid">

        <shape android:shape="rectangle">

            <size android:height="@dimen/volume_dialog_slider_width"/>

            <solid android:color="@color/tv_volume_dialog_seek_bar_fill" />

            <corners android:radius="@dimen/volume_dialog_slider_width" />

        </shape>

    </item>

</layer-list>

packages/SystemUI/res/drawable/volume_row_seekbar.xml

+3 −3
Original line number Diff line number Diff line
@@ -25,9 +25,9 @@ 
        <layer-list>

            <item android:id="@+id/volume_seekbar_background_solid">

                <shape>

                    <size android:height="@dimen/volume_dialog_panel_width" />

                    <size android:height="@dimen/volume_dialog_slider_width" />

                    <solid android:color="?android:attr/colorBackgroundFloating" />

                    <corners android:radius="@dimen/volume_dialog_panel_width_half" />

                    <corners android:radius="@dimen/volume_dialog_slider_corner_radius" />

                </shape>

            </item>

            <item

packages/SystemUI/res/layout-land-television/volume_dialog_row.xml

+6 −6
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:tag="row"

    android:layout_width="wrap_content"

    android:layout_height="@dimen/volume_dialog_row_height"

    android:layout_height="@dimen/volume_dialog_panel_height"

    android:background="@android:color/transparent"

    android:clipChildren="false"

    android:clipToPadding="false"
@@ -54,18 +54,18 @@ 
        <FrameLayout

            android:id="@+id/volume_row_slider_frame"

            android:layout_width="match_parent"

            android:layout_height="@dimen/volume_dialog_row_height">

            android:layout_height="@dimen/volume_dialog_panel_height">

            <SeekBar

                android:id="@+id/volume_row_slider"

                android:clickable="false"

                android:layout_width="@dimen/volume_dialog_row_height"

                android:layout_width="@dimen/volume_dialog_panel_height"

                android:layout_height="match_parent"

                android:layout_gravity="center"

                android:layoutDirection="ltr"

                android:maxHeight="@dimen/tv_volume_seek_bar_width"

                android:minHeight="@dimen/tv_volume_seek_bar_width"

                android:maxHeight="@dimen/volume_dialog_slider_width"

                android:minHeight="@dimen/volume_dialog_slider_width"

                android:progressDrawable="@drawable/volume_row_seekbar"

                android:thumb="@drawable/tv_volume_row_seek_thumb"

                android:progressDrawable="@drawable/tv_volume_row_seek_bar"

                android:splitTrack="false"

                android:rotation="270" />

        </FrameLayout>

packages/SystemUI/res/layout/volume_dialog_row.xml

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ 
                android:layout_width="@dimen/volume_row_slider_height"

                android:layout_height="match_parent"

                android:layout_gravity="center"

                android:thumb="@android:color/transparent"

                android:rotation="270" />

        </FrameLayout>