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

Commit bd90b794 authored by Christine Franks's avatar Christine Franks
Browse files

Fix decimal point internationalization 

Bug: 32874470
Test: manual - verfied in US English, Brazilian Portuguese, Mexican
Spanish, Canadian French, and Farsi.

Change-Id: Ie7a4e2970de3290423796a6690cc0c89f457dbc9
parent 450de8a9

res/layout/pad_numeric.xml

+0 −1
Original line number Diff line number Diff line
@@ -91,7 +91,6 @@ 
        android:id="@+id/dec_point"

        style="@style/PadButtonStyle.Numeric"

        android:contentDescription="@string/desc_dec_point"

        android:text="@string/dec_point"

        app:layout_row="3"

        app:layout_column="0" />

src/com/android/calculator2/Calculator.java

+14 −1
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ import java.io.ObjectInput; 
import java.io.ObjectInputStream;

import java.io.ObjectOutput;

import java.io.ObjectOutputStream;

import java.text.DecimalFormatSymbols;



import static com.android.calculator2.CalculatorFormula.OnFormulaContextMenuClickListener;
@@ -323,10 +324,13 @@ public class Calculator extends Activity 
        mPadViewPager = (ViewPager) findViewById(R.id.pad_pager);

        mDeleteButton = findViewById(R.id.del);

        mClearButton = findViewById(R.id.clr);

        mEqualButton = findViewById(R.id.pad_numeric).findViewById(R.id.eq);

        final View numberPad = findViewById(R.id.pad_numeric);

        mEqualButton = numberPad.findViewById(R.id.eq);

        if (mEqualButton == null || mEqualButton.getVisibility() != View.VISIBLE) {

            mEqualButton = findViewById(R.id.pad_operator).findViewById(R.id.eq);

        }

        final TextView decimalPointButton = (TextView) numberPad.findViewById(R.id.dec_point);

        decimalPointButton.setText(getDecimalSeparator());



        mInverseToggle = (TextView) findViewById(R.id.toggle_inv);

        mModeToggle = (TextView) findViewById(R.id.toggle_mode);
@@ -1351,6 +1355,15 @@ public class Calculator extends Activity 
        return mHitRect.contains((int) event.getX(), (int) event.getY());

    }



    /**

     * Since we only support LTR format, using the RTL comma does not make sense.

     */

    private String getDecimalSeparator() {

        final char defaultSeparator = DecimalFormatSymbols.getInstance().getDecimalSeparator();

        final char rtlComma = '\u066b';

        return defaultSeparator == rtlComma ? "," : String.valueOf(defaultSeparator);

    }



    /**

     * Clean up animation for context menu.

     */