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

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

Controls UI - Redlines for setup screens 

Align with redlines, and match wallet.

Bug: 154672304
Test: visual
Change-Id: I2bbd676d2b422d645726e9b5fed830548cebdf9b
parent d8b6b0fb

packages/SystemUI/res/drawable/control_no_favorites_background.xml

+19 −4
Original line number Original line Diff line number Diff line
@@ -16,7 +16,22 @@ 
* limitations under the License.

* limitations under the License.

*/

*/

-->

-->

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

<!-- Should be kept in sync with the wallet plugin, as both share a similar

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

     design: packages/apps/QuickAccessWallet -->

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

    android:color="?android:attr/colorControlHighlight">

    <item android:id="@android:id/mask">

        <shape android:shape="rectangle">

            <solid android:color="#000000" />

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

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

        </shape>

        </shape>

    </item>

    <item>

        <shape>

            <stroke

                android:width="1dp"

                android:color="#4DFFFFFF" />

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

        </shape>

    </item>

</ripple>

packages/SystemUI/res/layout/controls_icon.xml

+4 −4
Original line number Original line Diff line number Diff line
@@ -19,8 +19,8 @@ 




<ImageView

<ImageView

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

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

    android:layout_width="28dp"

    android:layout_width="24dp"

    android:layout_height="28dp"

    android:layout_height="24dp"

    android:scaleType="fitCenter"

    android:scaleType="fitCenter"

    android:layout_marginLeft="2dp"

    android:layout_marginLeft="5dp"

    android:layout_marginRight="2dp" />
 
    android:layout_marginRight="5dp" />

packages/SystemUI/res/layout/controls_no_favorites.xml

+5 −6
Original line number Original line Diff line number Diff line
@@ -24,11 +24,10 @@ 
      android:layout_width="match_parent"

      android:layout_width="match_parent"

      android:layout_height="wrap_content"

      android:layout_height="wrap_content"

      android:orientation="vertical"

      android:orientation="vertical"

      android:paddingTop="40dp"

      android:paddingVertical="@dimen/controls_setup_vertical_padding"

      android:paddingBottom="40dp"

      android:layout_marginLeft="@dimen/global_actions_side_margin"

      android:layout_marginLeft="10dp"

      android:layout_marginRight="@dimen/global_actions_side_margin"

      android:layout_marginRight="10dp"

      android:layout_marginTop="@dimen/controls_setup_top_margin"

      android:layout_marginTop="@dimen/controls_top_margin"

      android:background="@drawable/control_no_favorites_background">

      android:background="@drawable/control_no_favorites_background">





    <LinearLayout

    <LinearLayout
@@ -37,7 +36,7 @@ 
        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:layout_gravity="center"

        android:orientation="horizontal"

        android:orientation="horizontal"

        android:paddingBottom="8dp" />

        android:layout_marginBottom="16dp" />





    <TextView

    <TextView

        style="@style/TextAppearance.ControlSetup.Title"

        style="@style/TextAppearance.ControlSetup.Title"

packages/SystemUI/res/values/dimens.xml

+4 −0
Original line number Original line Diff line number Diff line
@@ -1276,6 +1276,10 @@ 
    <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>

    <dimen name="controls_setup_top_margin">16dp</dimen>

    <dimen name="controls_setup_title">22sp</dimen>

    <dimen name="controls_setup_subtitle">14sp</dimen>

    <dimen name="controls_setup_vertical_padding">52dp</dimen>





    <!-- Home Controls activity view detail panel-->

    <!-- Home Controls activity view detail panel-->

    <dimen name="controls_activity_view_top_offset">100dp</dimen>

    <dimen name="controls_activity_view_top_offset">100dp</dimen>

packages/SystemUI/res/values/styles.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -765,11 +765,11 @@ 
    </style>

    </style>





    <style name="TextAppearance.ControlSetup.Title">

    <style name="TextAppearance.ControlSetup.Title">

        <item name="android:textSize">25sp</item>

        <item name="android:textSize">@dimen/controls_setup_title</item>

    </style>

    </style>





    <style name="TextAppearance.ControlSetup.Subtitle">

    <style name="TextAppearance.ControlSetup.Subtitle">

        <item name="android:textSize">16sp</item>

        <item name="android:textSize">@dimen/controls_setup_subtitle</item>

    </style>

    </style>





    <!-- The attributes used for title (textAppearanceLarge) and message (textAppearanceMedium)

    <!-- The attributes used for title (textAppearanceLarge) and message (textAppearanceMedium)