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

Commit 9ab18ac8 authored by Ivan Baheux's avatar Ivan Baheux
Browse files

Merge branch '8609-a15-horizontal-operation-cut' into 'a15' 

fix:  let calculator overlap toolbar when horizontal

See merge request !38
parents 8011d9d5 9b1b21ed

res/layout/toolbar.xml

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/toolbar"

    android:layout_width="match_parent"

    android:layout_height="?attr/actionBarSize"

    android:layout_height="@dimen/toolbar_height"

    android:layout_gravity="top">



    <TextView

res/values-land/dimens.xml

+5 −2
Original line number Diff line number Diff line
@@ -4,9 +4,12 @@ 
     SPDX-License-Identifier: Apache-2.0

-->

<resources>

    <!-- Dimens for toolbar -->

    <dimen name="toolbar_height">40dip</dimen>

   

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

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

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

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

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

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

    <dimen name="formula_min_textsize">42dip</dimen>
@@ -15,7 +18,7 @@ 


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

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

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

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

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

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

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

res/values-land/ratios.xml

+2 −2
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ 
-->

<resources>

    <!-- layout_display_ratio + layout_pads_ratio = 1 -->

    <item type="dimen" format="float" name="layout_display_ratio">0.4</item>

    <item type="dimen" format="float" name="layout_pads_ratio">0.6</item>

    <item type="dimen" format="float" name="layout_display_ratio">0.45</item>

    <item type="dimen" format="float" name="layout_pads_ratio">0.55</item>



    <item type="dimen" format="float" name="layout_advanced_pad_ratio">0.33</item>

</resources>

res/values/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ 
     SPDX-License-Identifier: Apache-2.0

-->

<resources>

    <!-- Dimens for toolbar -->

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



    <dimen name="history_divider_padding">14dip</dimen>