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

Unverified Commit fd7778c0 authored by Arian's avatar Arian Committed by Michael Bestas
Browse files

SystemUI: Make the volume dialog expandable 



Co-authored-by: default avatarChristian Hoffmann <chrmhoffmann@gmail.com>
Change-Id: I780a9851eaa209204b6be2ad26506e4eab4dc84e
parent f83a8e0c

packages/SystemUI/proguard.flags

+4 −0
Original line number Diff line number Diff line
@@ -5,3 +5,7 @@ 
}



-keep,allowoptimization,allowaccessmodification class com.android.systemui.dagger.DaggerReferenceGlobalRootComponent** { !synthetic *; }



-keep class com.android.systemui.statusbar.phone.ExpandableIndicator {

    *;

}

packages/SystemUI/res/drawable/ic_speaker_group_24dp.xml

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

packages/SystemUI/res/drawable/volume_background.xml

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

packages/SystemUI/res/layout-land/volume_dialog.xml

+24 −5
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
    android:theme="@style/volume_dialog_theme">



    <!-- right-aligned to be physically near volume button -->

    <LinearLayout

    <com.android.systemui.animation.view.LaunchableLinearLayout

        android:id="@+id/volume_dialog"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"
@@ -88,9 +88,8 @@ 
                    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
@@ -102,9 +101,29 @@ 
                        android:contentDescription="@string/accessibility_volume_settings"

                        android:scaleType="centerInside"

                        android:soundEffectsEnabled="false"

                        android:src="@drawable/horizontal_ellipsis"

                        android:src="@drawable/ic_speaker_group_24dp"

                        android:tint="?androidprv:attr/colorAccent" />

                </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>

                <FrameLayout

                    android:id="@+id/rounded_border_bottom"

                    android:layout_width="wrap_content"
@@ -140,7 +159,7 @@ 
                android:layout_gravity="center"

                android:soundEffectsEnabled="false" />

        </FrameLayout>

    </LinearLayout>

    </com.android.systemui.animation.view.LaunchableLinearLayout>



    <ViewStub

        android:id="@+id/odi_captions_tooltip_stub"

packages/SystemUI/res/layout/volume_dialog.xml

+24 −5
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
    android:theme="@style/volume_dialog_theme">



    <!-- right-aligned to be physically near volume button -->

    <LinearLayout

    <com.android.systemui.animation.view.LaunchableLinearLayout

        android:id="@+id/volume_dialog"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"
@@ -89,13 +89,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"
@@ -104,6 +103,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>

                <FrameLayout

                    android:id="@+id/rounded_border_bottom"

                    android:layout_width="wrap_content"
@@ -139,7 +158,7 @@ 
                android:layout_gravity="center"

                android:soundEffectsEnabled="false"/>

        </FrameLayout>

    </LinearLayout>

    </com.android.systemui.animation.view.LaunchableLinearLayout>



    <ViewStub

        android:id="@+id/odi_captions_tooltip_stub"