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

Commit ac12afbe authored by Dylan Phan's avatar Dylan Phan Committed by android-build-merger
Browse files

Merge "Fix digital widget drop shadows." into ub-deskclock-dazzle 

am: 9809e325

* commit '9809e325':
  Fix digital widget drop shadows.
parents 180434ed 9809e325

res/values-v23/styles.xml

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
        <item name="android:fontFamily">sans-serif-light</item>

        <item name="android:shadowRadius">@dimen/digital_widget_shadow_radius</item>

        <item name="android:shadowColor">@color/digital_widget_shadow_color</item>

        <item name="android:shadowDy">@dimen/digital_widget_shadow_dy</item>

    </style>



    <style name="widget_label" parent="label">
@@ -23,5 +24,6 @@ 
        <item name="android:letterSpacing">0.15</item>

        <item name="android:shadowRadius">@dimen/digital_widget_shadow_radius</item>

        <item name="android:shadowColor">@color/digital_widget_shadow_color</item>

        <item name="android:shadowDy">@dimen/digital_widget_shadow_dy</item>

    </style>

</resources>
 
 No newline at end of file

res/values/colors.xml

+1 −1
Original line number Diff line number Diff line
@@ -57,5 +57,5 @@ 
    <color name="notification_divider">#272727</color>



    <!-- shadowColor for digital widget text -->

    <color name="digital_widget_shadow_color">#B0000000</color>

    <color name="digital_widget_shadow_color">#DD000000</color>

</resources>

res/values/dimens.xml

+3 −2
Original line number Diff line number Diff line
@@ -178,8 +178,9 @@ 
    <dimen name="digital_widget_list_margin_top">20dp</dimen>

    <dimen name="digital_widget_city_margin_bottom">10dp</dimen>



    <!-- shadowRadius for digital widget text -->

    <item name="digital_widget_shadow_radius" format="float" type="dimen">2.0</item>

    <!-- shadow styles for digital widget text -->

    <item name="digital_widget_shadow_radius" format="float" type="dimen">2.75</item>

    <item name="digital_widget_shadow_dy" format="float" type="dimen">2.0</item>



    <!-- Bottom margin for the expand area -->

    <dimen name="collapse_expand_height">72dip</dimen>

res/values/styles.xml

+3 −0
Original line number Diff line number Diff line
@@ -174,6 +174,7 @@ 
        <item name="android:fontFamily">sans-serif-thin</item>

        <item name="android:shadowRadius">@dimen/digital_widget_shadow_radius</item>

        <item name="android:shadowColor">@color/digital_widget_shadow_color</item>

        <item name="android:shadowDy">@dimen/digital_widget_shadow_dy</item>

    </style>



    <style name="label">
@@ -188,6 +189,7 @@ 
        <item name="android:textSize">@dimen/widget_label_font_size</item>

        <item name="android:shadowRadius">@dimen/digital_widget_shadow_radius</item>

        <item name="android:shadowColor">@color/digital_widget_shadow_color</item>

        <item name="android:shadowDy">@dimen/digital_widget_shadow_dy</item>

    </style>



    <style name="header">
@@ -213,6 +215,7 @@ 
        <item name="android:textSize">@dimen/widget_big_font_size</item>

        <item name="android:shadowRadius">@dimen/digital_widget_shadow_radius</item>

        <item name="android:shadowColor">@color/digital_widget_shadow_color</item>

        <item name="android:shadowDy">@dimen/digital_widget_shadow_dy</item>

    </style>



    <style name="alarm_label">