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

Commit f55b7f2f authored by John Spurlock's avatar John Spurlock
Browse files

Zen: Add new user introduction msg for "Priority only".

Bug: 19260237
Change-Id: I3b5785befc05685c7f676e918710fb7500221172
parent cbcf902a
Loading
Loading
Loading
Loading
+0 −2
Original line number Diff line number Diff line
@@ -41,8 +41,6 @@
        android:layout_height="wrap_content"
        android:orientation="vertical"
        android:paddingBottom="4dp"
        android:paddingEnd="4dp"
        android:paddingStart="4dp"
        android:paddingTop="6dp" >

        <!-- volume rows added and removed here! :-) -->
+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:paddingStart="4dp"
    android:paddingEnd="4dp"
    android:clipChildren="false" >

    <TextView
+7 −2
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@
        android:id="@+id/volume_zen_switch_bar"
        android:layout_width="match_parent"
        android:layout_height="@dimen/volume_button_size"
        android:layout_marginStart="4dp"
        android:layout_marginEnd="4dp"
        android:clickable="true"
        android:orientation="horizontal" >

@@ -49,6 +51,7 @@
            android:layout_width="wrap_content"
            android:layout_height="fill_parent"
            android:layout_marginEnd="11dp" />

    </LinearLayout>

    <RelativeLayout
@@ -56,8 +59,8 @@
        android:layout_width="match_parent"
        android:layout_height="@dimen/volume_button_size"
        android:layout_marginStart="@dimen/volume_button_size"
        android:paddingEnd="3dp"
        android:paddingStart="3dp" >
        android:paddingEnd="7dp"
        android:paddingStart="7dp" >

        <TextView
            android:id="@+id/volume_zen_panel_summary_line_1"
@@ -79,6 +82,8 @@
        android:id="@+id/volume_zen_mode_panel_buttons"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_marginStart="4dp"
        android:layout_marginEnd="4dp"
        android:gravity="end" >

        <TextView
+52 −4
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@
    android:id="@+id/zen_mode_panel"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:layout_marginStart="35dp"
    android:clipChildren="false"
    android:orientation="vertical" >

@@ -28,6 +27,7 @@
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:minHeight="8dp"
        android:layout_marginStart="39dp"
        android:elevation="4dp"
        android:background="@drawable/qs_background_secondary" >

@@ -46,15 +46,13 @@
        android:layout_width="match_parent"
        android:layout_height="1dp"
        android:visibility="gone"
        android:layout_marginStart="@dimen/qs_panel_padding"
        android:layout_marginEnd="@dimen/qs_panel_padding"
        android:layout_marginBottom="@dimen/qs_panel_padding"
        android:background="#4dffffff" />

    <RelativeLayout
        android:id="@+id/zen_subhead"
        android:layout_width="match_parent"
        android:layout_height="62dp"
        android:layout_marginStart="39dp"
        android:gravity="center_vertical"
        android:paddingLeft="8dp"
        android:paddingRight="8dp" >
@@ -98,10 +96,60 @@

    </RelativeLayout>

    <RelativeLayout
        android:id="@+id/zen_introduction"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:paddingEnd="4dp"
        android:paddingTop="8dp"
        android:paddingBottom="8dp"
        android:background="@color/zen_introduction_message_background" >

        <ImageView
            android:id="@+id/zen_introduction_confirm"
            android:layout_width="48dp"
            android:layout_height="48dp"
            android:layout_alignParentEnd="true"
            android:background="@drawable/btn_borderless_rect"
            android:clickable="true"
            android:contentDescription="@string/accessibility_desc_confirm"
            android:scaleType="center"
            android:src="@drawable/ic_close"
            android:tint="@android:color/white" />

        <TextView
            android:id="@+id/zen_introduction_message"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_marginTop="12dp"
            android:layout_marginStart="55dp"
            android:lineSpacingMultiplier="1.20029"
            android:layout_toStartOf="@id/zen_introduction_confirm"
            android:text="@string/zen_priority_introduction"
            android:textAppearance="@style/TextAppearance.QS.VolumeSuppressor" />

        <TextView
            android:id="@+id/zen_introduction_customize"
            style="@style/QSBorderlessButton"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_alignParentEnd="true"
            android:layout_marginEnd="4dp"
            android:layout_below="@id/zen_introduction_message"
            android:clickable="true"
            android:focusable="true"
            android:text="@string/zen_priority_customize_button"
            android:textAppearance="@style/TextAppearance.QS.DetailButton.White" />

    </RelativeLayout>

    <LinearLayout
        android:id="@+id/zen_conditions"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_marginTop="8dp"
        android:layout_marginEnd="4dp"
        android:layout_marginStart="39dp"
        android:orientation="vertical"
        android:paddingBottom="@dimen/zen_mode_condition_detail_bottom_padding" />

+3 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@
    <color name="qs_subhead">#99FFFFFF</color><!-- 60% white -->
    <color name="qs_detail_empty">#24B0BEC5</color><!-- 14% blue grey 200 -->
    <color name="qs_detail_button">#FFB0BEC5</color><!-- 100% blue grey 200 -->
    <color name="qs_detail_button_white">#B3FFFFFF</color><!-- 70% white -->
    <color name="qs_detail_transition">#66FFFFFF</color>
    <color name="qs_detail_progress_track">#99009688</color><!-- 60% deep teal 500 -->
    <color name="data_usage_secondary">#99FFFFFF</color><!-- 60% white -->
@@ -137,4 +138,6 @@
    <color name="light_mode_icon_color_single_tone">#ffffff</color>
    <color name="light_mode_icon_color_dual_tone_background">#4dffffff</color>
    <color name="light_mode_icon_color_dual_tone_fill">#ffffff</color>

    <color name="zen_introduction_message_background">#ff009688</color><!-- deep teal 500 -->
</resources>
Loading