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

Merge "Bring width of controls panel up to spec" into tm-qpr-dev am: 34847016d8

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

Change-Id: Ica2deaec09a28a6dbe6e84a3baafe11c741b3eb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Fabian Kozynski
2023-02-02 21:00:01 +00:00
committed by Automerger Merge Worker
parent dbcd75087b 34847016d8
commit fca5fea02d
6 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/res/layout/controls_with_favorites.xml
View File

@@ -20,7 +20,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_marginTop="@dimen/controls_top_margin"
android:layout_marginBottom="@dimen/controls_header_bottom_margin"> android:layout_marginBottom="@dimen/controls_header_bottom_margin">
<!-- make sure the header stays centered in the layout by adding a spacer --> <!-- make sure the header stays centered in the layout by adding a spacer -->
@@ -78,6 +77,7 @@
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical" android:orientation="vertical"
android:clipChildren="true" android:clipChildren="true"
android:paddingHorizontal="16dp"
android:scrollbars="none"> android:scrollbars="none">
<include layout="@layout/global_actions_controls_list_view" /> <include layout="@layout/global_actions_controls_list_view" />
@@ -88,8 +88,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1" android:layout_weight="1"
android:layout_marginLeft="@dimen/global_actions_side_margin"
android:layout_marginRight="@dimen/global_actions_side_margin"
android:background="@drawable/controls_panel_background" android:background="@drawable/controls_panel_background"
android:visibility="gone" android:visibility="gone"
/> />

2
packages/SystemUI/res/values-land/dimens.xml
View File

@@ -64,4 +64,6 @@
<dimen name="qs_panel_padding_top">@dimen/qqs_layout_margin_top</dimen> <dimen name="qs_panel_padding_top">@dimen/qqs_layout_margin_top</dimen>
<dimen name="qs_panel_padding_top_combined_headers">@dimen/qs_panel_padding_top</dimen> <dimen name="qs_panel_padding_top_combined_headers">@dimen/qs_panel_padding_top</dimen>
<dimen name="controls_padding_horizontal">16dp</dimen>
</resources> </resources>

3
packages/SystemUI/res/values-sw600dp/dimens.xml
View File

@@ -51,9 +51,6 @@
<!-- Text size for user name in user switcher --> <!-- Text size for user name in user switcher -->
<dimen name="kg_user_switcher_text_size">18sp</dimen> <dimen name="kg_user_switcher_text_size">18sp</dimen>
<dimen name="controls_header_bottom_margin">12dp</dimen>
<dimen name="controls_top_margin">24dp</dimen>
<dimen name="global_actions_grid_item_layout_height">80dp</dimen> <dimen name="global_actions_grid_item_layout_height">80dp</dimen>
<dimen name="qs_brightness_margin_bottom">16dp</dimen> <dimen name="qs_brightness_margin_bottom">16dp</dimen>

1
packages/SystemUI/res/values-sw720dp-land/dimens.xml
View File

@@ -17,7 +17,6 @@
*/ */
--> -->
<resources> <resources>
<dimen name="controls_padding_horizontal">205dp</dimen>
<dimen name="split_shade_notifications_scrim_margin_bottom">24dp</dimen> <dimen name="split_shade_notifications_scrim_margin_bottom">24dp</dimen>
<dimen name="notification_panel_margin_bottom">64dp</dimen> <dimen name="notification_panel_margin_bottom">64dp</dimen>

2
packages/SystemUI/res/values-sw720dp/dimens.xml
View File

@@ -19,7 +19,7 @@
<!-- gap on either side of status bar notification icons --> <!-- gap on either side of status bar notification icons -->
<dimen name="status_bar_icon_padding">1dp</dimen> <dimen name="status_bar_icon_padding">1dp</dimen>
<dimen name="controls_padding_horizontal">75dp</dimen> <dimen name="controls_padding_horizontal">40dp</dimen>
<dimen name="large_screen_shade_header_height">56dp</dimen> <dimen name="large_screen_shade_header_height">56dp</dimen>

2
packages/SystemUI/res/values/dimens.xml
View File

@@ -1115,7 +1115,7 @@
<!-- Home Controls --> <!-- Home Controls -->
<dimen name="controls_header_menu_size">48dp</dimen> <dimen name="controls_header_menu_size">48dp</dimen>
<dimen name="controls_header_bottom_margin">24dp</dimen> <dimen name="controls_header_bottom_margin">16dp</dimen>
<dimen name="controls_header_app_icon_size">24dp</dimen> <dimen name="controls_header_app_icon_size">24dp</dimen>
<dimen name="controls_top_margin">48dp</dimen> <dimen name="controls_top_margin">48dp</dimen>
<dimen name="controls_padding_horizontal">0dp</dimen> <dimen name="controls_padding_horizontal">0dp</dimen>