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

Commit 162c2d3e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Controls UI - Redlines for setup screens" into rvc-dev am: 69226554

Change-Id: I8bd4adfe7572b70a47d22d1f78b79dbfcc67820b
parents 0c92ea79 69226554
Loading
Loading
Loading
Loading
+19 −4
Original line number Diff line number Diff line
@@ -16,7 +16,22 @@
* limitations under the License.
*/
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android">
  <stroke android:width="1dp" android:color="@*android:color/foreground_material_dark"/>
<!-- Should be kept in sync with the wallet plugin, as both share a similar
     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" />
        </shape>
    </item>
    <item>
        <shape>
            <stroke
                android:width="1dp"
                android:color="#4DFFFFFF" />
            <corners android:radius="@dimen/control_corner_radius"/>
        </shape>
    </item>
</ripple>
+4 −4
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@

<ImageView
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="28dp"
    android:layout_height="28dp"
    android:layout_width="24dp"
    android:layout_height="24dp"
    android:scaleType="fitCenter"
    android:layout_marginLeft="2dp"
    android:layout_marginRight="2dp" />
    android:layout_marginLeft="5dp"
    android:layout_marginRight="5dp" />
+5 −6
Original line number Diff line number Diff line
@@ -24,11 +24,10 @@
      android:layout_width="match_parent"
      android:layout_height="wrap_content"
      android:orientation="vertical"
      android:paddingTop="40dp"
      android:paddingBottom="40dp"
      android:layout_marginLeft="10dp"
      android:layout_marginRight="10dp"
      android:layout_marginTop="@dimen/controls_top_margin"
      android:paddingVertical="@dimen/controls_setup_vertical_padding"
      android:layout_marginLeft="@dimen/global_actions_side_margin"
      android:layout_marginRight="@dimen/global_actions_side_margin"
      android:layout_marginTop="@dimen/controls_setup_top_margin"
      android:background="@drawable/control_no_favorites_background">

    <LinearLayout
@@ -37,7 +36,7 @@
        android:layout_height="wrap_content"
        android:layout_gravity="center"
        android:orientation="horizontal"
        android:paddingBottom="8dp" />
        android:layout_marginBottom="16dp" />

    <TextView
        style="@style/TextAppearance.ControlSetup.Title"
+4 −0
Original line number Diff line number Diff line
@@ -1281,6 +1281,10 @@
    <dimen name="control_status_padding">3dp</dimen>
    <fraction name="controls_toggle_bg_intensity">5%</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-->
    <dimen name="controls_activity_view_top_offset">100dp</dimen>
+2 −2
Original line number Diff line number Diff line
@@ -765,11 +765,11 @@
    </style>

    <style name="TextAppearance.ControlSetup.Title">
        <item name="android:textSize">25sp</item>
        <item name="android:textSize">@dimen/controls_setup_title</item>
    </style>

    <style name="TextAppearance.ControlSetup.Subtitle">
        <item name="android:textSize">16sp</item>
        <item name="android:textSize">@dimen/controls_setup_subtitle</item>
    </style>

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