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

Commit e2711cbb authored by Justin Klaassen's avatar Justin Klaassen
Browse files

Update advanced pad layout 

Bug: 7263319
Bug: 20841915

- Switch to using GridLayout instead of custom ViewGroup.
- Added '%' operator button (Note: evaluation support WIP).

Change-Id: I0d07f01fe4224c43e53c916b034362d906bea405
parent 4af8dbed

res/layout/display.xml

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
        android:layout_height="?android:attr/actionBarSize">



       <TextView

            android:id="@+id/deg_rad"

            android:id="@+id/mode"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:fontFamily="sans-serif-medium"

res/layout/pad_advanced.xml

+74 −37
Original line number Diff line number Diff line
@@ -15,122 +15,159 @@ 
  limitations under the License.

  -->



<com.android.calculator2.CalculatorPadLayout

<GridLayout

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

    android:id="@+id/pad_advanced"

    style="@style/PadLayoutStyle.Advanced"

    android:rowCount="5"

    android:columnCount="3"

    android:background="@color/pad_advanced_background_color">



    <Button

        android:id="@+id/fun_sin"

        style="@style/PadButtonStyle.Advanced"

        android:contentDescription="@string/desc_fun_sin"

        android:onClick="onButtonClick"

        android:text="@string/fun_sin" />

        android:id="@+id/toggle_inv"

        style="@style/PadButtonStyle.Advanced.Text"

        android:layout_row="0"

        android:layout_column="0"

        android:contentDescription="@string/desc_inv_off"

        android:text="@string/inv" />



    <Button

        android:id="@+id/fun_cos"

        android:id="@+id/toggle_mode"

        style="@style/PadButtonStyle.Advanced.Text"

        android:layout_row="0"

        android:layout_column="1"

        android:contentDescription="@string/desc_switch_deg"

        android:text="@string/mode_deg" />



    <Button

        android:id="@+id/op_pct"

        style="@style/PadButtonStyle.Advanced"

        android:contentDescription="@string/desc_fun_cos"

        android:onClick="onButtonClick"

        android:text="@string/fun_cos" />

        android:layout_row="0"

        android:layout_column="2"

        android:contentDescription="@string/desc_op_pct"

        android:text="@string/op_pct" />



    <Button

        android:id="@+id/fun_tan"

        android:id="@+id/fun_sin"

        style="@style/PadButtonStyle.Advanced"

        android:contentDescription="@string/desc_fun_tan"

        android:onClick="onButtonClick"

        android:text="@string/fun_tan" />

        android:layout_row="1"

        android:layout_column="0"

        android:contentDescription="@string/desc_fun_sin"

        android:text="@string/fun_sin" />



    <Button

        android:id="@+id/fun_arcsin"

        style="@style/PadButtonStyle.Advanced"

        android:layout_row="1"

        android:layout_column="0"

        android:contentDescription="@string/desc_fun_arcsin"

        android:onClick="onButtonClick"

        android:text="@string/fun_arcsin" />

        android:text="@string/fun_arcsin"

        android:visibility="gone" />



    <Button

        android:id="@+id/fun_cos"

        style="@style/PadButtonStyle.Advanced"

        android:layout_row="1"

        android:layout_column="1"

        android:contentDescription="@string/desc_fun_cos"

        android:text="@string/fun_cos" />



    <Button

        android:id="@+id/fun_arccos"

        style="@style/PadButtonStyle.Advanced"

        android:layout_row="1"

        android:layout_column="1"

        android:contentDescription="@string/desc_fun_arccos"

        android:onClick="onButtonClick"

        android:text="@string/fun_arccos" />

        android:text="@string/fun_arccos"

        android:visibility="gone" />



    <Button

        android:id="@+id/fun_tan"

        style="@style/PadButtonStyle.Advanced"

        android:layout_row="1"

        android:layout_column="2"

        android:contentDescription="@string/desc_fun_tan"

        android:text="@string/fun_tan" />



    <Button

        android:id="@+id/fun_arctan"

        style="@style/PadButtonStyle.Advanced"

        android:layout_row="1"

        android:layout_column="2"

        android:contentDescription="@string/desc_fun_arctan"

        android:onClick="onButtonClick"

        android:text="@string/fun_arctan" />

        android:text="@string/fun_arctan"

        android:visibility="gone" />



    <Button

        android:id="@+id/fun_ln"

        style="@style/PadButtonStyle.Advanced"

        android:layout_row="2"

        android:layout_column="0"

        android:contentDescription="@string/desc_fun_ln"

        android:onClick="onButtonClick"

        android:text="@string/fun_ln" />



    <Button

        android:id="@+id/fun_log"

        style="@style/PadButtonStyle.Advanced"

        android:layout_row="2"

        android:layout_column="1"

        android:contentDescription="@string/desc_fun_log"

        android:onClick="onButtonClick"

        android:text="@string/fun_log" />



    <Button

        android:id="@+id/op_fact"

        style="@style/PadButtonStyle.Advanced"

        android:layout_row="2"

        android:layout_column="2"

        android:contentDescription="@string/desc_op_fact"

        android:onClick="onButtonClick"

        android:text="@string/op_fact" />



    <Button

        android:id="@+id/const_pi"

        style="@style/PadButtonStyle.Advanced"

        android:layout_row="3"

        android:layout_column="0"

        android:contentDescription="@string/desc_const_pi"

        android:onClick="onButtonClick"

        android:text="@string/const_pi" />



    <Button

        android:id="@+id/const_e"

        style="@style/PadButtonStyle.Advanced"

        android:layout_row="3"

        android:layout_column="1"

        android:contentDescription="@string/desc_const_e"

        android:onClick="onButtonClick"

        android:text="@string/const_e" />



    <Button

        android:id="@+id/op_pow"

        style="@style/PadButtonStyle.Advanced"

        android:layout_row="3"

        android:layout_column="2"

        android:contentDescription="@string/desc_op_pow"

        android:onClick="onButtonClick"

        android:text="@string/op_pow" />



    <Button

        android:id="@+id/lparen"

        style="@style/PadButtonStyle.Advanced"

        android:layout_row="4"

        android:layout_column="0"

        android:contentDescription="@string/desc_lparen"

        android:onClick="onButtonClick"

        android:text="@string/lparen" />



    <Button

        android:id="@+id/rparen"

        style="@style/PadButtonStyle.Advanced"

        android:layout_row="4"

        android:layout_column="1"

        android:contentDescription="@string/desc_rparen"

        android:onClick="onButtonClick"

        android:text="@string/rparen" />



    <Button

        android:id="@+id/op_sqrt"

        style="@style/PadButtonStyle.Advanced"

        android:layout_row="4"

        android:layout_column="2"

        android:contentDescription="@string/desc_op_sqrt"

        android:onClick="onButtonClick"

        android:text="@string/op_sqrt" />



    <Button

        android:id="@+id/mode_deg_rad"

        style="@style/PadButtonStyle.Advanced"

        android:contentDescription="@string/desc_mode_rad"

        android:onClick="onButtonClick"

        android:textAllCaps="true" />



</com.android.calculator2.CalculatorPadLayout>
 
</GridLayout>

res/layout/pad_advanced_tablet_port.xml

+82 −45
Original line number Diff line number Diff line
@@ -15,122 +15,159 @@ 
  limitations under the License.

  -->



<com.android.calculator2.CalculatorPadLayout

<GridLayout

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

    android:id="@+id/pad_advanced"

    style="@style/PadLayoutStyle.Advanced"

    android:rowCount="3"

    android:columnCount="5"

    android:background="@color/pad_advanced_background_color">



    <Button

        android:id="@+id/toggle_inv"

        style="@style/PadButtonStyle.Advanced.Text"

        android:layout_row="0"

        android:layout_column="0"

        android:contentDescription="@string/desc_inv_off"

        android:text="@string/inv" />



    <Button

        android:id="@+id/toggle_mode"

        style="@style/PadButtonStyle.Advanced.Text"

        android:layout_row="0"

        android:layout_column="1"

        android:contentDescription="@string/desc_switch_deg"

        android:text="@string/mode_deg" />



    <Button

        android:id="@+id/fun_sin"

        style="@style/PadButtonStyle.Advanced"

        android:layout_row="0"

        android:layout_column="2"

        android:contentDescription="@string/desc_fun_sin"

        android:onClick="onButtonClick"

        android:text="@string/fun_sin" />



    <Button

        android:id="@+id/fun_arcsin"

        style="@style/PadButtonStyle.Advanced"

        android:layout_row="0"

        android:layout_column="2"

        android:contentDescription="@string/desc_fun_arcsin"

        android:text="@string/fun_arcsin"

        android:visibility="gone" />



    <Button

        android:id="@+id/fun_cos"

        style="@style/PadButtonStyle.Advanced"

        android:layout_row="0"

        android:layout_column="3"

        android:contentDescription="@string/desc_fun_cos"

        android:onClick="onButtonClick"

        android:text="@string/fun_cos" />



    <Button

        android:id="@+id/fun_arccos"

        style="@style/PadButtonStyle.Advanced"

        android:layout_row="0"

        android:layout_column="3"

        android:contentDescription="@string/desc_fun_arccos"

        android:text="@string/fun_arccos"

        android:visibility="gone" />



    <Button

        android:id="@+id/fun_tan"

        style="@style/PadButtonStyle.Advanced"

        android:layout_row="0"

        android:layout_column="4"

        android:contentDescription="@string/desc_fun_tan"

        android:onClick="onButtonClick"

        android:text="@string/fun_tan" />



    <Button

        android:id="@+id/fun_arctan"

        style="@style/PadButtonStyle.Advanced"

        android:layout_row="0"

        android:layout_column="4"

        android:contentDescription="@string/desc_fun_arctan"

        android:text="@string/fun_arctan"

        android:visibility="gone" />



    <Button

        android:id="@+id/op_pct"

        style="@style/PadButtonStyle.Advanced"

        android:layout_row="1"

        android:layout_column="0"

        android:contentDescription="@string/desc_op_pct"

        android:text="@string/op_pct" />



    <Button

        android:id="@+id/fun_ln"

        style="@style/PadButtonStyle.Advanced"

        android:layout_row="1"

        android:layout_column="1"

        android:contentDescription="@string/desc_fun_ln"

        android:onClick="onButtonClick"

        android:text="@string/fun_ln" />



    <Button

        android:id="@+id/fun_log"

        style="@style/PadButtonStyle.Advanced"

        android:layout_row="1"

        android:layout_column="2"

        android:contentDescription="@string/desc_fun_log"

        android:onClick="onButtonClick"

        android:text="@string/fun_log" />



    <Button

        android:id="@+id/op_fact"

        style="@style/PadButtonStyle.Advanced"

        android:layout_row="1"

        android:layout_column="3"

        android:contentDescription="@string/desc_op_fact"

        android:onClick="onButtonClick"

        android:text="@string/op_fact" />



    <Button

        android:id="@+id/fun_arcsin"

        style="@style/PadButtonStyle.Advanced"

        android:contentDescription="@string/desc_fun_arcsin"

        android:onClick="onButtonClick"

        android:text="@string/fun_arcsin" />



    <Button

        android:id="@+id/fun_arccos"

        style="@style/PadButtonStyle.Advanced"

        android:contentDescription="@string/desc_fun_arccos"

        android:onClick="onButtonClick"

        android:text="@string/fun_arccos" />



    <Button

        android:id="@+id/fun_arctan"

        android:id="@+id/op_pow"

        style="@style/PadButtonStyle.Advanced"

        android:contentDescription="@string/desc_fun_arctan"

        android:onClick="onButtonClick"

        android:text="@string/fun_arctan" />

        android:layout_row="1"

        android:layout_column="4"

        android:contentDescription="@string/desc_op_pow"

        android:text="@string/op_pow" />



    <Button

        android:id="@+id/const_pi"

        style="@style/PadButtonStyle.Advanced"

        android:layout_row="2"

        android:layout_column="0"

        android:contentDescription="@string/desc_const_pi"

        android:onClick="onButtonClick"

        android:text="@string/const_pi" />



    <Button

        android:id="@+id/const_e"

        style="@style/PadButtonStyle.Advanced"

        android:layout_row="2"

        android:layout_column="1"

        android:contentDescription="@string/desc_const_e"

        android:onClick="onButtonClick"

        android:text="@string/const_e" />



    <Button

        android:id="@+id/op_pow"

        style="@style/PadButtonStyle.Advanced"

        android:contentDescription="@string/desc_op_pow"

        android:onClick="onButtonClick"

        android:text="@string/op_pow" />



    <Button

        android:id="@+id/lparen"

        style="@style/PadButtonStyle.Advanced"

        android:layout_row="2"

        android:layout_column="2"

        android:contentDescription="@string/desc_lparen"

        android:onClick="onButtonClick"

        android:text="@string/lparen" />



    <Button

        android:id="@+id/rparen"

        style="@style/PadButtonStyle.Advanced"

        android:layout_row="2"

        android:layout_column="3"

        android:contentDescription="@string/desc_rparen"

        android:onClick="onButtonClick"

        android:text="@string/rparen" />



    <Button

        android:id="@+id/op_sqrt"

        style="@style/PadButtonStyle.Advanced"

        android:layout_row="2"

        android:layout_column="4"

        android:contentDescription="@string/desc_op_sqrt"

        android:onClick="onButtonClick"

        android:text="@string/op_sqrt" />



    <Button

        android:id="@+id/mode_deg_rad"

        style="@style/PadButtonStyle.Advanced"

        android:contentDescription="@string/desc_mode_rad"

        android:onClick="onButtonClick"

        android:textAllCaps="true" />



</com.android.calculator2.CalculatorPadLayout>
 
</GridLayout>

res/layout/pad_numeric.xml

+28 −16
Original line number Diff line number Diff line
@@ -15,85 +15,97 @@ 
  limitations under the License.

  -->



<com.android.calculator2.CalculatorPadLayout

<GridLayout

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

    android:id="@+id/pad_numeric"

    style="@style/PadLayoutStyle.Numeric"

    android:background="@color/pad_numeric_background_color"

    android:rowCount="4"

    android:columnCount="3"

    android:rowCount="4">

    android:background="@color/pad_numeric_background_color">



    <Button

        android:id="@+id/digit_7"

        style="@style/PadButtonStyle.Numeric"

        android:onClick="onButtonClick"

        android:layout_row="0"

        android:layout_column="0"

        android:text="@string/digit_7" />



    <Button

        android:id="@+id/digit_8"

        style="@style/PadButtonStyle.Numeric"

        android:onClick="onButtonClick"

        android:layout_row="0"

        android:layout_column="1"

        android:text="@string/digit_8" />



    <Button

        android:id="@+id/digit_9"

        style="@style/PadButtonStyle.Numeric"

        android:onClick="onButtonClick"

        android:layout_row="0"

        android:layout_column="2"

        android:text="@string/digit_9" />



    <Button

        android:id="@+id/digit_4"

        style="@style/PadButtonStyle.Numeric"

        android:onClick="onButtonClick"

        android:layout_row="1"

        android:layout_column="0"

        android:text="@string/digit_4" />



    <Button

        android:id="@+id/digit_5"

        style="@style/PadButtonStyle.Numeric"

        android:onClick="onButtonClick"

        android:layout_row="1"

        android:layout_column="1"

        android:text="@string/digit_5" />



    <Button

        android:id="@+id/digit_6"

        style="@style/PadButtonStyle.Numeric"

        android:onClick="onButtonClick"

        android:layout_row="1"

        android:layout_column="2"

        android:text="@string/digit_6" />



    <Button

        android:id="@+id/digit_1"

        style="@style/PadButtonStyle.Numeric"

        android:onClick="onButtonClick"

        android:layout_row="2"

        android:layout_column="0"

        android:text="@string/digit_1" />



    <Button

        android:id="@+id/digit_2"

        style="@style/PadButtonStyle.Numeric"

        android:onClick="onButtonClick"

        android:layout_row="2"

        android:layout_column="1"

        android:text="@string/digit_2" />



    <Button

        android:id="@+id/digit_3"

        style="@style/PadButtonStyle.Numeric"

        android:onClick="onButtonClick"

        android:layout_row="2"

        android:layout_column="2"

        android:text="@string/digit_3" />



    <Button

        android:id="@+id/dec_point"

        style="@style/PadButtonStyle.Numeric"

        android:onClick="onButtonClick"

        android:layout_row="3"

        android:layout_column="0"

        android:text="@string/dec_point" />



    <Button

        android:id="@+id/digit_0"

        style="@style/PadButtonStyle.Numeric"

        android:onClick="onButtonClick"

        android:layout_row="3"

        android:layout_column="1"

        android:text="@string/digit_0" />



    <Button

        android:id="@+id/eq"

        style="@style/PadButtonStyle.Numeric.Equals"

        android:layout_row="3"

        android:layout_column="2"

        android:contentDescription="@string/desc_eq"

        android:onClick="onButtonClick"

        android:text="@string/eq" />



</com.android.calculator2.CalculatorPadLayout>
 
</GridLayout>

res/layout/pad_operator_one_col.xml

+17 −10
Original line number Diff line number Diff line
@@ -15,55 +15,62 @@ 
  limitations under the License.

  -->



<com.android.calculator2.CalculatorPadLayout

<GridLayout

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

    android:id="@+id/pad_operator"

    style="@style/PadLayoutStyle.Operator"

    android:background="@color/pad_operator_background_color"

    android:rowCount="5"

    android:columnCount="1"

    android:rowCount="5">

    android:background="@color/pad_operator_background_color">



    <Button

        android:id="@+id/del"

        style="@style/PadButtonStyle.Operator.Text"

        android:layout_row="0"

        android:layout_column="0"

        android:contentDescription="@string/desc_del"

        android:onClick="onButtonClick"

        android:text="@string/del" />



    <Button

        android:id="@+id/clr"

        style="@style/PadButtonStyle.Operator.Text"

        android:layout_row="0"

        android:layout_column="0"

        android:contentDescription="@string/desc_clr"

        android:onClick="onButtonClick"

        android:text="@string/clr"

        android:visibility="gone" />





    <Button

        android:id="@+id/op_div"

        style="@style/PadButtonStyle.Operator"

        android:layout_row="1"

        android:layout_column="0"

        android:contentDescription="@string/desc_op_div"

        android:onClick="onButtonClick"

        android:text="@string/op_div" />



    <Button

        android:id="@+id/op_mul"

        style="@style/PadButtonStyle.Operator"

        android:layout_row="2"

        android:layout_column="0"

        android:contentDescription="@string/desc_op_mul"

        android:onClick="onButtonClick"

        android:text="@string/op_mul" />



    <Button

        android:id="@+id/op_sub"

        style="@style/PadButtonStyle.Operator"

        android:layout_row="3"

        android:layout_column="0"

        android:contentDescription="@string/desc_op_sub"

        android:onClick="onButtonClick"

        android:text="@string/op_sub" />



    <Button

        android:id="@+id/op_add"

        style="@style/PadButtonStyle.Operator"

        android:layout_row="4"

        android:layout_column="0"

        android:contentDescription="@string/desc_op_add"

        android:onClick="onButtonClick"

        android:text="@string/op_add" />



</com.android.calculator2.CalculatorPadLayout>
 
</GridLayout>