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

Commit 72feab71 authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-17.1' into v1-q

parents 42bf4c91 2760fc29

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

+7 −4
Original line number Diff line number Diff line
@@ -87,11 +87,14 @@ 
                android:paddingLeft="@dimen/volume_dialog_stream_padding">

                <!-- volume rows added and removed here! :-) -->

            </LinearLayout>

            <View

                android:layout_width="match_parent"

                android:layout_height="1dp"

                android:background="?android:attr/listDivider"/>

            <LinearLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="horizontal"

                android:background="@drawable/rounded_bg_bottom_background" >

                android:orientation="horizontal" >

                <FrameLayout

                    android:id="@+id/expandable_indicator_container"

                    android:layout_width="wrap_content"
@@ -105,7 +108,7 @@ 
                        android:layout_marginLeft="8dp"

                        android:contentDescription="@string/accessibility_volume_expand"

                        android:background="@drawable/ripple_drawable_20dp"

                        android:tint="?android:attr/textColorSecondary"

                        android:tint="@color/accent_tint_color_selector"

                        android:soundEffectsEnabled="false"

                        android:padding="14dp" />

                </FrameLayout>
@@ -122,7 +125,7 @@ 
                        android:layout_marginLeft="8dp"

                        android:contentDescription="@string/accessibility_volume_settings"

                        android:background="@drawable/ripple_drawable_20dp"

                        android:tint="?android:attr/textColorSecondary"

                        android:tint="@color/accent_tint_color_selector"

                        android:soundEffectsEnabled="false" />

                </FrameLayout>

            </LinearLayout>

packages/SystemUI/res/layout/volume_dialog.xml

+7 −4
Original line number Diff line number Diff line
@@ -88,11 +88,14 @@ 
                android:paddingLeft="@dimen/volume_dialog_stream_padding">

                    <!-- volume rows added and removed here! :-) -->

            </LinearLayout>

            <View

                android:layout_width="match_parent"

                android:layout_height="1dp"

                android:background="?android:attr/listDivider"/>

            <LinearLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="horizontal"

                android:background="@drawable/rounded_bg_bottom_background" >

                android:orientation="horizontal" >

                <FrameLayout

                    android:id="@+id/expandable_indicator_container"

                    android:layout_width="wrap_content"
@@ -106,7 +109,7 @@ 
                        android:layout_marginLeft="8dp"

                        android:contentDescription="@string/accessibility_volume_expand"

                        android:background="@drawable/ripple_drawable_20dp"

                        android:tint="?android:attr/textColorSecondary"

                        android:tint="@color/accent_tint_color_selector"

                        android:soundEffectsEnabled="false"

                        android:padding="14dp" />

                </FrameLayout>
@@ -123,7 +126,7 @@ 
                        android:layout_marginLeft="8dp"

                        android:contentDescription="@string/accessibility_volume_settings"

                        android:background="@drawable/ripple_drawable_20dp"

                        android:tint="?android:attr/textColorSecondary"

                        android:tint="@color/accent_tint_color_selector"

                        android:soundEffectsEnabled="false" />

                </FrameLayout>

            </LinearLayout>