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

Commit feb5d814 authored by Anton Potapov's avatar Anton Potapov
Browse files

Increase buttons clickable areas 

Flag: com.android.systemui.volume_redesign
Fixes: 419487491
Test: atest VolumeDialogScreenshotTest
Change-Id: I9168cd3abc50874b174f8b33e6e613493bf320a5
parent 7cfe707c

packages/SystemUI/res/drawable/volume_drawer_selection_bg.xml

+10 −8
Original line number Diff line number Diff line
@@ -13,12 +13,14 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

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

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

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

    android:paddingMode="stack" >

    android:inset="4dp">

    <shape>

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

        <size

        android:height="@dimen/volume_dialog_ringer_drawer_button_size"

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

            android:width="@dimen/volume_dialog_ringer_drawer_button_size"

            android:height="@dimen/volume_dialog_ringer_drawer_button_size" />

        <solid android:color="@androidprv:color/materialColorPrimary" />

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

    </shape>

</inset>
 
 No newline at end of file

packages/SystemUI/res/drawable/volume_ringer_item_bg.xml

+7 −6
Original line number Diff line number Diff line
@@ -13,10 +13,11 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

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

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

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

    android:shape="rectangle" >

    <size android:width="@dimen/volume_dialog_ringer_drawer_button_size" android:height="@dimen/volume_dialog_ringer_drawer_button_size"/>

    <solid android:color="@androidprv:color/materialColorSurfaceContainerHighest" />

    android:inset="4dp">

    <shape android:shape="rectangle">

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

        <solid android:color="@androidprv:color/materialColorSurfaceContainerHighest" />

    </shape>

</inset>
 
 No newline at end of file

packages/SystemUI/res/layout/volume_dialog_bottom_section.xml

+1 −0
Original line number Diff line number Diff line
@@ -23,4 +23,5 @@ 
    android:contentDescription="@string/accessibility_volume_settings"

    android:scaleType="centerInside"

    android:soundEffectsEnabled="false"

    android:padding="4dp"

    android:tint="@androidprv:color/materialColorPrimary" />
 
 No newline at end of file

packages/SystemUI/res/layout/volume_ringer_button.xml

+2 −3
Original line number Diff line number Diff line
@@ -15,11 +15,10 @@ 
  -->

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

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_width="0dp"

    android:layout_height="0dp"

    android:background="@drawable/volume_ringer_item_bg"

    android:contentDescription="@string/volume_ringer_mode"

    android:gravity="center"

    android:padding="@dimen/volume_dialog_ringer_drawer_button_icon_radius"

    android:src="@drawable/volume_ringer_item_bg"

    android:tint="@androidprv:color/materialColorOnSurface" />

packages/SystemUI/res/values/dimens.xml

+4 −7
Original line number Diff line number Diff line
@@ -2211,18 +2211,18 @@ 
    <dimen name="volume_dialog_background_corner_radius">30dp</dimen>

    <!-- top margin covers half the ringer button + components spacing -->

    <dimen name="volume_dialog_background_top_margin">-28dp</dimen>

    <dimen name="volume_dialog_background_margin">10dp</dimen>

    <dimen name="volume_dialog_background_margin_negative">-10dp</dimen>

    <dimen name="volume_dialog_background_margin">6dp</dimen>

    <dimen name="volume_dialog_background_margin_negative">-6dp</dimen>



    <dimen name="volume_dialog_window_margin">12dp</dimen>

    <dimen name="volume_dialog_components_spacing">10dp</dimen>

    <dimen name="volume_dialog_components_spacing">4dp</dimen>

    <dimen name="volume_dialog_floating_sliders_spacing">8dp</dimen>

    <dimen name="volume_dialog_floating_sliders_vertical_padding_negative">

        @dimen/volume_dialog_background_margin_negative

    </dimen>

    <dimen name="volume_dialog_floating_sliders_horizontal_padding">4dp</dimen>

    <dimen name="volume_dialog_floating_sliders_vertical_padding">10dp</dimen>

    <dimen name="volume_dialog_button_size">40dp</dimen>

    <dimen name="volume_dialog_button_size">48dp</dimen>

    <dimen name="volume_dialog_slider_width">52dp</dimen>

    <dimen name="volume_dialog_slider_height">254dp</dimen>

    <!--
@@ -2236,9 +2236,6 @@ 
    <dimen name="volume_dialog_background_square_corner_radius">12dp</dimen>



    <dimen name="volume_dialog_ringer_drawer_button_size">@dimen/volume_dialog_button_size</dimen>

    <dimen name="volume_dialog_ringer_drawer_buttons_spacing">

        @dimen/volume_dialog_components_spacing

    </dimen>

    <dimen name="volume_dialog_ringer_drawer_button_icon_radius">10dp</dimen>

    <dimen name="volume_dialog_ringer_selected_button_background_radius">20dp</dimen>