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

Merge "Controls - UX spacing tweaks" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-06-08 07:33:06 +00:00
committed by Android (Google) Code Review
parent 57822e02ec 9e0abbb7b8
commit 4489ee8b03
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/res/layout/controls_base_item.xml
View File

@@ -25,8 +25,7 @@
android:focusable="true" android:focusable="true"
android:screenReaderFocusable="true" android:screenReaderFocusable="true"
android:stateListAnimator="@anim/control_state_list_animator" android:stateListAnimator="@anim/control_state_list_animator"
android:layout_marginLeft="@dimen/control_base_item_margin" android:layout_marginStart="@dimen/control_spacing"
android:layout_marginRight="@dimen/control_base_item_margin"
android:background="@drawable/control_background"> android:background="@drawable/control_background">
<ImageView <ImageView

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

@@ -1331,15 +1331,15 @@
<dimen name="control_spinner_padding_horizontal">20dp</dimen> <dimen name="control_spinner_padding_horizontal">20dp</dimen>
<dimen name="control_text_size">14sp</dimen> <dimen name="control_text_size">14sp</dimen>
<dimen name="control_icon_size">24dp</dimen> <dimen name="control_icon_size">24dp</dimen>
<dimen name="control_spacing">4dp</dimen> <dimen name="control_spacing">8dp</dimen>
<dimen name="control_list_divider">1dp</dimen> <dimen name="control_list_divider">1dp</dimen>
<dimen name="control_corner_radius">12dp</dimen> <dimen name="control_corner_radius">14dp</dimen>
<dimen name="control_height">106dp</dimen> <dimen name="control_height">104dp</dimen>
<dimen name="control_padding">12dp</dimen> <dimen name="control_padding">12dp</dimen>
<dimen name="control_padding_adjustment">4dp</dimen> <dimen name="control_padding_adjustment">4dp</dimen>
<dimen name="control_status_normal">14sp</dimen> <dimen name="control_status_normal">14sp</dimen>
<dimen name="control_status_expanded">18sp</dimen> <dimen name="control_status_expanded">18sp</dimen>
<dimen name="control_base_item_margin">2dp</dimen> <dimen name="control_base_item_margin">4dp</dimen>
<dimen name="control_status_padding">3dp</dimen> <dimen name="control_status_padding">3dp</dimen>
<fraction name="controls_toggle_bg_intensity">5%</fraction> <fraction name="controls_toggle_bg_intensity">5%</fraction>
<fraction name="controls_dimmed_alpha">40%</fraction> <fraction name="controls_dimmed_alpha">40%</fraction>

6
packages/SystemUI/src/com/android/systemui/controls/ui/ControlsUiControllerImpl.kt
View File

@@ -399,6 +399,12 @@ class ControlsUiControllerImpl @Inject constructor (
val baseLayout = inflater.inflate( val baseLayout = inflater.inflate(
R.layout.controls_base_item, lastRow, false) as ViewGroup R.layout.controls_base_item, lastRow, false) as ViewGroup
lastRow.addView(baseLayout) lastRow.addView(baseLayout)
// Use ConstraintLayout in the future... for now, manually adjust margins
if (lastRow.getChildCount() == 1) {
val lp = baseLayout.getLayoutParams() as ViewGroup.MarginLayoutParams
lp.setMarginStart(0)
}
val cvh = ControlViewHolder( val cvh = ControlViewHolder(
baseLayout, baseLayout,
controlsController.get(), controlsController.get(),