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

Commit ae0f67ff authored by Georg Veichtlbauer's avatar Georg Veichtlbauer
Browse files

ExactCalculator: Use two-line display as standard, redo alt layouts 

Change-Id: I7ae18d6ccaf55687780aaed0ff78d17acd1b5cfc
parent ebec85fe

res/layout/activity_calculator_land.xml

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="0dip"

        android:layout_weight="1">

        android:layout_weight="100">



        <include layout="@layout/pad_advanced" />

        <include layout="@layout/pad_numeric" />

res/layout/activity_calculator_port.xml

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
        android:layout_width="match_parent"

        android:layout_height="0dip"

        android:orientation="vertical"

        android:layout_weight="250">

        android:layout_weight="225">



        <include layout="@layout/pad_operator_aux" />

res/values-w520dp-h500dp-land/dimens.xml→res/values-land/dimens.xml

+5 −5
Original line number Diff line number Diff line
@@ -17,18 +17,18 @@ 


<resources>

    <!-- Dimens for display formula. -->

    <dimen name="formula_padding_top">16dip</dimen>

    <dimen name="formula_padding_top">8dip</dimen>

    <dimen name="formula_padding_bottom">28dip</dimen>

    <dimen name="formula_padding_start">16dip</dimen>

    <dimen name="formula_padding_end">16dip</dimen>

    <dimen name="formula_min_textsize">42dip</dimen>

    <dimen name="formula_max_textsize">96dip</dimen>

    <dimen name="formula_max_textsize">56dip</dimen>

    <dimen name="formula_step_textsize">8dip</dimen>



    <!-- Dimens for display result. -->

    <dimen name="result_padding_top">16dip</dimen>

    <dimen name="result_padding_bottom">42dip</dimen>

    <dimen name="result_padding_top">8dip</dimen>

    <dimen name="result_padding_bottom">28dip</dimen>

    <dimen name="result_padding_start">16dip</dimen>

    <dimen name="result_padding_end">16dip</dimen>

    <dimen name="result_textsize">48dip</dimen>

    <dimen name="result_textsize">42dip</dimen>

</resources>
 
 No newline at end of file

res/values-w520dp-h500dp-land/layout.xml→res/values-land/layout.xml

+23 −23
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 


<resources>

    <item name="activity_calculator" type="layout">@layout/activity_calculator_land</item>

    <item name="display" type="layout">@layout/display_two_line</item>

    <item name="display" type="layout">@layout/display_one_line</item>

    <item name="pad_advanced" type="layout">@layout/pad_advanced_3x4</item>

    <item name="pad_operator" type="layout">@layout/pad_operator_two_col</item>

</resources>

res/values-w520dp-h500dp-land/styles.xml→res/values-land/styles.xml

+3 −3
Original line number Diff line number Diff line
@@ -44,8 +44,8 @@ 
    </style>



    <style name="PadLayoutStyle.Advanced">

        <item name="android:layout_weight">5</item>

        <item name="android:layout_width">0dip</item>

        <item name="android:layout_weight">150</item>

        <item name="android:paddingTop">8dip</item>

        <item name="android:paddingBottom">8dip</item>

        <item name="android:paddingStart">12dip</item>
@@ -54,7 +54,7 @@ 


    <style name="PadLayoutStyle.Numeric">

        <item name="android:layout_width">0dip</item>

        <item name="android:layout_weight">5</item>

        <item name="android:layout_weight">200</item>

        <item name="android:paddingTop">8dip</item>

        <item name="android:paddingBottom">8dip</item>

        <item name="android:paddingStart">12dip</item>
@@ -63,7 +63,7 @@ 


    <style name="PadLayoutStyle.Operator">

        <item name="android:layout_width">0dip</item>

        <item name="android:layout_weight">3</item>

        <item name="android:layout_weight">125</item>

        <item name="android:paddingTop">8dip</item>

        <item name="android:paddingBottom">8dip</item>

        <item name="android:paddingStart">12dip</item>