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

Commit 6703f8e6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Notification shade expansion animation"

parents 2899a0ed d285cf0d
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@
    <TextView android:id="@+id/title"
              android:layout_width="match_parent"
              android:layout_height="wrap_content"
              android:layout_marginBottom="@dimen/widget_vertical_padding"
              android:layout_marginBottom="7dp"
              android:paddingStart="64dp"
              android:paddingEnd="64dp"
              android:theme="@style/TextAppearance.Keyguard"
+5 −4
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@
                android:layout_gravity="center_horizontal"
                android:layout_centerHorizontal="true"
                android:layout_alignParentTop="true"
                android:letterSpacing="0.04"
                android:textColor="?attr/wallpaperTextColor"
                android:singleLine="true"
                style="@style/widget_big_thin"
@@ -52,16 +53,16 @@
                android:layout_marginBottom="@dimen/bottom_text_spacing_digital" />
            <View
                android:id="@+id/clock_separator"
                android:layout_width="16dp"
                android:layout_height="1dp"
                android:layout_marginTop="10dp"
                android:layout_width="@dimen/widget_separator_width"
                android:layout_height="@dimen/widget_separator_thickness"
                android:layout_marginTop="22dp"
                android:layout_below="@id/clock_view"
                android:background="#f00"
                android:layout_centerHorizontal="true" />

            <include layout="@layout/keyguard_status_area"
                android:id="@+id/keyguard_status_area"
                android:layout_marginTop="10dp"
                android:layout_marginTop="20dp"
                android:layout_marginBottom="@dimen/widget_vertical_padding"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+7 −3
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@
    <dimen name="eca_overlap">-10dip</dimen>

    <!-- Default clock parameters -->
    <dimen name="bottom_text_spacing_digital">-10dp</dimen>
    <dimen name="bottom_text_spacing_digital">-24dp</dimen>
    <!-- Slice header -->
    <dimen name="widget_title_font_size">28sp</dimen>
    <!-- Slice subtitle  -->
@@ -52,12 +52,16 @@
    <!-- Clock with header -->
    <dimen name="widget_small_font_size">22dp</dimen>
    <!-- Dash between clock and header -->
    <dimen name="widget_vertical_padding">16dp</dimen>
    <dimen name="widget_separator_width">16dp</dimen>
    <dimen name="widget_separator_thickness">1dp</dimen>
    <dimen name="widget_vertical_padding">26dp</dimen>
    <dimen name="widget_icon_bottom_padding">14dp</dimen>
    <!-- Subtitle paddings -->
    <dimen name="widget_separator_thickness">2dp</dimen>
    <dimen name="widget_horizontal_padding">8dp</dimen>
    <dimen name="widget_icon_size">16dp</dimen>
    <dimen name="widget_icon_padding">8dp</dimen>
    <!-- Dash between notification shelf and date/alarm -->
    <dimen name="widget_bottom_separator_padding">29dp</dimen>

    <!-- The y translation to apply at the start in appear animations. -->
    <dimen name="appear_y_translation_start">32dp</dimen>
+1 −2
Original line number Diff line number Diff line
@@ -15,8 +15,7 @@
  -->

<resources>
    <dimen name="keyguard_clock_notifications_margin_min">32dp</dimen>
    <dimen name="keyguard_clock_notifications_margin_max">36dp</dimen>
    <dimen name="keyguard_clock_notifications_margin">32dp</dimen>

    <fraction name="keyguard_clock_y_fraction_max">32.5%</fraction>
    <fraction name="keyguard_clock_y_fraction_min">18.5%</fraction>
+1 −2
Original line number Diff line number Diff line
@@ -19,8 +19,7 @@
    <fraction name="keyguard_clock_y_fraction_max">37%</fraction>
    <fraction name="keyguard_clock_y_fraction_min">20%</fraction>

    <dimen name="keyguard_clock_notifications_margin_min">36dp</dimen>
    <dimen name="keyguard_clock_notifications_margin_max">36dp</dimen>
    <dimen name="keyguard_clock_notifications_margin">36dp</dimen>

    <dimen name="keyguard_indication_margin_bottom">80dp</dimen>

Loading