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

Commit 67de52cd authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

Merge "Bigger clock." into lmp-preview-dev

parents c5115556 220bf5cf
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@
            android:layout_height="wrap_content"
            android:layout_marginTop="@dimen/date_owner_info_margin"
            android:layout_gravity="center_horizontal"
            android:textColor="#99ffffff"
            android:textColor="#ccffffff"
            android:textSize="@dimen/widget_label_font_size"
            android:ellipsize="marquee"
            android:singleLine="true" />
+2 −5
Original line number Diff line number Diff line
@@ -63,14 +63,11 @@
    <dimen name="keyguard_muliuser_selector_margin">12dp</dimen>

    <!-- Overload default clock widget parameters -->
    <dimen name="widget_big_font_size">96dp</dimen>
    <dimen name="widget_big_font_size">120dp</dimen>
    <dimen name="widget_label_font_size">16sp</dimen>
    <dimen name="bottom_text_spacing_digital">-8dp</dimen>
    <dimen name="bottom_text_spacing_digital">-16dp</dimen>

    <!-- EmergencyCarrierArea overlap - amount to overlap the emergency button and carrier text.
         Should be 0 on devices with plenty of room (e.g. tablets) -->
    <dimen name="eca_overlap">0dip</dimen>

    <!-- The vertical margin between the date and the owner info. -->
    <dimen name="date_owner_info_margin">4dp</dimen>
</resources>
+4 −4
Original line number Diff line number Diff line
@@ -155,15 +155,15 @@
    <dimen name="eca_overlap">-10dip</dimen>

    <!-- Default clock parameters -->
    <dimen name="bottom_text_spacing_digital">-6dp</dimen>
    <dimen name="bottom_text_spacing_digital">-10dp</dimen>
    <dimen name="label_font_size">14dp</dimen>
    <dimen name="widget_label_font_size">14sp</dimen>
    <dimen name="widget_big_font_size">68dp</dimen>
    <dimen name="widget_label_font_size">16sp</dimen>
    <dimen name="widget_big_font_size">96dp</dimen>
    <dimen name="big_font_size">120dp</dimen>

    <!-- The y translation to apply at the start in appear animations. -->
    <dimen name="appear_y_translation_start">32dp</dimen>

    <!-- The vertical margin between the date and the owner info. -->
    <dimen name="date_owner_info_margin">2dp</dimen>
    <dimen name="date_owner_info_margin">10dp</dimen>
</resources>
+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <!-- Skeleton string format for displaying the date. -->
    <string name="abbrev_wday_month_day_no_year">EEEMMMMd</string>
    <string name="abbrev_wday_month_day_no_year">EEEEMMMMd</string>

    <!-- Skeleton string format for displaying the time in 12-hour format. -->
    <string name="clock_12hr_format">hm</string>
+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@
        android:id="@+id/keyguard_indication_text"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_marginBottom="100dp"
        android:layout_marginBottom="70dp"
        android:layout_gravity="bottom|center_horizontal"
        android:textStyle="italic"
        android:textColor="#ffffff"
Loading