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

Commit 17b004e4 authored by Arian's avatar Arian Committed by Nolen Johnson
Browse files

SystemUI: Make the volume dialog expandable

Change-Id: I282aece97f0c7b4435c94ca773631e2d9e738a14
parent 232b17f1
Loading
Loading
Loading
Loading
+22 −0
Original line number Diff line number Diff line
<!--
  Copyright (C) 2020-2022 The Android Open Source Project

  SPDX-License-Identifier: Apache-2.0
-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"
        android:width="24dp"
        android:height="24dp"
        android:viewportWidth="24"
        android:viewportHeight="24"
        android:tint="?android:attr/colorBackgroundFloating">
    <path
        android:pathData="M18.2,1L9.8,1C8.81,1 8,1.81 8,2.8v14.4c0,0.99 0.81,1.79 1.8,1.79l8.4,0.01c0.99,0 1.8,-0.81 1.8,-1.8L20,2.8c0,-0.99 -0.81,-1.8 -1.8,-1.8zM14,3c1.1,0 2,0.89 2,2s-0.9,2 -2,2 -2,-0.89 -2,-2 0.9,-2 2,-2zM14,16.5c-2.21,0 -4,-1.79 -4,-4s1.79,-4 4,-4 4,1.79 4,4 -1.79,4 -4,4z"
        android:fillColor="@android:color/white"/>
    <path
        android:pathData="M14,12.5m-2.5,0a2.5,2.5 0,1 1,5 0a2.5,2.5 0,1 1,-5 0"
        android:fillColor="@android:color/white"/>
    <path
        android:pathData="M6,5H4v16c0,1.1 0.89,2 2,2h10v-2H6V5z"
        android:fillColor="@android:color/white"/>
</vector>
+12 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
  Copyright (C) 2022 The LineageOS Project

  SPDX-License-Identifier: Apache-2.0
-->

<shape xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
    <size android:width="@dimen/volume_dialog_panel_width" />
    <solid android:color="?androidprv:attr/colorSurface" />
</shape>
+22 −3
Original line number Diff line number Diff line
@@ -99,13 +99,12 @@
                    android:id="@+id/settings_container"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:background="@drawable/volume_background_bottom"
                    android:background="@drawable/volume_background"
                    android:paddingLeft="@dimen/volume_dialog_ringer_rows_padding"
                    android:paddingBottom="@dimen/volume_dialog_ringer_rows_padding"
                    android:paddingRight="@dimen/volume_dialog_ringer_rows_padding">
                    <com.android.keyguard.AlphaOptimizedImageButton
                        android:id="@+id/settings"
                        android:src="@drawable/horizontal_ellipsis"
                        android:src="@drawable/ic_speaker_group_24dp"
                        android:layout_width="@dimen/volume_dialog_tap_target_size"
                        android:layout_height="@dimen/volume_dialog_tap_target_size"
                        android:layout_gravity="center"
@@ -114,6 +113,26 @@
                        android:tint="?androidprv:attr/colorAccent"
                        android:soundEffectsEnabled="false" />
                </FrameLayout>
                <FrameLayout
                    android:id="@+id/expandable_indicator_container"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:background="@drawable/volume_background_bottom"
                    android:paddingLeft="@dimen/volume_dialog_ringer_rows_padding"
                    android:paddingBottom="@dimen/volume_dialog_ringer_rows_padding"
                    android:paddingRight="@dimen/volume_dialog_ringer_rows_padding">
                    <com.android.systemui.statusbar.phone.ExpandableIndicator
                        android:id="@+id/expandable_indicator"
                        android:layout_width="@dimen/volume_dialog_tap_target_size"
                        android:layout_height="@dimen/volume_dialog_tap_target_size"
                        android:layout_gravity="center"
                        android:contentDescription="@string/accessibility_volume_settings"
                        android:background="@drawable/ripple_drawable_20dp"
                        android:tint="?androidprv:attr/colorAccent"
                        android:soundEffectsEnabled="false"
                        android:padding="10dp"
                        android:rotation="90" />
                </FrameLayout>
            </LinearLayout>

        </LinearLayout>
+22 −3
Original line number Diff line number Diff line
@@ -98,13 +98,12 @@
                    android:id="@+id/settings_container"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:background="@drawable/volume_background_bottom"
                    android:background="@drawable/volume_background"
                    android:paddingLeft="@dimen/volume_dialog_ringer_rows_padding"
                    android:paddingBottom="@dimen/volume_dialog_ringer_rows_padding"
                    android:paddingRight="@dimen/volume_dialog_ringer_rows_padding">
                    <com.android.keyguard.AlphaOptimizedImageButton
                        android:id="@+id/settings"
                        android:src="@drawable/horizontal_ellipsis"
                        android:src="@drawable/ic_speaker_group_24dp"
                        android:layout_width="@dimen/volume_dialog_tap_target_size"
                        android:layout_height="@dimen/volume_dialog_tap_target_size"
                        android:layout_gravity="center"
@@ -113,6 +112,26 @@
                        android:tint="?androidprv:attr/colorAccent"
                        android:soundEffectsEnabled="false" />
                </FrameLayout>
                <FrameLayout
                    android:id="@+id/expandable_indicator_container"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:background="@drawable/volume_background_bottom"
                    android:paddingLeft="@dimen/volume_dialog_ringer_rows_padding"
                    android:paddingBottom="@dimen/volume_dialog_ringer_rows_padding"
                    android:paddingRight="@dimen/volume_dialog_ringer_rows_padding">
                    <com.android.systemui.statusbar.phone.ExpandableIndicator
                        android:id="@+id/expandable_indicator"
                        android:layout_width="@dimen/volume_dialog_tap_target_size"
                        android:layout_height="@dimen/volume_dialog_tap_target_size"
                        android:layout_gravity="center"
                        android:contentDescription="@string/accessibility_volume_settings"
                        android:background="@drawable/ripple_drawable_20dp"
                        android:tint="?androidprv:attr/colorAccent"
                        android:soundEffectsEnabled="false"
                        android:padding="10dp"
                        android:rotation="90" />
                </FrameLayout>
            </LinearLayout>

        </LinearLayout>
+277 −16

File changed.

Preview size limit exceeded, changes collapsed.