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

Commit 08e8f322 authored by Hans Boehm's avatar Hans Boehm
Browse files

Restructure display formatting, use TextView for formula. 

This fixes issues with inappropriate keyboard popups and cleans
up the code.

This substantially rewrites the result formatting code;
it intentionally removes a heuristic to avoid conventional scientific
notation for short results, which only seemed to confuse things.
There are some other tweaks and simplifications.  Transitions
to and from conventional scientific notation should be smoother,
though there is still an issue with numbers like 10^-30.
The formatting code is completely extracted from Evaluator, cutting
off various tentacles, and moved to CalculatorResult.

Fixes a bug that resulted in digits being inappropriately
displayed without an exponent if the decimal point was just off
the left edge of the screen.

It's still not clear that we should always be integrating the
exponent into the result window.

Bug: 20483801
Bug: 20480081

Change-Id: I1bb777b871e9fa8b6cd510c533e4b94bde6d4a20
parent 9e855e82

res/layout/display.xml

+4 −3
Original line number Diff line number Diff line
@@ -38,15 +38,16 @@ 


    </Toolbar>



    <com.android.calculator2.CalculatorEditText

    <com.android.calculator2.CalculatorText

        android:id="@+id/formula"

        style="@style/DisplayEditTextStyle.Formula"

        style="@style/DisplayTextStyle.Formula"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_below="@id/toolbar"

        android:inputType="none"

        android:ellipsize="none"

        android:longClickable="true"

        android:singleLine="true"

        android:scrollHorizontally="true"

        android:textColor="@color/display_formula_text_color"

        android:textIsSelectable="false" />

res/values-land/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
<!-- Styles for landscape phone (e.g. Nexus 4/5). -->

<resources xmlns:android="http://schemas.android.com/apk/res/android">



    <style name="DisplayEditTextStyle.Formula">

    <style name="DisplayTextStyle.Formula">

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

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

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

res/values-port/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
<!-- Styles for portrait phone (e.g. Nexus 4/5). -->

<resources xmlns:android="http://schemas.android.com/apk/res/android">



    <style name="DisplayEditTextStyle.Formula">

    <style name="DisplayTextStyle.Formula">

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

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

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

res/values-sw600dp-land/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
<!-- Styles for landscape 600dip-wide tablet (e.g. Nexus 7). -->

<resources xmlns:android="http://schemas.android.com/apk/res/android">



    <style name="DisplayEditTextStyle.Formula">

    <style name="DisplayTextStyle.Formula">

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

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

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

res/values-sw600dp-port/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
<!-- Styles for portrait 600dip-wide tablet (e.g. Nexus 7). -->

<resources xmlns:android="http://schemas.android.com/apk/res/android">



    <style name="DisplayEditTextStyle.Formula">

    <style name="DisplayTextStyle.Formula">

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

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

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