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

Commit 0c3fc057 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Switch order of settings and power" into sc-dev am: 00529400 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14948720

Change-Id: I41b65a057663f2c2d29d9703d1751c30a318aa27
parents 101b8265 00529400

packages/SystemUI/res/layout/qs_footer_impl.xml

+15 −15
Original line number Diff line number Diff line
@@ -106,11 +106,25 @@ 
                    android:scaleType="centerInside" />

            </com.android.systemui.statusbar.phone.MultiUserSwitch>



            <com.android.systemui.statusbar.AlphaOptimizedImageView

                android:id="@+id/pm_lite"

                android:layout_width="0dp"

                android:layout_height="@dimen/qs_footer_action_button_size"

                android:layout_marginEnd="@dimen/qs_tile_margin_horizontal"

                android:layout_weight="1"

                android:background="@drawable/qs_footer_action_chip_background"

                android:clickable="true"

                android:clipToPadding="false"

                android:focusable="true"

                android:padding="@dimen/qs_footer_icon_padding"

                android:src="@*android:drawable/ic_lock_power_off"

                android:contentDescription="@string/accessibility_quick_settings_power_menu"

                android:tint="?android:attr/textColorPrimary" />



            <com.android.systemui.statusbar.AlphaOptimizedFrameLayout

                android:id="@+id/settings_button_container"

                android:layout_width="0dp"

                android:layout_height="@dimen/qs_footer_action_button_size"

                android:layout_marginEnd="@dimen/qs_tile_margin_horizontal"

                android:background="@drawable/qs_footer_action_chip_background"

                android:layout_weight="1"

                android:clipChildren="false"
@@ -140,20 +154,6 @@ 


            </com.android.systemui.statusbar.AlphaOptimizedFrameLayout>



            <com.android.systemui.statusbar.AlphaOptimizedImageView

                android:id="@+id/pm_lite"

                android:layout_width="0dp"

                android:layout_height="@dimen/qs_footer_action_button_size"

                android:layout_weight="1"

                android:background="@drawable/qs_footer_action_chip_background"

                android:clickable="true"

                android:clipToPadding="false"

                android:focusable="true"

                android:padding="@dimen/qs_footer_icon_padding"

                android:src="@*android:drawable/ic_lock_power_off"

                android:contentDescription="@string/accessibility_quick_settings_power_menu"

                android:tint="?android:attr/textColorPrimary" />



        </LinearLayout>

    </LinearLayout>