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

Commit fdca862c authored by Lucas Silva's avatar Lucas Silva Committed by Automerger Merge Worker
Browse files

Merge "Update clock complication to match mocks." into tm-qpr-dev am: bc18e296 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19631979



Change-Id: Ib4156c0efbb7cbd80c8f1406c6aee4fd6272de95
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5228968a bc18e296

packages/SystemUI/res/layout/dream_overlay_complication_clock_time.xml

+2 −1
Original line number Diff line number Diff line
@@ -20,10 +20,11 @@ 
    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:fontFamily="@font/clock"

    android:includeFontPadding="false"

    android:textColor="@android:color/white"

    android:format12Hour="@string/dream_time_complication_12_hr_time_format"

    android:format24Hour="@string/dream_time_complication_24_hr_time_format"

    android:shadowColor="@color/keyguard_shadow_color"

    android:shadowRadius="?attr/shadowRadius"

    android:fontFeatureSettings="pnum, lnum"

    android:letterSpacing="0.02"

    android:textSize="@dimen/dream_overlay_complication_clock_time_text_size"/>

packages/SystemUI/res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -1459,7 +1459,7 @@ 
    <dimen name="dream_overlay_status_bar_extra_margin">16dp</dimen>



    <!-- Dream overlay complications related dimensions -->

    <dimen name="dream_overlay_complication_clock_time_text_size">100sp</dimen>

    <dimen name="dream_overlay_complication_clock_time_text_size">86sp</dimen>

    <dimen name="dream_overlay_complication_clock_subtitle_text_size">24sp</dimen>

    <dimen name="dream_overlay_complication_preview_text_size">36sp</dimen>

    <dimen name="dream_overlay_complication_preview_icon_padding">28dp</dimen>

packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/DreamClockTimeComplicationModule.java

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ import dagger.Provides; 
public interface DreamClockTimeComplicationModule {

    String DREAM_CLOCK_TIME_COMPLICATION_VIEW = "clock_time_complication_view";

    String TAG_WEIGHT = "'wght' ";

    int WEIGHT = 200;

    int WEIGHT = 400;



    /**

     * Provides the complication view.