Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I1e7c153f7a06bf017377c1dcb0850c6774c7c787
This commit is contained in:
TreeHugger Robot
2021-06-14 15:10:34 +00:00
committed by Automerger Merge Worker
parent b1d7465e29 0052940080
commit 9cf5624ac9
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
packages/SystemUI/res/layout/qs_footer_impl.xml
View File

@@ -106,11 +106,25 @@
android:scaleType="centerInside" /> android:scaleType="centerInside" />
</com.android.systemui.statusbar.phone.MultiUserSwitch> </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 <com.android.systemui.statusbar.AlphaOptimizedFrameLayout
android:id="@+id/settings_button_container" android:id="@+id/settings_button_container"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="@dimen/qs_footer_action_button_size" 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:background="@drawable/qs_footer_action_chip_background"
android:layout_weight="1" android:layout_weight="1"
android:clipChildren="false" android:clipChildren="false"
@@ -140,20 +154,6 @@
</com.android.systemui.statusbar.AlphaOptimizedFrameLayout> </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>
</LinearLayout> </LinearLayout>