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

Commit 9652fe27 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Controls - UX spacing tweaks" into sc-dev am: 4489ee8b 

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

Change-Id: I0d3891019d7ccdb358b73a7555088d0d0d8a0e1c
parents 70520cf1 4489ee8b

packages/SystemUI/res/layout/controls_base_item.xml

+1 −2
Original line number Diff line number Diff line
@@ -25,8 +25,7 @@ 
    android:focusable="true"

    android:screenReaderFocusable="true"

    android:stateListAnimator="@anim/control_state_list_animator"

    android:layout_marginLeft="@dimen/control_base_item_margin"

    android:layout_marginRight="@dimen/control_base_item_margin"

    android:layout_marginStart="@dimen/control_spacing"

    android:background="@drawable/control_background">



    <ImageView

packages/SystemUI/res/values/dimens.xml

+4 −4
Original line number Diff line number Diff line
@@ -1331,15 +1331,15 @@ 
    <dimen name="control_spinner_padding_horizontal">20dp</dimen>

    <dimen name="control_text_size">14sp</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_corner_radius">12dp</dimen>

    <dimen name="control_height">106dp</dimen>

    <dimen name="control_corner_radius">14dp</dimen>

    <dimen name="control_height">104dp</dimen>

    <dimen name="control_padding">12dp</dimen>

    <dimen name="control_padding_adjustment">4dp</dimen>

    <dimen name="control_status_normal">14sp</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>

    <fraction name="controls_toggle_bg_intensity">5%</fraction>

    <fraction name="controls_dimmed_alpha">40%</fraction>

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

+6 −0
Original line number Diff line number Diff line
@@ -399,6 +399,12 @@ class ControlsUiControllerImpl @Inject constructor ( 
                val baseLayout = inflater.inflate(

                    R.layout.controls_base_item, lastRow, false) as ViewGroup

                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(

                    baseLayout,

                    controlsController.get(),