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

Commit e0661b63 authored by Matt Pietal's avatar Matt Pietal
Browse files

Controls UI polish 

Adjust padding to get closer to redlines. Set a default black scrim to
be used in all cases.

Bug: 148207527
Test: atest SystemUiTests
Change-Id: I4332e5b729174e244d2f067972825518b8cc4015
parent 8a269993

packages/SystemUI/res/drawable/control_no_favorites_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,6 +17,6 @@ 
*/

-->

<shape xmlns:android="http://schemas.android.com/apk/res/android">

  <stroke android:width="1dp" android:color="?android:attr/colorBackgroundFloating"/>

  <stroke android:width="1dp" android:color="@*android:color/foreground_material_dark"/>

  <corners android:radius="@dimen/control_corner_radius" />

</shape>

packages/SystemUI/res/layout/controls_base_item.xml

+6 −6
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ 
    android:padding="@dimen/control_padding"

    android:clickable="true"

    android:focusable="true"

    android:layout_marginLeft="3dp"

    android:layout_marginRight="3dp"

    android:layout_marginLeft="2dp"

    android:layout_marginRight="2dp"

    android:background="@drawable/control_background">



    <ImageView
@@ -60,9 +60,9 @@ 
        android:id="@+id/title"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:textSize="18sp"

        android:textSize="14sp"

        android:textColor="?android:attr/textColorPrimary"

        android:fontFamily="@*android:string/config_headlineFontFamily"

        android:textAppearance="?android:attr/textAppearanceSmall"

        app:layout_constraintBottom_toTopOf="@+id/subtitle"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintTop_toBottomOf="@+id/icon" />
@@ -71,9 +71,9 @@ 
        android:id="@+id/subtitle"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:textSize="16sp"

        android:textSize="12sp"

        android:textColor="?android:attr/textColorSecondary"

        android:fontFamily="@*android:string/config_headlineFontFamily"

        android:textAppearance="?android:attr/textAppearanceSmall"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintStart_toStartOf="parent" />

</androidx.constraintlayout.widget.ConstraintLayout>

packages/SystemUI/res/layout/controls_no_favorites.xml

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
      android:paddingBottom="40dp"

      android:layout_marginLeft="10dp"

      android:layout_marginRight="10dp"

      android:textColor="?android:attr/textColorPrimary"

      android:textColor="@*android:color/foreground_material_dark"

      android:fontFamily="@*android:string/config_headlineFontFamily"

      android:background="@drawable/control_no_favorites_background"/>

</merge>

packages/SystemUI/res/layout/controls_with_favorites.xml

+12 −5
Original line number Diff line number Diff line
@@ -4,7 +4,8 @@ 


  <androidx.constraintlayout.widget.ConstraintLayout

      android:layout_width="match_parent"

      android:layout_height="wrap_content">

      android:layout_height="wrap_content"

      android:paddingBottom="20dp">



    <TextView

        android:text="@string/quick_controls_title"
@@ -13,17 +14,23 @@ 
        android:singleLine="true"

        android:gravity="center"

        android:textSize="25dp"

        android:textColor="?android:attr/textColorPrimary"

        android:textColor="@*android:color/foreground_material_dark"

        android:fontFamily="@*android:string/config_headlineFontFamily"

        app:layout_constraintLeft_toLeftOf="parent"

        app:layout_constraintRight_toRightOf="parent"/>

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintTop_toTopOf="parent" />



    <ImageView

        android:id="@+id/controls_more"

        android:src="@drawable/ic_more_vert"

        android:layout_width="34dp"

        android:layout_height="24dp" 

        android:layout_marginEnd="10dp"

        app:layout_constraintEnd_toEndOf="parent"/>

        android:tint="@*android:color/foreground_material_dark"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintTop_toTopOf="parent" />



  </androidx.constraintlayout.widget.ConstraintLayout>

packages/SystemUI/res/layout/global_actions_grid_v2.xml

+2 −2
Original line number Diff line number Diff line
@@ -96,18 +96,18 @@ 
        app:layout_constraintTop_toBottomOf="@id/global_actions_view">



      <FrameLayout

          android:translationY="@dimen/global_actions_plugin_offset"

          android:id="@+id/global_actions_panel_container"

          android:layout_width="match_parent"

          android:layout_height="wrap_content" />

    </LinearLayout>



    <LinearLayout

        android:translationY="@dimen/global_actions_plugin_offset"

        android:id="@+id/global_actions_controls"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="vertical"

        android:layout_marginRight="@dimen/global_actions_grid_horizontal_padding"

        android:layout_marginLeft="@dimen/global_actions_grid_horizontal_padding"

        app:layout_constraintLeft_toLeftOf="parent"

        app:layout_constraintRight_toRightOf="parent"

        app:layout_constraintTop_toBottomOf="@id/global_actions_panel">