diff options
| author | Mindy Pereira <mindyp@google.com> | 2011-10-10 10:44:40 -0700 |
|---|---|---|
| committer | Mindy Pereira <mindyp@google.com> | 2011-10-10 11:06:02 -0700 |
| commit | 540b2132169b6a5db605aa0eb07e96ce35a74ebc (patch) | |
| tree | 50680f69d361cdbd0a2d24c95e456d2e5421ba0c /res | |
| parent | 5169ab29580c8e3f625b14bf16792f42d63e8caa (diff) | |
| download | android_packages_apps_ExactCalculator-540b2132169b6a5db605aa0eb07e96ce35a74ebc.tar.gz android_packages_apps_ExactCalculator-540b2132169b6a5db605aa0eb07e96ce35a74ebc.tar.bz2 android_packages_apps_ExactCalculator-540b2132169b6a5db605aa0eb07e96ce35a74ebc.zip | |
Move delete button to main.
That way landscape and port work the same.
Fixes bug:5414350 digit erased in calculator
Change-Id: I0dc18fb789ee4ca3089f701123fffba65c1d33ca
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout-port/main.xml | 98 | ||||
| -rw-r--r-- | res/layout-port/simple_pad.xml | 41 |
2 files changed, 69 insertions, 70 deletions
diff --git a/res/layout-port/main.xml b/res/layout-port/main.xml index 929f18c..111a325 100644 --- a/res/layout-port/main.xml +++ b/res/layout-port/main.xml @@ -24,39 +24,79 @@ android:layout_height="match_parent" android:background="#ff000000"> - <LinearLayout + <LinearLayout + android:layout_width="match_parent" + android:layout_height="0dip" + android:layout_weight="3" + android:orientation="horizontal" + android:layout_gravity="center_vertical" + android:gravity="center_vertical"> + + <com.android.calculator2.CalculatorDisplay + android:id="@+id/display" + android:layout_width="0dip" + android:layout_height="match_parent" + android:layout_weight="1" + maxDigits="@integer/max_digits"> + + <com.android.calculator2.CalculatorEditText + style="@style/display_style" /> + <com.android.calculator2.CalculatorEditText + style="@style/display_style" /> + + </com.android.calculator2.CalculatorDisplay> + <ImageButton android:id="@+id/overflow_menu" + android:layout_width="48dip" + android:layout_height="match_parent" + android:src="@drawable/ic_menu_overflow" + android:background="@android:color/transparent" + android:layout_marginLeft="8dip" + android:visibility="gone"/> + </LinearLayout> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1.5" + > + + <View + android:background="@drawable/btn_function" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="3" + /> + + <FrameLayout + android:layout_width="0dp" + android:layout_weight="1" + android:layout_height="match_parent"> + <!-- marginRight has to be 0 to catch border-touch --> + <com.android.calculator2.ColorButton + android:id="@+id/clear" + android:text="@string/clear" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_marginRight="0dp" + android:textSize="15dp" + style="@style/button_style" + /> + <!-- marginRight has to be 0 to catch border-touch --> + <com.android.calculator2.ColorButton + android:id="@+id/del" + android:text="@string/del" android:layout_width="match_parent" - android:layout_height="0dip" - android:layout_weight="1" - android:orientation="horizontal" - android:layout_gravity="center_vertical" - android:gravity="center_vertical"> - - <com.android.calculator2.CalculatorDisplay - android:id="@+id/display" - android:layout_width="0dip" - android:layout_height="match_parent" - android:layout_weight="1" - maxDigits="@integer/max_digits"> - - <com.android.calculator2.CalculatorEditText - style="@style/display_style" /> - <com.android.calculator2.CalculatorEditText - style="@style/display_style" /> - - </com.android.calculator2.CalculatorDisplay> - <ImageButton android:id="@+id/overflow_menu" - android:layout_width="48dip" - android:layout_height="match_parent" - android:src="@drawable/ic_menu_overflow" - android:background="@android:color/transparent" - android:layout_marginLeft="8dip" - android:visibility="gone"/> - </LinearLayout> + android:layout_height="match_parent" + android:layout_marginRight="0dp" + android:textSize="15dp" + style="@style/button_style" + /> + </FrameLayout> + + </LinearLayout> <android.support.v4.view.ViewPager android:id="@+id/panelswitch" android:layout_width="match_parent" android:layout_height="0dp" - android:layout_weight="4" + android:layout_weight="10" /> </LinearLayout> diff --git a/res/layout-port/simple_pad.xml b/res/layout-port/simple_pad.xml index cc4443a..3041ebc 100644 --- a/res/layout-port/simple_pad.xml +++ b/res/layout-port/simple_pad.xml @@ -27,47 +27,6 @@ > <LinearLayout - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="2" - > - - <View - android:background="@drawable/btn_function" - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_weight="3" - /> - - <FrameLayout - android:layout_width="0dp" - android:layout_weight="1" - android:layout_height="match_parent"> - <!-- marginRight has to be 0 to catch border-touch --> - <com.android.calculator2.ColorButton - android:id="@+id/clear" - android:text="@string/clear" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_marginRight="0dp" - android:textSize="15dp" - style="@style/button_style" - /> - <!-- marginRight has to be 0 to catch border-touch --> - <com.android.calculator2.ColorButton - android:id="@+id/del" - android:text="@string/del" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_marginRight="0dp" - android:textSize="15dp" - style="@style/button_style" - /> - </FrameLayout> - - </LinearLayout> - - <LinearLayout android:layout_weight="3" android:layout_width="match_parent" android:layout_height="0dp"> |