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

Commit 4de68a06 authored by Robyn Coultas's avatar Robyn Coultas
Browse files

Clock widget scaling and dimensions. 

BUG: 9519509
BUG: 9533414

Increased complexity of scaling calculation to improve result.
Check vertical scaling when height is small (as in landscape.)

Change-Id: Ieb9944b338574830ef1fba6bfe802086148f5751
parent 00dd263c

res/values-sw600dp-land/dimens.xml

+0 −4
Original line number Diff line number Diff line
@@ -54,8 +54,4 @@ 
    <dimen name="timer_button_extra_offset">0dip</dimen>



    <dimen name="glowpadview_margin_right">-64dip</dimen>



    <dimen name="min_digital_widget_resize_width">370dip</dimen>

    <dimen name="min_digital_widget_height">200dip</dimen>

    <dimen name="digital_widget_list_min_height">200dip</dimen>

</resources>

res/values-sw600dp/dimens.xml

+12 −8
Original line number Diff line number Diff line
@@ -36,9 +36,7 @@ 
    <dimen name="alarm_label_padding">64dip</dimen>



    <dimen name="big_font_size">220dp</dimen>

    <dimen name="widget_big_font_size">130dp</dimen>

    <dimen name="medium_font_size">100dp</dimen>

    <dimen name="widget_medium_font_size">70dp</dimen>

    <dimen name="label_font_size">18sp</dimen>

    <dimen name="body_font_size">24sp</dimen>
@@ -84,11 +82,17 @@ 


    <dimen name="glowpadview_margin_bottom">0dip</dimen>



    <dimen name="min_digital_widget_width">450dip</dimen>

    <dimen name="min_digital_widget_height">120dip</dimen>

    <dimen name="min_digital_widget_resize_width">450dip</dimen>

    <dimen name="min_digital_widget_resize_height">120dip</dimen>

    <dimen name="def_digital_widget_width">200dip</dimen>

    <dimen name="digital_widget_list_min_height">190dip</dimen>

    <!-- Digital Widget settings (keyguard|home_screen) -->

    <!-- Use larger fonts -->

    <dimen name="widget_big_font_size">130dp</dimen>

    <dimen name="widget_medium_font_size">52dp</dimen>

    <dimen name="widget_24_medium_font_size">65dp</dimen>

    <dimen name="min_digital_widget_width">335dp</dimen>

    <dimen name="min_digital_widget_height">207dp</dimen>

    <dimen name="min_digital_widget_resize_width">335dp</dimen>

    <dimen name="min_digital_widget_resize_height">207dp</dimen>

    <dimen name="digital_widget_list_min_scaled_height">263dp</dimen>

    <dimen name="digital_widget_list_min_fixed_height">15dp</dimen>

    <dimen name="digital_widget_list_margin_top">15dp</dimen>



</resources>

res/values-sw720dp-land/dimens.xml

+0 −2
Original line number Diff line number Diff line
@@ -22,7 +22,5 @@ 
    <dimen name="glowpadview_margin_right">48dip</dimen>



    <dimen name="alarm_alert_clock_padding_left">128dp</dimen>

    <dimen name="digital_widget_list_min_height">150dip</dimen>

    <dimen name="min_digital_widget_resize_width">370dip</dimen>



</resources>

res/values-sw720dp/dimens.xml

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2012 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->



<!-- These resources are around just to allow their values to be customized

     for different hardware and product builds. -->

<resources>

    <dimen name="digital_widget_list_min_height">100dip</dimen>

</resources>

res/values/dimens.xml

+18 −10
Original line number Diff line number Diff line
@@ -50,10 +50,8 @@ 
    <dimen name="circletimer_marker_size">16dip</dimen>



    <dimen name="big_font_size">120dp</dimen>

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

    <dimen name="small_font_size">48sp</dimen>

    <dimen name="medium_font_size">60dp</dimen>

    <dimen name="widget_medium_font_size">48dp</dimen>

    <dimen name="label_font_size">14sp</dimen>

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

    <dimen name="body_font_size">18sp</dimen>
@@ -150,13 +148,23 @@ 
    <dimen name="glowpadview_margin_bottom">-64dip</dimen>

    <dimen name="glowpadview_margin_right">0dip</dimen>



    <dimen name="min_digital_widget_width">160dip</dimen>

    <dimen name="min_digital_widget_height">70dip</dimen>

    <dimen name="min_digital_widget_resize_width">160dip</dimen>

    <dimen name="min_digital_widget_resize_height">70dip</dimen>

    <dimen name="def_digital_widget_width">160dip</dimen>

    <dimen name="def_digital_widget_height">130dip</dimen>

    <dimen name="digital_widget_list_min_height">70dip</dimen>

    <dimen name="digital_widget_list_margin_top">12dip</dimen>

    <!-- Digital Widget settings (keyguard|home_screen) -->

    <!-- Clock and world clock sizes -->

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

    <dimen name="widget_medium_font_size">32dp</dimen>

    <dimen name="widget_24_medium_font_size">40dp</dimen>

    <!-- width/height of layout/digital_widget_time -->

    <!-- height is sum of widget_big_font_size + label_font_size + margins -->

    <dimen name="min_digital_widget_width">206dp</dimen>

    <dimen name="min_digital_widget_height">129dp</dimen>

    <!-- same as min_digital_widget_{width,height} -->

    <dimen name="min_digital_widget_resize_width">206dp</dimen>

    <dimen name="min_digital_widget_resize_height">129dp</dimen>

    <!-- sum of scaled heights -->

    <dimen name="digital_widget_list_min_scaled_height">162dp</dimen>

    <!-- sum of fixed heights -->

    <dimen name="digital_widget_list_min_fixed_height">12dp</dimen>

    <!-- top margin for digital_appwidget_listview -->

    <dimen name="digital_widget_list_margin_top">12dp</dimen>



</resources>