From 365083a83f88d75e8637403e781be4bbc2c7ea67 Mon Sep 17 00:00:00 2001
From: Michael Chan <mchan@android.com>
Date: Thu, 26 May 2011 13:26:47 -0700
Subject: 7in fixes for Calculator

1) Fix spacing
2) Hide ime

The change is smaller than it looks.
Some padding were pulled out to the styles.xml.

Bug:4478389
Bug:4082260

Change-Id: I98440dc73157dfe30f60ac328c1244fa65723e80
---
 res/drawable-sw600dp-hdpi/calc_clear_symbol.png    | Bin 0 -> 1970 bytes
 .../calculator_input_field.9.png                   | Bin 0 -> 1365 bytes
 res/drawable-sw600dp-mdpi/calc_clear_symbol.png    | Bin 0 -> 1693 bytes
 .../calculator_input_field.9.png                   | Bin 0 -> 1262 bytes
 res/drawable-xlarge-hdpi/calc_clear_symbol.png     | Bin 1970 -> 0 bytes
 .../calculator_input_field.9.png                   | Bin 1365 -> 0 bytes
 res/drawable-xlarge-mdpi/calc_clear_symbol.png     | Bin 1693 -> 0 bytes
 .../calculator_input_field.9.png                   | Bin 1262 -> 0 bytes
 res/layout-sw600dp-land/main.xml                   | 247 +++++++++++++++++++++
 res/layout-sw600dp/main.xml                        | 233 +++++++++++++++++++
 res/layout-xlarge-land/main.xml                    | 246 --------------------
 res/layout-xlarge/main.xml                         | 233 -------------------
 res/values-sw600dp-port/styles.xml                 |  18 ++
 res/values-sw600dp/styles.xml                      |  26 +++
 res/values-sw800dp-land/styles.xml                 |  20 ++
 res/values-sw800dp-port/styles.xml                 |  20 ++
 res/values-xlarge/styles.xml                       |  22 --
 res/values/styles.xml                              |   7 +-
 18 files changed, 570 insertions(+), 502 deletions(-)
 create mode 100644 res/drawable-sw600dp-hdpi/calc_clear_symbol.png
 create mode 100644 res/drawable-sw600dp-hdpi/calculator_input_field.9.png
 create mode 100644 res/drawable-sw600dp-mdpi/calc_clear_symbol.png
 create mode 100644 res/drawable-sw600dp-mdpi/calculator_input_field.9.png
 delete mode 100644 res/drawable-xlarge-hdpi/calc_clear_symbol.png
 delete mode 100644 res/drawable-xlarge-hdpi/calculator_input_field.9.png
 delete mode 100644 res/drawable-xlarge-mdpi/calc_clear_symbol.png
 delete mode 100644 res/drawable-xlarge-mdpi/calculator_input_field.9.png
 create mode 100644 res/layout-sw600dp-land/main.xml
 create mode 100644 res/layout-sw600dp/main.xml
 delete mode 100644 res/layout-xlarge-land/main.xml
 delete mode 100644 res/layout-xlarge/main.xml
 create mode 100644 res/values-sw600dp-port/styles.xml
 create mode 100644 res/values-sw600dp/styles.xml
 create mode 100644 res/values-sw800dp-land/styles.xml
 create mode 100644 res/values-sw800dp-port/styles.xml
 delete mode 100644 res/values-xlarge/styles.xml

(limited to 'res')

diff --git a/res/drawable-sw600dp-hdpi/calc_clear_symbol.png b/res/drawable-sw600dp-hdpi/calc_clear_symbol.png
new file mode 100644
index 0000000..8ffc30e
Binary files /dev/null and b/res/drawable-sw600dp-hdpi/calc_clear_symbol.png differ
diff --git a/res/drawable-sw600dp-hdpi/calculator_input_field.9.png b/res/drawable-sw600dp-hdpi/calculator_input_field.9.png
new file mode 100644
index 0000000..555873c
Binary files /dev/null and b/res/drawable-sw600dp-hdpi/calculator_input_field.9.png differ
diff --git a/res/drawable-sw600dp-mdpi/calc_clear_symbol.png b/res/drawable-sw600dp-mdpi/calc_clear_symbol.png
new file mode 100644
index 0000000..60dfecc
Binary files /dev/null and b/res/drawable-sw600dp-mdpi/calc_clear_symbol.png differ
diff --git a/res/drawable-sw600dp-mdpi/calculator_input_field.9.png b/res/drawable-sw600dp-mdpi/calculator_input_field.9.png
new file mode 100644
index 0000000..679d4c8
Binary files /dev/null and b/res/drawable-sw600dp-mdpi/calculator_input_field.9.png differ
diff --git a/res/drawable-xlarge-hdpi/calc_clear_symbol.png b/res/drawable-xlarge-hdpi/calc_clear_symbol.png
deleted file mode 100644
index 8ffc30e..0000000
Binary files a/res/drawable-xlarge-hdpi/calc_clear_symbol.png and /dev/null differ
diff --git a/res/drawable-xlarge-hdpi/calculator_input_field.9.png b/res/drawable-xlarge-hdpi/calculator_input_field.9.png
deleted file mode 100644
index 555873c..0000000
Binary files a/res/drawable-xlarge-hdpi/calculator_input_field.9.png and /dev/null differ
diff --git a/res/drawable-xlarge-mdpi/calc_clear_symbol.png b/res/drawable-xlarge-mdpi/calc_clear_symbol.png
deleted file mode 100644
index 60dfecc..0000000
Binary files a/res/drawable-xlarge-mdpi/calc_clear_symbol.png and /dev/null differ
diff --git a/res/drawable-xlarge-mdpi/calculator_input_field.9.png b/res/drawable-xlarge-mdpi/calculator_input_field.9.png
deleted file mode 100644
index 679d4c8..0000000
Binary files a/res/drawable-xlarge-mdpi/calculator_input_field.9.png and /dev/null differ
diff --git a/res/layout-sw600dp-land/main.xml b/res/layout-sw600dp-land/main.xml
new file mode 100644
index 0000000..020edba
--- /dev/null
+++ b/res/layout-sw600dp-land/main.xml
@@ -0,0 +1,247 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright (C) 2011, The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#ff000000"
+    android:paddingLeft="@dimen/left_right_padding"
+    android:paddingRight="@dimen/left_right_padding"
+    android:paddingTop="@dimen/top_bottom_padding"
+    android:paddingBottom="@dimen/top_bottom_padding">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:layout_marginBottom="@dimen/group_padding"
+        android:background="@drawable/calculator_input_field">
+
+        <com.android.calculator2.CalculatorDisplay
+            android:id="@+id/display"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="match_parent"
+            maxDigits="14"
+            >
+
+            <com.android.calculator2.CalculatorEditText
+                style="@style/display_style" />
+            <com.android.calculator2.CalculatorEditText
+                style="@style/display_style" />
+
+        </com.android.calculator2.CalculatorDisplay>
+
+        <FrameLayout
+            android:layout_width="100dip"
+            android:layout_height="match_parent">
+            <Button
+                android:id="@+id/clear"
+                android:text="@string/clear"
+                style="@style/btn_clear"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:paddingLeft="5dip"
+                android:paddingRight="5dip" />
+            <ImageButton
+                android:id="@+id/del"
+                android:src="@drawable/calc_clear_symbol"
+                style="@style/btn_clear"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:paddingLeft="5dip"
+                android:paddingRight="5dip" />
+        </FrameLayout>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+        android:layout_weight="4"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:layout_width="0dip"
+            android:layout_height="match_parent"
+            android:layout_weight="2"
+            android:orientation="vertical"
+            android:layout_marginRight="@dimen/group_padding">
+            <LinearLayout
+                style="@style/btn_row_style">
+                <Button
+                    android:id="@+id/sin"
+                    android:text="@string/sin"
+                    style="@style/btn_function_cell_style" />
+                <Button
+                    android:id="@+id/ln"
+                    android:text="@string/ln"
+                    style="@style/btn_function_cell_style" />
+            </LinearLayout>
+            <LinearLayout
+                style="@style/btn_row_style">
+                <Button
+                    android:id="@+id/cos"
+                    android:text="@string/cos"
+                    style="@style/btn_function_cell_style" />
+                <Button
+                    android:id="@+id/lg"
+                    android:text="@string/lg"
+                    style="@style/btn_function_cell_style" />
+            </LinearLayout>
+            <LinearLayout
+                style="@style/btn_row_style">
+                <Button
+                    android:id="@+id/tan"
+                    android:text="@string/tan"
+                    style="@style/btn_function_cell_style" />
+                <Button
+                    android:id="@+id/e"
+                    android:text="@string/e"
+                    style="@style/btn_function_cell_style" />
+            </LinearLayout>
+            <LinearLayout
+                style="@style/btn_row_style">
+                <Button
+                    android:id="@+id/pi"
+                    android:text="@string/pi"
+                    style="@style/btn_function_cell_style" />
+                <Button
+                    android:id="@+id/power"
+                    android:text="@string/power"
+                    style="@style/btn_function_cell_style" />
+            </LinearLayout>
+            <LinearLayout
+                style="@style/btn_row_style">
+                <Button
+                    android:id="@+id/factorial"
+                    android:text="@string/factorial"
+                    style="@style/btn_function_cell_style" />
+                <Button
+                    android:id="@+id/sqrt"
+                    android:text="@string/sqrt"
+                    style="@style/btn_function_cell_style" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="0dip"
+            android:layout_height="match_parent"
+            android:layout_weight="5"
+            android:orientation="vertical">
+            <LinearLayout
+                style="@style/btn_row_style">
+                <Button
+                    android:id="@+id/digit7"
+                    android:text="@string/digit7"
+                    style="@style/btn_digit_cell_style" />
+                <Button
+                    android:id="@+id/digit8"
+                    android:text="@string/digit8"
+                    style="@style/btn_digit_cell_style" />
+                <Button
+                    android:id="@+id/digit9"
+                    android:text="@string/digit9"
+                    style="@style/btn_digit_cell_style" />
+                <Button
+                    android:id="@+id/div"
+                    android:text="@string/div"
+                    style="@style/btn_operation_cell_style" />
+                <Button
+                    android:id="@+id/leftParen"
+                    android:text="@string/leftParen"
+                    style="@style/btn_operation_cell_style" />
+            </LinearLayout>
+            <LinearLayout
+                style="@style/btn_row_style">
+                <Button
+                    android:id="@+id/digit4"
+                    android:text="@string/digit4"
+                    style="@style/btn_digit_cell_style" />
+                <Button
+                    android:id="@+id/digit5"
+                    android:text="@string/digit5"
+                    style="@style/btn_digit_cell_style" />
+                <Button
+                    android:id="@+id/digit6"
+                    android:text="@string/digit6"
+                    style="@style/btn_digit_cell_style" />
+                <Button
+                    android:id="@+id/mul"
+                    android:text="@string/mul"
+                    style="@style/btn_operation_cell_style" />
+                <Button
+                    android:id="@+id/rightParen"
+                    android:text="@string/rightParen"
+                    style="@style/btn_operation_cell_style" />
+            </LinearLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="0dip"
+                android:layout_weight="2"
+                android:orientation="horizontal">
+                <LinearLayout
+                    android:layout_width="0dip"
+                    android:layout_height="match_parent"
+                    android:layout_weight="4"
+                    android:orientation="vertical">
+                    <LinearLayout
+                        style="@style/btn_row_style">
+                        <Button
+                            android:id="@+id/digit1"
+                            android:text="@string/digit1"
+                            style="@style/btn_digit_cell_style" />
+                        <Button
+                            android:id="@+id/digit2"
+                            android:text="@string/digit2"
+                            style="@style/btn_digit_cell_style" />
+                        <Button
+                            android:id="@+id/digit3"
+                            android:text="@string/digit3"
+                            style="@style/btn_digit_cell_style" />
+                        <Button
+                            android:id="@+id/minus"
+                            android:text="@string/minus"
+                            style="@style/btn_operation_cell_style" />
+                    </LinearLayout>
+                    <LinearLayout
+                        style="@style/btn_row_style">
+                        <Button
+                            android:id="@+id/digit0"
+                            android:text="@string/digit0"
+                            style="@style/btn_digit_cell_style"
+                            android:layout_weight="2" />
+                        <Button
+                            android:id="@+id/dot"
+                            android:text="@string/dot"
+                            style="@style/btn_digit_cell_style" />
+                        <Button
+                            android:id="@+id/plus"
+                            android:text="@string/plus"
+                            style="@style/btn_operation_cell_style" />
+                    </LinearLayout>
+                </LinearLayout>
+                <Button
+                    android:id="@+id/equal"
+                    android:text="@string/equal"
+                    style="@style/btn_operation_cell_style" />
+            </LinearLayout>
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
diff --git a/res/layout-sw600dp/main.xml b/res/layout-sw600dp/main.xml
new file mode 100644
index 0000000..ccba54a
--- /dev/null
+++ b/res/layout-sw600dp/main.xml
@@ -0,0 +1,233 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright (C) 2011, The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#ff000000"
+    android:paddingLeft="@dimen/left_right_padding"
+    android:paddingRight="@dimen/left_right_padding"
+    android:paddingTop="@dimen/top_bottom_padding"
+    android:paddingBottom="@dimen/top_bottom_padding">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:layout_marginBottom="@dimen/group_padding"
+        android:background="@drawable/calculator_input_field">
+
+        <com.android.calculator2.CalculatorDisplay
+            android:id="@+id/display"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="match_parent"
+            maxDigits="12"
+            >
+
+            <com.android.calculator2.CalculatorEditText
+                style="@style/display_style" />
+            <com.android.calculator2.CalculatorEditText
+                style="@style/display_style" />
+
+        </com.android.calculator2.CalculatorDisplay>
+
+        <FrameLayout
+            android:layout_width="100dip"
+            android:layout_height="match_parent">
+            <Button
+                android:id="@+id/clear"
+                android:text="@string/clear"
+                style="@style/btn_clear"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:paddingLeft="5dip"
+                android:paddingRight="5dip" />
+            <ImageButton
+                android:id="@+id/del"
+                android:src="@drawable/calc_clear_symbol"
+                style="@style/btn_clear"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:paddingLeft="5dip"
+                android:paddingRight="5dip" />
+        </FrameLayout>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+        android:layout_weight="2"
+        android:orientation="vertical"
+        android:layout_marginBottom="@dimen/group_padding">
+
+        <LinearLayout
+            style="@style/btn_row_style">
+            <Button
+                android:id="@+id/sin"
+                android:text="@string/sin"
+                style="@style/btn_function_cell_style" />
+            <Button
+                android:id="@+id/cos"
+                android:text="@string/cos"
+                style="@style/btn_function_cell_style" />
+            <Button
+                android:id="@+id/tan"
+                android:text="@string/tan"
+                style="@style/btn_function_cell_style" />
+            <Button
+                android:id="@+id/pi"
+                android:text="@string/pi"
+                style="@style/btn_function_cell_style" />
+            <Button
+                android:id="@+id/factorial"
+                android:text="@string/factorial"
+                style="@style/btn_function_cell_style" />
+        </LinearLayout>
+        <LinearLayout
+            style="@style/btn_row_style">
+            <Button
+                android:id="@+id/ln"
+                android:text="@string/ln"
+                style="@style/btn_function_cell_style" />
+            <Button
+                android:id="@+id/lg"
+                android:text="@string/lg"
+                style="@style/btn_function_cell_style" />
+            <Button
+                android:id="@+id/e"
+                android:text="@string/e"
+                style="@style/btn_function_cell_style" />
+            <Button
+                android:id="@+id/power"
+                android:text="@string/power"
+                style="@style/btn_function_cell_style" />
+            <Button
+                android:id="@+id/sqrt"
+                android:text="@string/sqrt"
+                style="@style/btn_function_cell_style" />
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+        android:layout_weight="5"
+        android:orientation="vertical">
+        <LinearLayout
+            style="@style/btn_row_style">
+            <Button
+                android:id="@+id/digit7"
+                android:text="@string/digit7"
+                style="@style/btn_digit_cell_style" />
+            <Button
+                android:id="@+id/digit8"
+                android:text="@string/digit8"
+                style="@style/btn_digit_cell_style" />
+            <Button
+                android:id="@+id/digit9"
+                android:text="@string/digit9"
+                style="@style/btn_digit_cell_style" />
+            <Button
+                android:id="@+id/div"
+                android:text="@string/div"
+                style="@style/btn_operation_cell_style" />
+            <Button
+                android:id="@+id/leftParen"
+                android:text="@string/leftParen"
+                style="@style/btn_operation_cell_style" />
+        </LinearLayout>
+        <LinearLayout
+            style="@style/btn_row_style">
+            <Button
+                android:id="@+id/digit4"
+                android:text="@string/digit4"
+                style="@style/btn_digit_cell_style" />
+            <Button
+                android:id="@+id/digit5"
+                android:text="@string/digit5"
+                style="@style/btn_digit_cell_style" />
+            <Button
+                android:id="@+id/digit6"
+                android:text="@string/digit6"
+                style="@style/btn_digit_cell_style" />
+            <Button
+                android:id="@+id/mul"
+                android:text="@string/mul"
+                style="@style/btn_operation_cell_style" />
+            <Button
+                android:id="@+id/rightParen"
+                android:text="@string/rightParen"
+                style="@style/btn_operation_cell_style" />
+        </LinearLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dip"
+            android:layout_weight="2"
+            android:orientation="horizontal">
+            <LinearLayout
+                android:layout_width="0dip"
+                android:layout_height="match_parent"
+                android:layout_weight="4"
+                android:orientation="vertical">
+                <LinearLayout
+                    style="@style/btn_row_style">
+                    <Button
+                        android:id="@+id/digit1"
+                        android:text="@string/digit1"
+                        style="@style/btn_digit_cell_style" />
+                    <Button
+                        android:id="@+id/digit2"
+                        android:text="@string/digit2"
+                        style="@style/btn_digit_cell_style" />
+                    <Button
+                        android:id="@+id/digit3"
+                        android:text="@string/digit3"
+                        style="@style/btn_digit_cell_style" />
+                    <Button
+                        android:id="@+id/minus"
+                        android:text="@string/minus"
+                        style="@style/btn_operation_cell_style" />
+                </LinearLayout>
+                <LinearLayout
+                    style="@style/btn_row_style">
+                    <Button
+                        android:id="@+id/digit0"
+                        android:text="@string/digit0"
+                        style="@style/btn_digit_cell_style"
+                        android:layout_weight="2" />
+                    <Button
+                        android:id="@+id/dot"
+                        android:text="@string/dot"
+                        style="@style/btn_digit_cell_style" />
+                    <Button
+                        android:id="@+id/plus"
+                        android:text="@string/plus"
+                        style="@style/btn_operation_cell_style" />
+                </LinearLayout>
+            </LinearLayout>
+            <Button
+                android:id="@+id/equal"
+                android:text="@string/equal"
+                style="@style/btn_operation_cell_style" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
diff --git a/res/layout-xlarge-land/main.xml b/res/layout-xlarge-land/main.xml
deleted file mode 100644
index 9e21630..0000000
--- a/res/layout-xlarge-land/main.xml
+++ /dev/null
@@ -1,246 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2011, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="#ff000000"
-    android:paddingLeft="48dip"
-    android:paddingRight="48dip"
-    android:paddingTop="48dip"
-    android:paddingBottom="48dip">
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:layout_marginBottom="48dip"
-        android:background="@drawable/calculator_input_field">
-
-        <com.android.calculator2.CalculatorDisplay
-            android:id="@+id/display"
-            android:layout_width="0dp"
-            android:layout_weight="1"
-            android:layout_height="match_parent"
-            maxDigits="14"
-            >
-
-            <com.android.calculator2.CalculatorEditText
-                style="@style/display_style" />
-            <com.android.calculator2.CalculatorEditText
-                style="@style/display_style" />
-
-        </com.android.calculator2.CalculatorDisplay>
-
-        <FrameLayout
-            android:layout_width="160dip"
-            android:layout_height="match_parent">
-            <Button
-                android:id="@+id/clear"
-                android:text="@string/clear"
-                style="@style/btn_clear"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:paddingLeft="5dip"
-                android:paddingRight="5dip" />
-            <ImageButton
-                android:id="@+id/del"
-                android:src="@drawable/calc_clear_symbol"
-                style="@style/btn_clear"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:paddingLeft="5dip"
-                android:paddingRight="5dip" />
-        </FrameLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="4"
-        android:orientation="horizontal">
-
-        <LinearLayout
-            android:layout_width="0dip"
-            android:layout_height="match_parent"
-            android:layout_weight="2"
-            android:orientation="vertical"
-            android:layout_marginRight="64dip">
-            <LinearLayout
-                style="@style/btn_row_style">
-                <Button
-                    android:id="@+id/sin"
-                    android:text="@string/sin"
-                    style="@style/btn_function_cell_style" />
-                <Button
-                    android:id="@+id/ln"
-                    android:text="@string/ln"
-                    style="@style/btn_function_cell_style" />
-            </LinearLayout>
-            <LinearLayout
-                style="@style/btn_row_style">
-                <Button
-                    android:id="@+id/cos"
-                    android:text="@string/cos"
-                    style="@style/btn_function_cell_style" />
-                <Button
-                    android:id="@+id/lg"
-                    android:text="@string/lg"
-                    style="@style/btn_function_cell_style" />
-            </LinearLayout>
-            <LinearLayout
-                style="@style/btn_row_style">
-                <Button
-                    android:id="@+id/tan"
-                    android:text="@string/tan"
-                    style="@style/btn_function_cell_style" />
-                <Button
-                    android:id="@+id/e"
-                    android:text="@string/e"
-                    style="@style/btn_function_cell_style" />
-            </LinearLayout>
-            <LinearLayout
-                style="@style/btn_row_style">
-                <Button
-                    android:id="@+id/pi"
-                    android:text="@string/pi"
-                    style="@style/btn_function_cell_style" />
-                <Button
-                    android:id="@+id/power"
-                    android:text="@string/power"
-                    style="@style/btn_function_cell_style" />
-            </LinearLayout>
-            <LinearLayout
-                style="@style/btn_row_style">
-                <Button
-                    android:id="@+id/factorial"
-                    android:text="@string/factorial"
-                    style="@style/btn_function_cell_style" />
-                <Button
-                    android:id="@+id/sqrt"
-                    android:text="@string/sqrt"
-                    style="@style/btn_function_cell_style" />
-            </LinearLayout>
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="0dip"
-            android:layout_height="match_parent"
-            android:layout_weight="5"
-            android:orientation="vertical">
-            <LinearLayout
-                style="@style/btn_row_style">
-                <Button
-                    android:id="@+id/digit7"
-                    android:text="@string/digit7"
-                    style="@style/btn_digit_cell_style" />
-                <Button
-                    android:id="@+id/digit8"
-                    android:text="@string/digit8"
-                    style="@style/btn_digit_cell_style" />
-                <Button
-                    android:id="@+id/digit9"
-                    android:text="@string/digit9"
-                    style="@style/btn_digit_cell_style" />
-                <Button
-                    android:id="@+id/div"
-                    android:text="@string/div"
-                    style="@style/btn_operation_cell_style" />
-                <Button
-                    android:id="@+id/leftParen"
-                    android:text="@string/leftParen"
-                    style="@style/btn_operation_cell_style" />
-            </LinearLayout>
-            <LinearLayout
-                style="@style/btn_row_style">
-                <Button
-                    android:id="@+id/digit4"
-                    android:text="@string/digit4"
-                    style="@style/btn_digit_cell_style" />
-                <Button
-                    android:id="@+id/digit5"
-                    android:text="@string/digit5"
-                    style="@style/btn_digit_cell_style" />
-                <Button
-                    android:id="@+id/digit6"
-                    android:text="@string/digit6"
-                    style="@style/btn_digit_cell_style" />
-                <Button
-                    android:id="@+id/mul"
-                    android:text="@string/mul"
-                    style="@style/btn_operation_cell_style" />
-                <Button
-                    android:id="@+id/rightParen"
-                    android:text="@string/rightParen"
-                    style="@style/btn_operation_cell_style" />
-            </LinearLayout>
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="0dip"
-                android:layout_weight="2"
-                android:orientation="horizontal">
-                <LinearLayout
-                    android:layout_width="0dip"
-                    android:layout_height="match_parent"
-                    android:layout_weight="4"
-                    android:orientation="vertical">
-                    <LinearLayout
-                        style="@style/btn_row_style">
-                        <Button
-                            android:id="@+id/digit1"
-                            android:text="@string/digit1"
-                            style="@style/btn_digit_cell_style" />
-                        <Button
-                            android:id="@+id/digit2"
-                            android:text="@string/digit2"
-                            style="@style/btn_digit_cell_style" />
-                        <Button
-                            android:id="@+id/digit3"
-                            android:text="@string/digit3"
-                            style="@style/btn_digit_cell_style" />
-                        <Button
-                            android:id="@+id/minus"
-                            android:text="@string/minus"
-                            style="@style/btn_operation_cell_style" />
-                    </LinearLayout>
-                    <LinearLayout
-                        style="@style/btn_row_style">
-                        <Button
-                            android:id="@+id/digit0"
-                            android:text="@string/digit0"
-                            style="@style/btn_digit_cell_style"
-                            android:layout_weight="2" />
-                        <Button
-                            android:id="@+id/dot"
-                            android:text="@string/dot"
-                            style="@style/btn_digit_cell_style" />
-                        <Button
-                            android:id="@+id/plus"
-                            android:text="@string/plus"
-                            style="@style/btn_operation_cell_style" />
-                    </LinearLayout>
-                </LinearLayout>
-                <Button
-                    android:id="@+id/equal"
-                    android:text="@string/equal"
-                    style="@style/btn_operation_cell_style" />
-            </LinearLayout>
-        </LinearLayout>
-    </LinearLayout>
-</LinearLayout>
diff --git a/res/layout-xlarge/main.xml b/res/layout-xlarge/main.xml
deleted file mode 100644
index e4ba64b..0000000
--- a/res/layout-xlarge/main.xml
+++ /dev/null
@@ -1,233 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2011, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="#ff000000"
-    android:paddingLeft="32dip"
-    android:paddingRight="32dip"
-    android:paddingTop="64dip"
-    android:paddingBottom="64dip">
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:layout_marginBottom="72dip"
-        android:background="@drawable/calculator_input_field">
-
-        <com.android.calculator2.CalculatorDisplay
-            android:id="@+id/display"
-            android:layout_width="0dp"
-            android:layout_weight="1"
-            android:layout_height="match_parent"
-            maxDigits="12"
-            >
-
-            <com.android.calculator2.CalculatorEditText
-                style="@style/display_style" />
-            <com.android.calculator2.CalculatorEditText
-                style="@style/display_style" />
-
-        </com.android.calculator2.CalculatorDisplay>
-
-        <FrameLayout
-            android:layout_width="160dip"
-            android:layout_height="match_parent">
-            <Button
-                android:id="@+id/clear"
-                android:text="@string/clear"
-                style="@style/btn_clear"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:paddingLeft="5dip"
-                android:paddingRight="5dip" />
-            <ImageButton
-                android:id="@+id/del"
-                android:src="@drawable/calc_clear_symbol"
-                style="@style/btn_clear"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:paddingLeft="5dip"
-                android:paddingRight="5dip" />
-        </FrameLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="2"
-        android:orientation="vertical"
-        android:layout_marginBottom="72dip">
-
-        <LinearLayout
-            style="@style/btn_row_style">
-            <Button
-                android:id="@+id/sin"
-                android:text="@string/sin"
-                style="@style/btn_function_cell_style" />
-            <Button
-                android:id="@+id/cos"
-                android:text="@string/cos"
-                style="@style/btn_function_cell_style" />
-            <Button
-                android:id="@+id/tan"
-                android:text="@string/tan"
-                style="@style/btn_function_cell_style" />
-            <Button
-                android:id="@+id/pi"
-                android:text="@string/pi"
-                style="@style/btn_function_cell_style" />
-            <Button
-                android:id="@+id/factorial"
-                android:text="@string/factorial"
-                style="@style/btn_function_cell_style" />
-        </LinearLayout>
-        <LinearLayout
-            style="@style/btn_row_style">
-            <Button
-                android:id="@+id/ln"
-                android:text="@string/ln"
-                style="@style/btn_function_cell_style" />
-            <Button
-                android:id="@+id/lg"
-                android:text="@string/lg"
-                style="@style/btn_function_cell_style" />
-            <Button
-                android:id="@+id/e"
-                android:text="@string/e"
-                style="@style/btn_function_cell_style" />
-            <Button
-                android:id="@+id/power"
-                android:text="@string/power"
-                style="@style/btn_function_cell_style" />
-            <Button
-                android:id="@+id/sqrt"
-                android:text="@string/sqrt"
-                style="@style/btn_function_cell_style" />
-        </LinearLayout>
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="5"
-        android:orientation="vertical">
-        <LinearLayout
-            style="@style/btn_row_style">
-            <Button
-                android:id="@+id/digit7"
-                android:text="@string/digit7"
-                style="@style/btn_digit_cell_style" />
-            <Button
-                android:id="@+id/digit8"
-                android:text="@string/digit8"
-                style="@style/btn_digit_cell_style" />
-            <Button
-                android:id="@+id/digit9"
-                android:text="@string/digit9"
-                style="@style/btn_digit_cell_style" />
-            <Button
-                android:id="@+id/div"
-                android:text="@string/div"
-                style="@style/btn_operation_cell_style" />
-            <Button
-                android:id="@+id/leftParen"
-                android:text="@string/leftParen"
-                style="@style/btn_operation_cell_style" />
-        </LinearLayout>
-        <LinearLayout
-            style="@style/btn_row_style">
-            <Button
-                android:id="@+id/digit4"
-                android:text="@string/digit4"
-                style="@style/btn_digit_cell_style" />
-            <Button
-                android:id="@+id/digit5"
-                android:text="@string/digit5"
-                style="@style/btn_digit_cell_style" />
-            <Button
-                android:id="@+id/digit6"
-                android:text="@string/digit6"
-                style="@style/btn_digit_cell_style" />
-            <Button
-                android:id="@+id/mul"
-                android:text="@string/mul"
-                style="@style/btn_operation_cell_style" />
-            <Button
-                android:id="@+id/rightParen"
-                android:text="@string/rightParen"
-                style="@style/btn_operation_cell_style" />
-        </LinearLayout>
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="0dip"
-            android:layout_weight="2"
-            android:orientation="horizontal">
-            <LinearLayout
-                android:layout_width="0dip"
-                android:layout_height="match_parent"
-                android:layout_weight="4"
-                android:orientation="vertical">
-                <LinearLayout
-                    style="@style/btn_row_style">
-                    <Button
-                        android:id="@+id/digit1"
-                        android:text="@string/digit1"
-                        style="@style/btn_digit_cell_style" />
-                    <Button
-                        android:id="@+id/digit2"
-                        android:text="@string/digit2"
-                        style="@style/btn_digit_cell_style" />
-                    <Button
-                        android:id="@+id/digit3"
-                        android:text="@string/digit3"
-                        style="@style/btn_digit_cell_style" />
-                    <Button
-                        android:id="@+id/minus"
-                        android:text="@string/minus"
-                        style="@style/btn_operation_cell_style" />
-                </LinearLayout>
-                <LinearLayout
-                    style="@style/btn_row_style">
-                    <Button
-                        android:id="@+id/digit0"
-                        android:text="@string/digit0"
-                        style="@style/btn_digit_cell_style"
-                        android:layout_weight="2" />
-                    <Button
-                        android:id="@+id/dot"
-                        android:text="@string/dot"
-                        style="@style/btn_digit_cell_style" />
-                    <Button
-                        android:id="@+id/plus"
-                        android:text="@string/plus"
-                        style="@style/btn_operation_cell_style" />
-                </LinearLayout>
-            </LinearLayout>
-            <Button
-                android:id="@+id/equal"
-                android:text="@string/equal"
-                style="@style/btn_operation_cell_style" />
-        </LinearLayout>
-    </LinearLayout>
-</LinearLayout>
diff --git a/res/values-sw600dp-port/styles.xml b/res/values-sw600dp-port/styles.xml
new file mode 100644
index 0000000..799f6fe
--- /dev/null
+++ b/res/values-sw600dp-port/styles.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+    <dimen name="group_padding">48sp</dimen>
+</resources>
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
new file mode 100644
index 0000000..7a946a6
--- /dev/null
+++ b/res/values-sw600dp/styles.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+    <dimen name="btn_digit_text_size">64sp</dimen>
+    <dimen name="btn_operation_text_size">64sp</dimen>
+    <dimen name="btn_function_text_size">32sp</dimen>
+    <dimen name="btn_clear_text_size">48sp</dimen>
+    <dimen name="display_text_size">72sp</dimen>
+    
+    <dimen name="left_right_padding">16sp</dimen>
+    <dimen name="top_bottom_padding">16sp</dimen>
+    <dimen name="group_padding">16sp</dimen>
+</resources>
diff --git a/res/values-sw800dp-land/styles.xml b/res/values-sw800dp-land/styles.xml
new file mode 100644
index 0000000..9d1c26c
--- /dev/null
+++ b/res/values-sw800dp-land/styles.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+    <dimen name="left_right_padding">48sp</dimen>
+    <dimen name="top_bottom_padding">48sp</dimen>
+    <dimen name="group_padding">48sp</dimen>
+</resources>
diff --git a/res/values-sw800dp-port/styles.xml b/res/values-sw800dp-port/styles.xml
new file mode 100644
index 0000000..a6b181e
--- /dev/null
+++ b/res/values-sw800dp-port/styles.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+    <dimen name="left_right_padding">32sp</dimen>
+    <dimen name="top_bottom_padding">64sp</dimen>
+    <dimen name="group_padding">72sp</dimen>
+</resources>
diff --git a/res/values-xlarge/styles.xml b/res/values-xlarge/styles.xml
deleted file mode 100644
index 9dd6b4e..0000000
--- a/res/values-xlarge/styles.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources>
-    <dimen name="btn_digit_text_size">64sp</dimen>
-    <dimen name="btn_operation_text_size">64sp</dimen>
-    <dimen name="btn_function_text_size">32sp</dimen>
-    <dimen name="btn_clear_text_size">48sp</dimen>
-    <dimen name="display_text_size">72sp</dimen>
-</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index b41cb07..29b7432 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -48,7 +48,10 @@
        <item name="android:scrollHorizontally">true</item>
        <item name="android:layout_width">match_parent</item>
        <item name="android:layout_height">match_parent</item>
-       <item name="android:padding">8dp</item>
+       <item name="android:paddingTop">8dp</item>
+       <item name="android:paddingLeft">8dp</item>
+       <item name="android:paddingRight">8dp</item>
+       <item name="android:paddingBottom">0dp</item>
     </style>
 
     <style name="btn_row_style">
@@ -70,6 +73,7 @@
        <item name="android:layout_width">0dip</item>
        <item name="android:layout_weight">1</item>
        <item name="android:layout_height">match_parent</item>
+       <item name="android:gravity">center</item>
        <item name="android:background">@drawable/btn_function</item>
        <item name="android:textSize">@dimen/btn_operation_text_size</item>
     </style>
@@ -78,6 +82,7 @@
        <item name="android:layout_width">0dip</item>
        <item name="android:layout_weight">1</item>
        <item name="android:layout_height">match_parent</item>
+       <item name="android:gravity">center</item>
        <item name="android:background">@drawable/btn_digit</item>
        <item name="android:textSize">@dimen/btn_digit_text_size</item>
     </style>
-- 
cgit v1.2.3