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

Merge "Reduce vertical margins in landscape add controls" into rvc-qpr-dev am: 354b3ec329

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

Change-Id: I601f3a01a3e733ff8aab1e755be75e8cb64f51ce
This commit is contained in:
TreeHugger Robot
2020-09-18 14:40:52 +00:00
committed by Automerger Merge Worker
parent dfe356fc6f 354b3ec329
commit f6098d82bb
5 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/res/layout/controls_management.xml
View File

@@ -50,7 +50,7 @@
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="72dp"> android:layout_height="@dimen/controls_management_footer_height">
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -61,7 +61,8 @@
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:padding="@dimen/controls_management_footer_side_margin"> android:paddingHorizontal="@dimen/controls_management_footer_side_margin"
android:paddingVertical="@dimen/controls_management_footer_top_margin" >
<Button <Button
android:id="@+id/other_apps" android:id="@+id/other_apps"

2
packages/SystemUI/res/layout/controls_management_favorites.xml
View File

@@ -36,7 +36,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="@dimen/controls_management_page_indicator_height" android:layout_height="@dimen/controls_management_page_indicator_height"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginTop="@dimen/controls_management_list_margin" android:layout_marginTop="@dimen/controls_management_indicator_top_margin"
android:visibility="invisible" /> android:visibility="invisible" />
<androidx.viewpager2.widget.ViewPager2 <androidx.viewpager2.widget.ViewPager2

2
packages/SystemUI/res/layout/controls_structure_page.xml
View File

@@ -21,4 +21,4 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:layout_marginTop="@dimen/controls_management_zone_top_margin"/> android:layout_marginTop="@dimen/controls_management_favorites_top_margin"/>

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

@@ -47,4 +47,15 @@
<dimen name="global_actions_power_dialog_item_height">130dp</dimen> <dimen name="global_actions_power_dialog_item_height">130dp</dimen>
<dimen name="global_actions_power_dialog_item_bottom_margin">35dp</dimen> <dimen name="global_actions_power_dialog_item_bottom_margin">35dp</dimen>
<dimen name="controls_management_top_padding">12dp</dimen>
<dimen name="controls_management_titles_margin">8dp</dimen>
<dimen name="controls_management_indicator_top_margin">8dp</dimen>
<dimen name="controls_management_list_margin">4dp</dimen>
<dimen name="controls_management_footer_height">56dp</dimen>
<dimen name="controls_management_zone_top_margin">24dp</dimen>
<!-- (footer_height -48dp)/2 -->
<dimen name="controls_management_footer_top_margin">4dp</dimen>
<dimen name="controls_management_favorites_top_margin">8dp</dimen>
</resources> </resources>

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

@@ -1350,15 +1350,19 @@
<dimen name="controls_management_side_padding">16dp</dimen> <dimen name="controls_management_side_padding">16dp</dimen>
<dimen name="controls_management_titles_margin">16dp</dimen> <dimen name="controls_management_titles_margin">16dp</dimen>
<dimen name="controls_management_footer_side_margin">8dp</dimen> <dimen name="controls_management_footer_side_margin">8dp</dimen>
<dimen name="controls_management_footer_top_margin">@dimen/controls_management_footer_side_margin</dimen>
<dimen name="controls_management_list_margin">16dp</dimen> <dimen name="controls_management_list_margin">16dp</dimen>
<dimen name="controls_management_indicator_top_margin">@dimen/controls_management_list_margin</dimen>
<dimen name="controls_management_apps_list_margin">64dp</dimen> <dimen name="controls_management_apps_list_margin">64dp</dimen>
<dimen name="controls_management_editing_list_margin">48dp</dimen> <dimen name="controls_management_editing_list_margin">48dp</dimen>
<dimen name="controls_management_editing_divider_margin">24dp</dimen> <dimen name="controls_management_editing_divider_margin">24dp</dimen>
<dimen name="controls_management_apps_extra_side_margin">8dp</dimen> <dimen name="controls_management_apps_extra_side_margin">8dp</dimen>
<dimen name="controls_management_zone_top_margin">32dp</dimen> <dimen name="controls_management_zone_top_margin">32dp</dimen>
<dimen name="controls_management_favorites_top_margin">@dimen/controls_management_zone_top_margin</dimen>
<dimen name="controls_management_status_side_margin">16dp</dimen> <dimen name="controls_management_status_side_margin">16dp</dimen>
<dimen name="controls_management_page_indicator_height">24dp</dimen> <dimen name="controls_management_page_indicator_height">24dp</dimen>
<dimen name="controls_management_checkbox_size">25dp</dimen> <dimen name="controls_management_checkbox_size">25dp</dimen>
<dimen name="controls_management_footer_height">72dp</dimen>
<dimen name="controls_title_size">24sp</dimen> <dimen name="controls_title_size">24sp</dimen>
<dimen name="controls_subtitle_size">16sp</dimen> <dimen name="controls_subtitle_size">16sp</dimen>