am 8a6c6846: (-s ours) am d82d890e: (-s ours) Import translations. DO NOT MERGE
* commit '8a6c68461821c6c3e6a08ec07e08345fdfb1b591':
Import translations. DO NOT MERGE
diff --git a/Android.mk b/Android.mk
index 90f5b5f..9f9f277 100644
--- a/Android.mk
+++ b/Android.mk
@@ -35,5 +35,5 @@
include $(BUILD_MULTI_PREBUILT)
-# Use the folloing include to make our test apk.
+# Use the following include to make our test apk.
include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 58f520c..f610603 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,19 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.calculator2">
+ package="com.android.calculator2" >
<original-package android:name="com.android.calculator2" />
- <application android:label="@string/app_name" android:icon="@mipmap/ic_launcher_calculator">
- <activity android:name="Calculator"
- android:theme="@android:style/Theme.Holo.NoActionBar"
- android:windowSoftInputMode="stateAlwaysHidden">
+ <application
+ android:icon="@mipmap/ic_launcher_calculator"
+ android:label="@string/app_name" >
+ <activity
+ android:name="Calculator"
+ android:theme="@style/AppTheme"
+ android:windowSoftInputMode="stateAlwaysHidden" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
+
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.LAUNCHER" />
<category android:name="android.intent.category.APP_CALCULATOR" />
</intent-filter>
</activity>
</application>
-</manifest>
+
+</manifest>
diff --git a/res/drawable-hdpi/advanced.png b/res/drawable-hdpi/advanced.png
deleted file mode 100644
index d4873af..0000000
--- a/res/drawable-hdpi/advanced.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/btn_keyboard_key_dark_normal_holo.9.png b/res/drawable-hdpi/btn_keyboard_key_dark_normal_holo.9.png
deleted file mode 100644
index 19bde28..0000000
--- a/res/drawable-hdpi/btn_keyboard_key_dark_normal_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/btn_keyboard_key_dark_pressed_holo.9.png b/res/drawable-hdpi/btn_keyboard_key_dark_pressed_holo.9.png
deleted file mode 100644
index 90abe39..0000000
--- a/res/drawable-hdpi/btn_keyboard_key_dark_pressed_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/btn_keyboard_key_light_normal_holo.9.png b/res/drawable-hdpi/btn_keyboard_key_light_normal_holo.9.png
deleted file mode 100644
index 713bfc1..0000000
--- a/res/drawable-hdpi/btn_keyboard_key_light_normal_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/btn_keyboard_key_light_pressed_holo.9.png b/res/drawable-hdpi/btn_keyboard_key_light_pressed_holo.9.png
deleted file mode 100644
index 6768241..0000000
--- a/res/drawable-hdpi/btn_keyboard_key_light_pressed_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/calc_clear_symbol.png b/res/drawable-hdpi/calc_clear_symbol.png
deleted file mode 100644
index 3ce9dda..0000000
--- a/res/drawable-hdpi/calc_clear_symbol.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/calculator_input_field.9.png b/res/drawable-hdpi/calculator_input_field.9.png
deleted file mode 100644
index 49770cd..0000000
--- a/res/drawable-hdpi/calculator_input_field.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/card_background.9.png b/res/drawable-hdpi/card_background.9.png
new file mode 100644
index 0000000..bffcb47
--- /dev/null
+++ b/res/drawable-hdpi/card_background.9.png
Binary files differ
diff --git a/res/drawable-hdpi/clear_history.png b/res/drawable-hdpi/clear_history.png
deleted file mode 100644
index 14c2ef0..0000000
--- a/res/drawable-hdpi/clear_history.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_delete_alpha.png b/res/drawable-hdpi/ic_delete_alpha.png
new file mode 100644
index 0000000..03b6655
--- /dev/null
+++ b/res/drawable-hdpi/ic_delete_alpha.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_overflow.png b/res/drawable-hdpi/ic_menu_overflow.png
deleted file mode 100644
index a12aedf..0000000
--- a/res/drawable-hdpi/ic_menu_overflow.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/simple.png b/res/drawable-hdpi/simple.png
deleted file mode 100644
index d0e55fc..0000000
--- a/res/drawable-hdpi/simple.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldpi/ic_delete_alpha.png b/res/drawable-ldpi/ic_delete_alpha.png
new file mode 100644
index 0000000..7f6b461
--- /dev/null
+++ b/res/drawable-ldpi/ic_delete_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/advanced.png b/res/drawable-mdpi/advanced.png
deleted file mode 100644
index 925d3b4..0000000
--- a/res/drawable-mdpi/advanced.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_keyboard_key_dark_normal_holo.9.png b/res/drawable-mdpi/btn_keyboard_key_dark_normal_holo.9.png
deleted file mode 100644
index 4f27350..0000000
--- a/res/drawable-mdpi/btn_keyboard_key_dark_normal_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_keyboard_key_dark_pressed_holo.9.png b/res/drawable-mdpi/btn_keyboard_key_dark_pressed_holo.9.png
deleted file mode 100644
index 4a92b80..0000000
--- a/res/drawable-mdpi/btn_keyboard_key_dark_pressed_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_keyboard_key_light_normal_holo.9.png b/res/drawable-mdpi/btn_keyboard_key_light_normal_holo.9.png
deleted file mode 100644
index 37966f5..0000000
--- a/res/drawable-mdpi/btn_keyboard_key_light_normal_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_keyboard_key_light_pressed_holo.9.png b/res/drawable-mdpi/btn_keyboard_key_light_pressed_holo.9.png
deleted file mode 100644
index 0493859..0000000
--- a/res/drawable-mdpi/btn_keyboard_key_light_pressed_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/calc_clear_symbol.png b/res/drawable-mdpi/calc_clear_symbol.png
deleted file mode 100644
index ac301e2..0000000
--- a/res/drawable-mdpi/calc_clear_symbol.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/calculator_input_field.9.png b/res/drawable-mdpi/calculator_input_field.9.png
deleted file mode 100644
index 6146973..0000000
--- a/res/drawable-mdpi/calculator_input_field.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/card_background.9.png b/res/drawable-mdpi/card_background.9.png
new file mode 100644
index 0000000..dd2f251
--- /dev/null
+++ b/res/drawable-mdpi/card_background.9.png
Binary files differ
diff --git a/res/drawable-mdpi/clear_history.png b/res/drawable-mdpi/clear_history.png
deleted file mode 100644
index b31e821..0000000
--- a/res/drawable-mdpi/clear_history.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_delete_alpha.png b/res/drawable-mdpi/ic_delete_alpha.png
new file mode 100644
index 0000000..4765362
--- /dev/null
+++ b/res/drawable-mdpi/ic_delete_alpha.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_overflow.png b/res/drawable-mdpi/ic_menu_overflow.png
deleted file mode 100644
index 4a3bde3..0000000
--- a/res/drawable-mdpi/ic_menu_overflow.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/simple.png b/res/drawable-mdpi/simple.png
deleted file mode 100644
index 2a015c5..0000000
--- a/res/drawable-mdpi/simple.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/calc_clear_symbol.png b/res/drawable-sw600dp-hdpi/calc_clear_symbol.png
deleted file mode 100644
index 8ffc30e..0000000
--- a/res/drawable-sw600dp-hdpi/calc_clear_symbol.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/calculator_input_field.9.png b/res/drawable-sw600dp-hdpi/calculator_input_field.9.png
deleted file mode 100644
index 555873c..0000000
--- a/res/drawable-sw600dp-hdpi/calculator_input_field.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/calc_clear_symbol.png b/res/drawable-sw600dp-mdpi/calc_clear_symbol.png
deleted file mode 100644
index 60dfecc..0000000
--- a/res/drawable-sw600dp-mdpi/calc_clear_symbol.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/calculator_input_field.9.png b/res/drawable-sw600dp-mdpi/calculator_input_field.9.png
deleted file mode 100644
index 679d4c8..0000000
--- a/res/drawable-sw600dp-mdpi/calculator_input_field.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/btn_keyboard_key_dark_normal_holo.9.png b/res/drawable-xhdpi/btn_keyboard_key_dark_normal_holo.9.png
deleted file mode 100644
index 1db8b6f..0000000
--- a/res/drawable-xhdpi/btn_keyboard_key_dark_normal_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_holo.9.png b/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_holo.9.png
deleted file mode 100644
index 84d1739..0000000
--- a/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/btn_keyboard_key_light_normal_holo.9.png b/res/drawable-xhdpi/btn_keyboard_key_light_normal_holo.9.png
deleted file mode 100644
index 1c3293d..0000000
--- a/res/drawable-xhdpi/btn_keyboard_key_light_normal_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/btn_keyboard_key_light_pressed_holo.9.png b/res/drawable-xhdpi/btn_keyboard_key_light_pressed_holo.9.png
deleted file mode 100644
index f770962..0000000
--- a/res/drawable-xhdpi/btn_keyboard_key_light_pressed_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/calc_clear_symbol.png b/res/drawable-xhdpi/calc_clear_symbol.png
deleted file mode 100644
index 570ff39..0000000
--- a/res/drawable-xhdpi/calc_clear_symbol.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/calculator_input_field.9.png b/res/drawable-xhdpi/calculator_input_field.9.png
deleted file mode 100644
index b6adbbf..0000000
--- a/res/drawable-xhdpi/calculator_input_field.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/card_background.9.png b/res/drawable-xhdpi/card_background.9.png
new file mode 100644
index 0000000..68e9743
--- /dev/null
+++ b/res/drawable-xhdpi/card_background.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_delete_alpha.png b/res/drawable-xhdpi/ic_delete_alpha.png
new file mode 100644
index 0000000..8232c2a
--- /dev/null
+++ b/res/drawable-xhdpi/ic_delete_alpha.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_overflow.png b/res/drawable-xhdpi/ic_menu_overflow.png
deleted file mode 100644
index 715cff8..0000000
--- a/res/drawable-xhdpi/ic_menu_overflow.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_delete_alpha.png b/res/drawable-xxhdpi/ic_delete_alpha.png
new file mode 100644
index 0000000..e60f09c
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_delete_alpha.png
Binary files differ
diff --git a/res/values-sw800dp/styles.xml b/res/drawable/btn_advanced.xml
similarity index 63%
copy from res/values-sw800dp/styles.xml
copy to res/drawable/btn_advanced.xml
index 9dd6b4e..8f99f46 100644
--- a/res/values-sw800dp/styles.xml
+++ b/res/drawable/btn_advanced.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
+<!--
+ 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.
@@ -13,10 +14,5 @@
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>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+ android:tint="@color/primary_dark" android:pinned="true" />
diff --git a/res/drawable/btn_digit.xml b/res/drawable/btn_digit.xml
index 2f91721..286b735 100644
--- a/res/drawable/btn_digit.xml
+++ b/res/drawable/btn_digit.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
+<!--
+ 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.
@@ -13,13 +14,5 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<selector
- xmlns:android="http://schemas.android.com/apk/res/android">
-
- <item
- android:state_pressed="true"
- android:drawable="@drawable/btn_keyboard_key_light_pressed_holo" />
- <item
- android:drawable="@drawable/btn_keyboard_key_light_normal_holo" />
-</selector>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+ android:tint="@color/gray_50" android:pinned="true" />
diff --git a/res/drawable/btn_function.xml b/res/drawable/btn_function.xml
index 25a3e66..fc4fa56 100644
--- a/res/drawable/btn_function.xml
+++ b/res/drawable/btn_function.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
+<!--
+ 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.
@@ -13,12 +14,5 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<selector
- xmlns:android="http://schemas.android.com/apk/res/android">
- <item
- android:state_pressed="true"
- android:drawable="@drawable/btn_keyboard_key_dark_pressed_holo" />
- <item
- android:drawable="@drawable/btn_keyboard_key_dark_normal_holo" />
-</selector>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+ android:tint="@color/gray_60" android:pinned="true" />
diff --git a/res/drawable/ic_delete.xml b/res/drawable/ic_delete.xml
new file mode 100644
index 0000000..367e7cf
--- /dev/null
+++ b/res/drawable/ic_delete.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+ android:src="@drawable/ic_delete_alpha"
+ android:tint="@color/text_light" />
diff --git a/res/drawable/shadow_bottom.xml b/res/drawable/shadow_bottom.xml
new file mode 100644
index 0000000..e07dfdf
--- /dev/null
+++ b/res/drawable/shadow_bottom.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <gradient
+ android:angle="90"
+ android:endColor="#C0000000"
+ android:startColor="#00000000" />
+
+</shape>
\ No newline at end of file
diff --git a/res/drawable/shadow_right.xml b/res/drawable/shadow_right.xml
new file mode 100644
index 0000000..c842311
--- /dev/null
+++ b/res/drawable/shadow_right.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <gradient
+ android:angle="0"
+ android:endColor="#33000000"
+ android:startColor="#00000000" />
+
+</shape>
\ No newline at end of file
diff --git a/res/drawable/shadow_top.xml b/res/drawable/shadow_top.xml
new file mode 100644
index 0000000..fa30d3e
--- /dev/null
+++ b/res/drawable/shadow_top.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <gradient
+ android:angle="270"
+ android:endColor="#C0000000"
+ android:startColor="#00000000" />
+
+</shape>
\ No newline at end of file
diff --git a/res/layout-land/advanced_pad.xml b/res/layout-land/advanced_pad.xml
index 5b8f98b..06cb823 100644
--- a/res/layout-land/advanced_pad.xml
+++ b/res/layout-land/advanced_pad.xml
@@ -19,85 +19,102 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/advancedPad"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:orientation="vertical"
- android:layout_gravity="center"
- >
+ android:id="@+id/advancedPad"
+ style="@style/advanced_pad"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_gravity="center"
+ android:layout_weight="1"
+ android:orientation="vertical" >
<LinearLayout
- android:layout_weight="1"
android:layout_width="match_parent"
android:layout_height="0dp"
- >
- <com.android.calculator2.ColorButton
+ android:layout_weight="1" >
+
+ <Button
android:id="@+id/sin"
- android:text="@string/sin"
- style="@style/button_small_style"
+ style="@style/advanced_button_small"
android:contentDescription="@string/sinDesc"
- />
- <com.android.calculator2.ColorButton
+ android:text="@string/sin" />
+
+ <Button
android:id="@+id/cos"
- android:text="@string/cos"
- style="@style/button_small_style"
+ style="@style/advanced_button_small"
android:contentDescription="@string/cosDesc"
- />
- <com.android.calculator2.ColorButton
+ android:text="@string/cos" />
+
+ <Button
android:id="@+id/tan"
- android:text="@string/tan"
- style="@style/button_small_style"
+ style="@style/advanced_button_small"
android:contentDescription="@string/tanDesc"
- />
- <com.android.calculator2.ColorButton
- android:id="@+id/pi"
- android:text="@string/pi"
- style="@style/button_style"
- android:contentDescription="@string/piDesc"
- />
- <com.android.calculator2.ColorButton
- android:id="@+id/factorial"
- android:text="@string/factorial"
- style="@style/button_style"
- android:contentDescription="@string/factorialDesc"
- />
+ android:text="@string/tan" />
+
+ <Button
+ android:id="@+id/leftParen"
+ style="@style/function_button"
+ android:contentDescription="@string/leftParenDesc"
+ android:text="@string/leftParen" />
</LinearLayout>
<LinearLayout
- android:layout_weight="1"
android:layout_width="match_parent"
android:layout_height="0dp"
- >
- <com.android.calculator2.ColorButton
+ android:layout_weight="1" >
+
+ <Button
android:id="@+id/ln"
- android:text="@string/ln"
- style="@style/button_small_style"
+ style="@style/advanced_button_small"
android:contentDescription="@string/lnDesc"
- />
- <com.android.calculator2.ColorButton
+ android:text="@string/ln" />
+
+ <Button
android:id="@+id/lg"
- android:text="@string/lg"
- style="@style/button_small_style"
+ style="@style/advanced_button_small"
android:contentDescription="@string/lgDesc"
- />
- <com.android.calculator2.ColorButton
- android:id="@+id/e"
- android:text="@string/e"
- style="@style/button_style"
- android:contentDescription="@string/eDesc"
- />
- <com.android.calculator2.ColorButton
- android:id="@+id/power"
- android:text="@string/power"
- style="@style/button_style"
- android:contentDescription="@string/powerDesc"
- />
- <com.android.calculator2.ColorButton
- android:id="@+id/sqrt"
- android:text="@string/sqrt"
- style="@style/button_style"
- android:contentDescription="@string/sqrtDesc"
- />
+ android:text="@string/lg" />
+
+ <Button
+ android:id="@+id/factorial"
+ style="@style/advanced_button"
+ android:contentDescription="@string/factorialDesc"
+ android:text="@string/factorial" />
+
+ <Button
+ android:id="@+id/rightParen"
+ style="@style/function_button"
+ android:contentDescription="@string/rightParenDesc"
+ android:text="@string/rightParen" />
</LinearLayout>
-</LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1" >
+
+ <Button
+ android:id="@+id/pi"
+ style="@style/advanced_button"
+ android:contentDescription="@string/piDesc"
+ android:text="@string/pi" />
+
+ <Button
+ android:id="@+id/e"
+ style="@style/advanced_button"
+ android:contentDescription="@string/eDesc"
+ android:text="@string/e" />
+
+ <Button
+ android:id="@+id/power"
+ style="@style/advanced_button"
+ android:contentDescription="@string/powerDesc"
+ android:text="@string/power" />
+
+ <Button
+ android:id="@+id/sqrt"
+ style="@style/advanced_button"
+ android:contentDescription="@string/sqrtDesc"
+ android:text="@string/sqrt" />
+ </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-land/main.xml b/res/layout-land/main.xml
index c8a1216..a633e22 100644
--- a/res/layout-land/main.xml
+++ b/res/layout-land/main.xml
@@ -1,80 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
-<!--
-/*
- * Copyright (C) 2008, 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.
- */
+ 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">
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="2"
- >
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical" >
- <com.android.calculator2.CalculatorDisplay
- android:id="@+id/display"
- android:layout_width="0dp"
- android:layout_weight="5"
- android:layout_height="match_parent"
- maxDigits="@integer/max_digits">
+ <com.android.calculator2.CalculatorDisplay
+ android:id="@+id/display"
+ style="@style/display_holder_style"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ 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.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"/>
- <FrameLayout
- android:layout_width="100dp"
- 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: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:textSize="15dp"
- style="@style/button_style"
- android:contentDescription="@string/delDesc"
- />
- </FrameLayout>
- </LinearLayout>
+ <com.android.calculator2.CalculatorEditText style="@style/display_style" />
+ </com.android.calculator2.CalculatorDisplay>
<com.android.calculator2.CalculatorViewPager
- android:id="@+id/panelswitch"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="4"
- />
+ android:id="@+id/panelswitch"
+ android:layout_width="match_parent"
+ android:layout_height="200dp" />
</LinearLayout>
diff --git a/res/layout-land/simple_pad.xml b/res/layout-land/simple_pad.xml
index 271cb0e..84cd94a 100644
--- a/res/layout-land/simple_pad.xml
+++ b/res/layout-land/simple_pad.xml
@@ -1,146 +1,156 @@
<?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.
-*/
+ Copyright (C) 2014 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:id="@+id/simplePad"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical"
- android:layout_gravity="center"
- >
+ android:id="@+id/simplePad"
+ style="@style/digit_pad"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_gravity="center"
+ android:orientation="vertical" >
+
<LinearLayout
- android:layout_weight="1"
android:layout_width="match_parent"
android:layout_height="0dp"
- >
- <com.android.calculator2.ColorButton
+ android:layout_weight="1" >
+
+ <Button
android:id="@+id/digit7"
- android:text="@string/digit7"
- style="@style/digit_button_style"
- />
- <com.android.calculator2.ColorButton
+ style="@style/digit_button"
+ android:text="@string/digit7" />
+
+ <Button
android:id="@+id/digit8"
- android:text="@string/digit8"
- style="@style/digit_button_style"
- />
- <com.android.calculator2.ColorButton
+ style="@style/digit_button"
+ android:text="@string/digit8" />
+
+ <Button
android:id="@+id/digit9"
- android:text="@string/digit9"
- style="@style/digit_button_style"
- />
- <com.android.calculator2.ColorButton
- android:id="@+id/leftParen"
- android:text="@string/leftParen"
- style="@style/button_style"
- android:contentDescription="@string/leftParenDesc"
- />
- <com.android.calculator2.ColorButton
- android:id="@+id/rightParen"
- android:text="@string/rightParen"
- style="@style/button_style"
- android:contentDescription="@string/rightParenDesc"
- />
- <com.android.calculator2.ColorButton
- android:id="@+id/mul"
- android:text="@string/mul"
- style="@style/button_style"
- android:contentDescription="@string/mulDesc"
- />
- </LinearLayout>
+ style="@style/digit_button"
+ android:text="@string/digit9" />
- <LinearLayout
- android:layout_weight="1"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- >
- <com.android.calculator2.ColorButton
- android:id="@+id/digit4"
- android:text="@string/digit4"
- style="@style/digit_button_style"
- />
- <com.android.calculator2.ColorButton
- android:id="@+id/digit5"
- android:text="@string/digit5"
- style="@style/digit_button_style"
- />
- <com.android.calculator2.ColorButton
- android:id="@+id/digit6"
- android:text="@string/digit6"
- style="@style/digit_button_style"
- />
- <com.android.calculator2.ColorButton
- android:id="@+id/dot"
- android:text="@string/dot"
- style="@style/digit_button_style"
- android:contentDescription="@string/dotDesc"
- />
- <com.android.calculator2.ColorButton
+ <Button
android:id="@+id/div"
- android:text="@string/div"
- style="@style/button_style"
+ style="@style/function_button"
android:contentDescription="@string/divDesc"
- />
- <com.android.calculator2.ColorButton
- android:id="@+id/minus"
- android:text="@string/minus"
- style="@style/button_style"
- android:contentDescription="@string/minusDesc"
- />
+ android:text="@string/div" />
+
+ <Button
+ android:id="@+id/mul"
+ style="@style/function_button"
+ android:contentDescription="@string/mulDesc"
+ android:text="@string/mul" />
+
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="1" >
+
+ <ImageButton
+ android:id="@+id/del"
+ style="@style/function_button"
+ android:contentDescription="@string/delDesc"
+ android:src="@drawable/ic_delete"
+ android:textSize="@dimen/small_text_size" />
+
+ <Button
+ android:id="@+id/clear"
+ style="@style/function_button"
+ android:contentDescription="@string/clearDesc"
+ android:text="@string/clear"
+ android:textSize="@dimen/small_text_size"
+ android:visibility="invisible" />
+ </FrameLayout>
</LinearLayout>
<LinearLayout
- android:layout_weight="1"
android:layout_width="match_parent"
android:layout_height="0dp"
- >
- <com.android.calculator2.ColorButton
- android:id="@+id/digit1"
- android:text="@string/digit1"
- style="@style/digit_button_style"
- />
- <com.android.calculator2.ColorButton
- android:id="@+id/digit2"
- android:text="@string/digit2"
- style="@style/digit_button_style"
- />
- <com.android.calculator2.ColorButton
- android:id="@+id/digit3"
- android:text="@string/digit3"
- style="@style/digit_button_style"
- />
- <com.android.calculator2.ColorButton
- android:id="@+id/digit0"
- android:text="@string/digit0"
- style="@style/digit_button_style"
- />
- <com.android.calculator2.ColorButton
- android:id="@+id/equal"
- android:text="@string/equal"
- style="@style/button_style"
- android:contentDescription="@string/equalDesc"
- />
- <com.android.calculator2.ColorButton
+ android:layout_weight="1" >
+
+ <Button
+ android:id="@+id/digit4"
+ style="@style/digit_button"
+ android:text="@string/digit4" />
+
+ <Button
+ android:id="@+id/digit5"
+ style="@style/digit_button"
+ android:text="@string/digit5" />
+
+ <Button
+ android:id="@+id/digit6"
+ style="@style/digit_button"
+ android:text="@string/digit6" />
+
+ <Button
android:id="@+id/plus"
- android:text="@string/plus"
- style="@style/button_style"
+ style="@style/function_button"
android:contentDescription="@string/plusDesc"
- />
+ android:text="@string/plus" />
+
+ <Button
+ android:id="@+id/minus"
+ style="@style/function_button"
+ android:contentDescription="@string/minusDesc"
+ android:text="@string/minus" />
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="1" />
</LinearLayout>
-</LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1" >
+
+ <Button
+ android:id="@+id/digit1"
+ style="@style/digit_button"
+ android:text="@string/digit1" />
+
+ <Button
+ android:id="@+id/digit2"
+ style="@style/digit_button"
+ android:text="@string/digit2" />
+
+ <Button
+ android:id="@+id/digit3"
+ style="@style/digit_button"
+ android:text="@string/digit3" />
+
+ <Button
+ android:id="@+id/digit0"
+ style="@style/digit_button"
+ android:text="@string/digit0" />
+
+ <Button
+ android:id="@+id/dot"
+ style="@style/digit_button"
+ android:contentDescription="@string/dotDesc"
+ android:text="@string/dot" />
+
+ <Button
+ android:id="@+id/equal"
+ style="@style/function_button"
+ android:contentDescription="@string/equalDesc"
+ android:text="@string/equal" />
+ </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-port/advanced_pad.xml b/res/layout-port/advanced_pad.xml
index 843c54d..73409f1 100644
--- a/res/layout-port/advanced_pad.xml
+++ b/res/layout-port/advanced_pad.xml
@@ -19,110 +19,106 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/advancedPad"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical"
- android:layout_gravity="center"
- >
+ android:id="@+id/advancedPad"
+ style="@style/advanced_pad"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical" >
<LinearLayout
- android:layout_weight="1"
android:layout_width="match_parent"
android:layout_height="0dp"
- >
- <com.android.calculator2.ColorButton
+ android:layout_weight="1" >
+
+ <Button
android:id="@+id/sin"
- android:text="@string/sin"
- style="@style/button_small_style"
+ style="@style/advanced_button_small"
android:contentDescription="@string/sinDesc"
- />
- <com.android.calculator2.ColorButton
+ android:text="@string/sin" />
+
+ <Button
android:id="@+id/cos"
- android:text="@string/cos"
- style="@style/button_small_style"
+ style="@style/advanced_button_small"
android:contentDescription="@string/cosDesc"
- />
- <com.android.calculator2.ColorButton
+ android:text="@string/cos" />
+
+ <Button
android:id="@+id/tan"
- android:text="@string/tan"
- style="@style/button_small_style"
+ style="@style/advanced_button_small"
android:contentDescription="@string/tanDesc"
- />
+ android:text="@string/tan" />
</LinearLayout>
<LinearLayout
- android:layout_weight="1"
android:layout_width="match_parent"
android:layout_height="0dp"
- >
- <com.android.calculator2.ColorButton
+ android:layout_weight="1" >
+
+ <Button
android:id="@+id/ln"
- android:text="@string/ln"
- style="@style/button_small_style"
+ style="@style/advanced_button_small"
android:contentDescription="@string/lnDesc"
- />
- <com.android.calculator2.ColorButton
+ android:text="@string/ln" />
+
+ <Button
android:id="@+id/lg"
- android:text="@string/lg"
- style="@style/button_small_style"
+ style="@style/advanced_button_small"
android:contentDescription="@string/lgDesc"
- />
- <com.android.calculator2.ColorButton
+ android:text="@string/lg" />
+
+ <Button
android:id="@+id/factorial"
- android:text="@string/factorial"
- style="@style/button_style"
+ style="@style/advanced_button"
android:contentDescription="@string/factorialDesc"
- />
+ android:text="@string/factorial" />
</LinearLayout>
<LinearLayout
- android:layout_weight="1"
android:layout_width="match_parent"
android:layout_height="0dp"
- >
- <com.android.calculator2.ColorButton
+ android:layout_weight="1" >
+
+ <Button
android:id="@+id/pi"
- android:text="@string/pi"
- style="@style/button_style"
+ style="@style/advanced_button"
android:contentDescription="@string/piDesc"
- />
- <com.android.calculator2.ColorButton
+ android:text="@string/pi" />
+
+ <Button
android:id="@+id/e"
- android:text="@string/e"
- style="@style/button_style"
+ style="@style/advanced_button"
android:contentDescription="@string/eDesc"
- />
- <com.android.calculator2.ColorButton
+ android:text="@string/e" />
+
+ <Button
android:id="@+id/power"
- android:text="@string/power"
- style="@style/button_style"
+ style="@style/advanced_button"
android:contentDescription="@string/powerDesc"
- />
+ android:text="@string/power" />
</LinearLayout>
<LinearLayout
- android:layout_weight="1"
android:layout_width="match_parent"
android:layout_height="0dp"
- >
- <com.android.calculator2.ColorButton
+ android:layout_weight="1" >
+
+ <Button
android:id="@+id/leftParen"
- android:text="@string/leftParen"
- style="@style/button_style"
+ style="@style/advanced_button"
android:contentDescription="@string/leftParenDesc"
- />
- <com.android.calculator2.ColorButton
+ android:text="@string/leftParen" />
+
+ <Button
android:id="@+id/rightParen"
- android:text="@string/rightParen"
- style="@style/button_style"
+ style="@style/advanced_button"
android:contentDescription="@string/rightParenDesc"
- />
- <com.android.calculator2.ColorButton
+ android:text="@string/rightParen" />
+
+ <Button
android:id="@+id/sqrt"
- android:text="@string/sqrt"
- style="@style/button_style"
+ style="@style/advanced_button"
android:contentDescription="@string/sqrtDesc"
- />
+ android:text="@string/sqrt" />
</LinearLayout>
+
</LinearLayout>
diff --git a/res/layout-port/history_item.xml b/res/layout-port/history_item.xml
index 2147da7..61f7099 100644
--- a/res/layout-port/history_item.xml
+++ b/res/layout-port/history_item.xml
@@ -1,26 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- >
-
- <TextView
- android:id="@+id/historyExpr"
- android:layout_width="0px"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:textSize="23dp"
- android:singleLine="true"
- />
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@drawable/card_background"
+ android:padding="8dp"
+ android:orientation="vertical" >
<TextView
- android:id="@+id/historyResult"
- android:layout_width="180px"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:textSize="23dp"
- android:singleLine="true"
- />
+ android:id="@+id/historyExpr"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:singleLine="true"
+ android:textSize="24sp" />
-</LinearLayout>
+ <TextView
+ android:id="@+id/historyResult"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:singleLine="true"
+ android:textSize="48sp" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-port/main.xml b/res/layout-port/main.xml
index e4e3c1a..8ed7aad 100644
--- a/res/layout-port/main.xml
+++ b/res/layout-port/main.xml
@@ -1,105 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
-
<!--
-/*
- * Copyright (C) 2008, 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.
- */
+ Copyright (C) 2014 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:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical" >
- <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
+ <com.android.calculator2.CalculatorDisplay
+ android:id="@+id/display"
+ style="@style/display_holder_style"
android:layout_width="match_parent"
android:layout_height="0dp"
- android:layout_weight="1.5"
- >
+ android:layout_weight="1"
+ maxDigits="@integer/max_digits" >
- <View
- android:background="@drawable/btn_function"
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="1"
- />
+ <com.android.calculator2.CalculatorEditText style="@style/display_style" />
- <FrameLayout
- android:layout_width="wrap_content"
- 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"
- android:minWidth="89dip"
- />
- <!-- 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"
- android:contentDescription="@string/delDesc"
- android:ellipsize="end"
- android:minWidth="89dip"
- />
- </FrameLayout>
+ <com.android.calculator2.CalculatorEditText style="@style/display_style" />
+ </com.android.calculator2.CalculatorDisplay>
- </LinearLayout>
<com.android.calculator2.CalculatorViewPager
- android:id="@+id/panelswitch"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="10"
- />
-</LinearLayout>
+ android:id="@+id/panelswitch"
+ android:layout_width="match_parent"
+ android:layout_height="360dp" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-port/simple_pad.xml b/res/layout-port/simple_pad.xml
index 1d8b535..276e079 100644
--- a/res/layout-port/simple_pad.xml
+++ b/res/layout-port/simple_pad.xml
@@ -1,141 +1,161 @@
<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
-<!--
-/*
-* 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.
-*/
+ 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:id="@+id/simplePad"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical"
- android:layout_gravity="center"
- >
+ android:id="@+id/simplePad"
+ style="@style/digit_pad"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:baselineAligned="true"
+ android:orientation="horizontal" >
<LinearLayout
- android:layout_weight="3"
- android:layout_width="match_parent"
- android:layout_height="0dp">
- <com.android.calculator2.ColorButton
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:orientation="vertical" >
+
+ <Button
android:id="@+id/digit7"
- android:text="@string/digit7"
- style="@style/digit_button_style"
- />
- <com.android.calculator2.ColorButton
- android:id="@+id/digit8"
- android:text="@string/digit8"
- style="@style/digit_button_style"
- />
- <com.android.calculator2.ColorButton
- android:id="@+id/digit9"
- android:text="@string/digit9"
- style="@style/digit_button_style"
- />
- <com.android.calculator2.ColorButton
- android:id="@+id/div"
- android:text="@string/div"
- style="@style/button_style"
- android:contentDescription="@string/divDesc"
- />
- </LinearLayout>
+ style="@style/digit_button"
+ android:text="@string/digit7" />
- <LinearLayout
- android:layout_weight="3"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- >
- <com.android.calculator2.ColorButton
+ <Button
android:id="@+id/digit4"
- android:text="@string/digit4"
- style="@style/digit_button_style"
- />
- <com.android.calculator2.ColorButton
- android:id="@+id/digit5"
- android:text="@string/digit5"
- style="@style/digit_button_style"
- />
- <com.android.calculator2.ColorButton
- android:id="@+id/digit6"
- android:text="@string/digit6"
- style="@style/digit_button_style"
- />
- <com.android.calculator2.ColorButton
- android:id="@+id/mul"
- android:text="@string/mul"
- style="@style/button_style"
- android:contentDescription="@string/mulDesc"
- />
- </LinearLayout>
+ style="@style/digit_button"
+ android:text="@string/digit4" />
- <LinearLayout
- android:layout_weight="3"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- >
- <com.android.calculator2.ColorButton
+ <Button
android:id="@+id/digit1"
- android:text="@string/digit1"
- style="@style/digit_button_style"
- />
- <com.android.calculator2.ColorButton
- android:id="@+id/digit2"
- android:text="@string/digit2"
- style="@style/digit_button_style"
- />
- <com.android.calculator2.ColorButton
- android:id="@+id/digit3"
- android:text="@string/digit3"
- style="@style/digit_button_style"
- />
- <com.android.calculator2.ColorButton
- android:id="@+id/minus"
- android:text="@string/minus"
- style="@style/button_style"
- android:contentDescription="@string/minusDesc"
- />
+ style="@style/digit_button"
+ android:text="@string/digit1" />
+
+ <Button
+ android:id="@+id/dot"
+ style="@style/digit_button"
+ android:contentDescription="@string/dotDesc"
+ android:text="@string/dot" />
</LinearLayout>
<LinearLayout
- android:layout_weight="3"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- >
- <com.android.calculator2.ColorButton
- android:id="@+id/dot"
- android:text="@string/dot"
- style="@style/digit_button_style"
- android:contentDescription="@string/dotDesc"
- />
- <com.android.calculator2.ColorButton
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:orientation="vertical" >
+
+ <Button
+ android:id="@+id/digit8"
+ style="@style/digit_button"
+ android:text="@string/digit8" />
+
+ <Button
+ android:id="@+id/digit5"
+ style="@style/digit_button"
+ android:text="@string/digit5" />
+
+ <Button
+ android:id="@+id/digit2"
+ style="@style/digit_button"
+ android:text="@string/digit2" />
+
+ <Button
android:id="@+id/digit0"
- android:text="@string/digit0"
- style="@style/digit_button_style"
- />
- <com.android.calculator2.ColorButton
- android:id="@+id/equal"
- android:text="@string/equal"
- style="@style/button_style"
- android:contentDescription="@string/equalDesc"
- />
- <com.android.calculator2.ColorButton
- android:id="@+id/plus"
- android:text="@string/plus"
- style="@style/button_style"
- android:contentDescription="@string/plusDesc"
- />
+ style="@style/digit_button"
+ android:text="@string/digit0" />
</LinearLayout>
-</LinearLayout>
+
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:orientation="vertical" >
+
+ <Button
+ android:id="@+id/digit9"
+ style="@style/digit_button"
+ android:text="@string/digit9" />
+
+ <Button
+ android:id="@+id/digit6"
+ style="@style/digit_button"
+ android:text="@string/digit6" />
+
+ <Button
+ android:id="@+id/digit3"
+ style="@style/digit_button"
+ android:text="@string/digit3" />
+
+ <Button
+ android:id="@+id/equal"
+ style="@style/digit_button"
+ android:contentDescription="@string/equalDesc"
+ android:text="@string/equal" />
+ </LinearLayout>
+
+ <LinearLayout
+ style="@style/function_pad"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:orientation="vertical" >
+
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="1" >
+
+ <ImageButton
+ android:id="@+id/del"
+ style="@style/function_button"
+ android:contentDescription="@string/delDesc"
+ android:src="@drawable/ic_delete"
+ android:textSize="@dimen/small_text_size" />
+
+ <Button
+ android:id="@+id/clear"
+ style="@style/function_button"
+ android:contentDescription="@string/clearDesc"
+ android:text="@string/clear"
+ android:textSize="@dimen/small_text_size"
+ android:visibility="invisible" />
+ </FrameLayout>
+
+ <Button
+ android:id="@+id/div"
+ style="@style/function_button"
+ android:contentDescription="@string/divDesc"
+ android:text="@string/div" />
+
+ <Button
+ android:id="@+id/mul"
+ style="@style/function_button"
+ android:contentDescription="@string/mulDesc"
+ android:text="@string/mul" />
+
+ <Button
+ android:id="@+id/minus"
+ style="@style/function_button"
+ android:contentDescription="@string/minusDesc"
+ android:text="@string/minus" />
+
+ <Button
+ android:id="@+id/plus"
+ style="@style/function_button"
+ android:contentDescription="@string/plusDesc"
+ android:text="@string/plus" />
+ </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-sw600dp-land/advanced_pad.xml b/res/layout-sw600dp-land/advanced_pad.xml
new file mode 100644
index 0000000..73409f1
--- /dev/null
+++ b/res/layout-sw600dp-land/advanced_pad.xml
@@ -0,0 +1,124 @@
+<?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:id="@+id/advancedPad"
+ style="@style/advanced_pad"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical" >
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1" >
+
+ <Button
+ android:id="@+id/sin"
+ style="@style/advanced_button_small"
+ android:contentDescription="@string/sinDesc"
+ android:text="@string/sin" />
+
+ <Button
+ android:id="@+id/cos"
+ style="@style/advanced_button_small"
+ android:contentDescription="@string/cosDesc"
+ android:text="@string/cos" />
+
+ <Button
+ android:id="@+id/tan"
+ style="@style/advanced_button_small"
+ android:contentDescription="@string/tanDesc"
+ android:text="@string/tan" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1" >
+
+ <Button
+ android:id="@+id/ln"
+ style="@style/advanced_button_small"
+ android:contentDescription="@string/lnDesc"
+ android:text="@string/ln" />
+
+ <Button
+ android:id="@+id/lg"
+ style="@style/advanced_button_small"
+ android:contentDescription="@string/lgDesc"
+ android:text="@string/lg" />
+
+ <Button
+ android:id="@+id/factorial"
+ style="@style/advanced_button"
+ android:contentDescription="@string/factorialDesc"
+ android:text="@string/factorial" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1" >
+
+ <Button
+ android:id="@+id/pi"
+ style="@style/advanced_button"
+ android:contentDescription="@string/piDesc"
+ android:text="@string/pi" />
+
+ <Button
+ android:id="@+id/e"
+ style="@style/advanced_button"
+ android:contentDescription="@string/eDesc"
+ android:text="@string/e" />
+
+ <Button
+ android:id="@+id/power"
+ style="@style/advanced_button"
+ android:contentDescription="@string/powerDesc"
+ android:text="@string/power" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1" >
+
+ <Button
+ android:id="@+id/leftParen"
+ style="@style/advanced_button"
+ android:contentDescription="@string/leftParenDesc"
+ android:text="@string/leftParen" />
+
+ <Button
+ android:id="@+id/rightParen"
+ style="@style/advanced_button"
+ android:contentDescription="@string/rightParenDesc"
+ android:text="@string/rightParen" />
+
+ <Button
+ android:id="@+id/sqrt"
+ style="@style/advanced_button"
+ android:contentDescription="@string/sqrtDesc"
+ android:text="@string/sqrt" />
+ </LinearLayout>
+
+</LinearLayout>
diff --git a/res/layout-sw600dp-land/main.xml b/res/layout-sw600dp-land/main.xml
index 3a86293..309afae 100644
--- a/res/layout-sw600dp-land/main.xml
+++ b/res/layout-sw600dp-land/main.xml
@@ -1,269 +1,55 @@
<?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.
- */
+ Copyright (C) 2014 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"
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
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">
+ android:orientation="vertical" >
+
+ <com.android.calculator2.CalculatorDisplay
+ android:id="@+id/display"
+ style="@style/display_holder_style"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ 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>
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="@dimen/group_padding"
- android:background="@drawable/calculator_input_field">
+ android:layout_height="360dp"
+ android:baselineAligned="false"
+ android:orientation="horizontal" >
- <com.android.calculator2.CalculatorDisplay
- android:id="@+id/display"
- android:layout_width="0dip"
+ <include
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
android:layout_weight="1"
- android:layout_height="wrap_content"
- maxDigits="@integer/max_digits"
- android:layout_alignParentTop="true"
- >
+ layout="@layout/simple_pad" />
- <com.android.calculator2.CalculatorEditText
- style="@style/display_style" />
- <com.android.calculator2.CalculatorEditText
- style="@style/display_style" />
-
- </com.android.calculator2.CalculatorDisplay>
-
- <FrameLayout
- android:layout_width="wrap_content"
+ <include
+ android:layout_width="0dp"
android:layout_height="match_parent"
- android:layout_alignParentTop="true">
- <Button
- android:id="@+id/clear"
- android:text="@string/clear"
- style="@style/btn_clear"
- android:minWidth="100dp"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:paddingLeft="5dip"
- android:paddingRight="5dip"
- android:contentDescription="@string/clearDesc" />
- <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"
- android:contentDescription="@string/delDesc" />
- </FrameLayout>
+ android:layout_weight="1"
+ layout="@layout/advanced_pad" />
</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"
- android:contentDescription="@string/sinDesc" />
- <Button
- android:id="@+id/ln"
- android:text="@string/ln"
- style="@style/btn_function_cell_style"
- android:contentDescription="@string/lnDesc" />
- </LinearLayout>
- <LinearLayout
- style="@style/btn_row_style">
- <Button
- android:id="@+id/cos"
- android:text="@string/cos"
- style="@style/btn_function_cell_style"
- android:contentDescription="@string/cosDesc" />
- <Button
- android:id="@+id/lg"
- android:text="@string/lg"
- style="@style/btn_function_cell_style"
- android:contentDescription="@string/lgDesc" />
- </LinearLayout>
- <LinearLayout
- style="@style/btn_row_style">
- <Button
- android:id="@+id/tan"
- android:text="@string/tan"
- style="@style/btn_function_cell_style"
- android:contentDescription="@string/tanDesc" />
- <Button
- android:id="@+id/e"
- android:text="@string/e"
- style="@style/btn_function_cell_style"
- android:contentDescription="@string/eDesc" />
- </LinearLayout>
- <LinearLayout
- style="@style/btn_row_style">
- <Button
- android:id="@+id/pi"
- android:text="@string/pi"
- style="@style/btn_function_cell_style"
- android:contentDescription="@string/piDesc" />
- <Button
- android:id="@+id/power"
- android:text="@string/power"
- style="@style/btn_function_cell_style"
- android:contentDescription="@string/powerDesc" />
- </LinearLayout>
- <LinearLayout
- style="@style/btn_row_style">
- <Button
- android:id="@+id/factorial"
- android:text="@string/factorial"
- style="@style/btn_function_cell_style"
- android:contentDescription="@string/factorialDesc" />
- <Button
- android:id="@+id/sqrt"
- android:text="@string/sqrt"
- style="@style/btn_function_cell_style"
- android:contentDescription="@string/sqrtDesc" />
- </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"
- android:contentDescription="@string/divDesc" />
- <Button
- android:id="@+id/leftParen"
- android:text="@string/leftParen"
- style="@style/btn_operation_cell_style"
- android:contentDescription="@string/leftParenDesc" />
- </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"
- android:contentDescription="@string/mulDesc" />
- <Button
- android:id="@+id/rightParen"
- android:text="@string/rightParen"
- style="@style/btn_operation_cell_style"
- android:contentDescription="@string/rightParenDesc" />
- </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"
- android:contentDescription="@string/minusDesc" />
- </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"
- android:contentDescription="@string/dotDesc" />
- <Button
- android:id="@+id/plus"
- android:text="@string/plus"
- style="@style/btn_operation_cell_style"
- android:contentDescription="@string/plusDesc" />
- </LinearLayout>
- </LinearLayout>
- <Button
- android:id="@+id/equal"
- android:text="@string/equal"
- style="@style/btn_operation_cell_style"
- android:contentDescription="@string/equalDesc" />
- </LinearLayout>
- </LinearLayout>
- </LinearLayout>
-</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-sw600dp-land/simple_pad.xml b/res/layout-sw600dp-land/simple_pad.xml
new file mode 100644
index 0000000..276e079
--- /dev/null
+++ b/res/layout-sw600dp-land/simple_pad.xml
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 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:id="@+id/simplePad"
+ style="@style/digit_pad"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:baselineAligned="true"
+ android:orientation="horizontal" >
+
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:orientation="vertical" >
+
+ <Button
+ android:id="@+id/digit7"
+ style="@style/digit_button"
+ android:text="@string/digit7" />
+
+ <Button
+ android:id="@+id/digit4"
+ style="@style/digit_button"
+ android:text="@string/digit4" />
+
+ <Button
+ android:id="@+id/digit1"
+ style="@style/digit_button"
+ android:text="@string/digit1" />
+
+ <Button
+ android:id="@+id/dot"
+ style="@style/digit_button"
+ android:contentDescription="@string/dotDesc"
+ android:text="@string/dot" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:orientation="vertical" >
+
+ <Button
+ android:id="@+id/digit8"
+ style="@style/digit_button"
+ android:text="@string/digit8" />
+
+ <Button
+ android:id="@+id/digit5"
+ style="@style/digit_button"
+ android:text="@string/digit5" />
+
+ <Button
+ android:id="@+id/digit2"
+ style="@style/digit_button"
+ android:text="@string/digit2" />
+
+ <Button
+ android:id="@+id/digit0"
+ style="@style/digit_button"
+ android:text="@string/digit0" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:orientation="vertical" >
+
+ <Button
+ android:id="@+id/digit9"
+ style="@style/digit_button"
+ android:text="@string/digit9" />
+
+ <Button
+ android:id="@+id/digit6"
+ style="@style/digit_button"
+ android:text="@string/digit6" />
+
+ <Button
+ android:id="@+id/digit3"
+ style="@style/digit_button"
+ android:text="@string/digit3" />
+
+ <Button
+ android:id="@+id/equal"
+ style="@style/digit_button"
+ android:contentDescription="@string/equalDesc"
+ android:text="@string/equal" />
+ </LinearLayout>
+
+ <LinearLayout
+ style="@style/function_pad"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:orientation="vertical" >
+
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="1" >
+
+ <ImageButton
+ android:id="@+id/del"
+ style="@style/function_button"
+ android:contentDescription="@string/delDesc"
+ android:src="@drawable/ic_delete"
+ android:textSize="@dimen/small_text_size" />
+
+ <Button
+ android:id="@+id/clear"
+ style="@style/function_button"
+ android:contentDescription="@string/clearDesc"
+ android:text="@string/clear"
+ android:textSize="@dimen/small_text_size"
+ android:visibility="invisible" />
+ </FrameLayout>
+
+ <Button
+ android:id="@+id/div"
+ style="@style/function_button"
+ android:contentDescription="@string/divDesc"
+ android:text="@string/div" />
+
+ <Button
+ android:id="@+id/mul"
+ style="@style/function_button"
+ android:contentDescription="@string/mulDesc"
+ android:text="@string/mul" />
+
+ <Button
+ android:id="@+id/minus"
+ style="@style/function_button"
+ android:contentDescription="@string/minusDesc"
+ android:text="@string/minus" />
+
+ <Button
+ android:id="@+id/plus"
+ style="@style/function_button"
+ android:contentDescription="@string/plusDesc"
+ android:text="@string/plus" />
+ </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-sw600dp/advanced_pad.xml b/res/layout-sw600dp/advanced_pad.xml
new file mode 100644
index 0000000..73409f1
--- /dev/null
+++ b/res/layout-sw600dp/advanced_pad.xml
@@ -0,0 +1,124 @@
+<?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:id="@+id/advancedPad"
+ style="@style/advanced_pad"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical" >
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1" >
+
+ <Button
+ android:id="@+id/sin"
+ style="@style/advanced_button_small"
+ android:contentDescription="@string/sinDesc"
+ android:text="@string/sin" />
+
+ <Button
+ android:id="@+id/cos"
+ style="@style/advanced_button_small"
+ android:contentDescription="@string/cosDesc"
+ android:text="@string/cos" />
+
+ <Button
+ android:id="@+id/tan"
+ style="@style/advanced_button_small"
+ android:contentDescription="@string/tanDesc"
+ android:text="@string/tan" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1" >
+
+ <Button
+ android:id="@+id/ln"
+ style="@style/advanced_button_small"
+ android:contentDescription="@string/lnDesc"
+ android:text="@string/ln" />
+
+ <Button
+ android:id="@+id/lg"
+ style="@style/advanced_button_small"
+ android:contentDescription="@string/lgDesc"
+ android:text="@string/lg" />
+
+ <Button
+ android:id="@+id/factorial"
+ style="@style/advanced_button"
+ android:contentDescription="@string/factorialDesc"
+ android:text="@string/factorial" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1" >
+
+ <Button
+ android:id="@+id/pi"
+ style="@style/advanced_button"
+ android:contentDescription="@string/piDesc"
+ android:text="@string/pi" />
+
+ <Button
+ android:id="@+id/e"
+ style="@style/advanced_button"
+ android:contentDescription="@string/eDesc"
+ android:text="@string/e" />
+
+ <Button
+ android:id="@+id/power"
+ style="@style/advanced_button"
+ android:contentDescription="@string/powerDesc"
+ android:text="@string/power" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1" >
+
+ <Button
+ android:id="@+id/leftParen"
+ style="@style/advanced_button"
+ android:contentDescription="@string/leftParenDesc"
+ android:text="@string/leftParen" />
+
+ <Button
+ android:id="@+id/rightParen"
+ style="@style/advanced_button"
+ android:contentDescription="@string/rightParenDesc"
+ android:text="@string/rightParen" />
+
+ <Button
+ android:id="@+id/sqrt"
+ style="@style/advanced_button"
+ android:contentDescription="@string/sqrtDesc"
+ android:text="@string/sqrt" />
+ </LinearLayout>
+
+</LinearLayout>
diff --git a/res/layout-sw600dp/main.xml b/res/layout-sw600dp/main.xml
index 89df4de..964fe48 100644
--- a/res/layout-sw600dp/main.xml
+++ b/res/layout-sw600dp/main.xml
@@ -1,254 +1,47 @@
<?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.
- */
+ Copyright (C) 2014 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"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
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:orientation="vertical" >
+
+ <com.android.calculator2.CalculatorDisplay
+ android:id="@+id/display"
+ style="@style/display_holder_style"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginBottom="@dimen/group_padding"
- android:background="@drawable/calculator_input_field">
+ maxDigits="@integer/max_digits" >
- <com.android.calculator2.CalculatorDisplay
- android:id="@+id/display"
- android:layout_width="0dp"
- android:layout_weight="1"
- android:layout_height="wrap_content"
- maxDigits="@integer/max_digits"
- android:layout_gravity="bottom"
- >
+ <com.android.calculator2.CalculatorEditText style="@style/display_style" />
- <com.android.calculator2.CalculatorEditText
- style="@style/display_style" />
- <com.android.calculator2.CalculatorEditText
- style="@style/display_style" />
+ <com.android.calculator2.CalculatorEditText style="@style/display_style" />
+ </com.android.calculator2.CalculatorDisplay>
- </com.android.calculator2.CalculatorDisplay>
-
- <FrameLayout
- android:layout_width="wrap_content"
- android:layout_height="match_parent">
- <Button
- android:id="@+id/clear"
- android:text="@string/clear"
- style="@style/btn_clear"
- android:minWidth="100dp"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:paddingLeft="5dip"
- android:paddingRight="5dip"
- android:contentDescription="@string/clearDesc" />
- <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"
- android:contentDescription="@string/delDesc" />
- </FrameLayout>
- </LinearLayout>
-
- <LinearLayout
+ <include
android:layout_width="match_parent"
- android:layout_height="0dip"
- android:layout_weight="2"
- android:orientation="vertical"
- android:layout_marginBottom="@dimen/group_padding">
+ android:layout_height="0dp"
+ android:layout_weight="1"
+ layout="@layout/advanced_pad" />
- <LinearLayout
- style="@style/btn_row_style">
- <Button
- android:id="@+id/sin"
- android:text="@string/sin"
- style="@style/btn_function_cell_style"
- android:contentDescription="@string/sinDesc" />
- <Button
- android:id="@+id/cos"
- android:text="@string/cos"
- style="@style/btn_function_cell_style"
- android:contentDescription="@string/cosDesc" />
- <Button
- android:id="@+id/tan"
- android:text="@string/tan"
- style="@style/btn_function_cell_style"
- android:contentDescription="@string/tanDesc" />
- <Button
- android:id="@+id/pi"
- android:text="@string/pi"
- style="@style/btn_function_cell_style"
- android:contentDescription="@string/piDesc" />
- <Button
- android:id="@+id/factorial"
- android:text="@string/factorial"
- style="@style/btn_function_cell_style"
- android:contentDescription="@string/factorialDesc" />
- </LinearLayout>
- <LinearLayout
- style="@style/btn_row_style">
- <Button
- android:id="@+id/ln"
- android:text="@string/ln"
- style="@style/btn_function_cell_style"
- android:contentDescription="@string/lnDesc" />
- <Button
- android:id="@+id/lg"
- android:text="@string/lg"
- style="@style/btn_function_cell_style"
- android:contentDescription="@string/lgDesc" />
- <Button
- android:id="@+id/e"
- android:text="@string/e"
- style="@style/btn_function_cell_style"
- android:contentDescription="@string/eDesc" />
- <Button
- android:id="@+id/power"
- android:text="@string/power"
- style="@style/btn_function_cell_style"
- android:contentDescription="@string/powerDesc" />
- <Button
- android:id="@+id/sqrt"
- android:text="@string/sqrt"
- style="@style/btn_function_cell_style"
- android:contentDescription="@string/sqrtDesc" />
- </LinearLayout>
-
- </LinearLayout>
-
- <LinearLayout
+ <include
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"
- android:contentDescription="@string/divDesc" />
- <Button
- android:id="@+id/leftParen"
- android:text="@string/leftParen"
- style="@style/btn_operation_cell_style"
- android:contentDescription="@string/leftParenDesc" />
- </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"
- android:contentDescription="@string/mulDesc" />
- <Button
- android:id="@+id/rightParen"
- android:text="@string/rightParen"
- style="@style/btn_operation_cell_style"
- android:contentDescription="@string/rightParenDesc" />
- </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"
- android:contentDescription="@string/minusDesc" />
- </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"
- android:contentDescription="@string/dotDesc" />
- <Button
- android:id="@+id/plus"
- android:text="@string/plus"
- style="@style/btn_operation_cell_style"
- android:contentDescription="@string/plusDesc" />
- </LinearLayout>
- </LinearLayout>
- <Button
- android:id="@+id/equal"
- android:text="@string/equal"
- style="@style/btn_operation_cell_style"
- android:contentDescription="@string/equalDesc" />
- </LinearLayout>
- </LinearLayout>
-</LinearLayout>
+ android:layout_height="0dp"
+ android:layout_weight="1"
+ layout="@layout/simple_pad" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-sw600dp/simple_pad.xml b/res/layout-sw600dp/simple_pad.xml
new file mode 100644
index 0000000..276e079
--- /dev/null
+++ b/res/layout-sw600dp/simple_pad.xml
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 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:id="@+id/simplePad"
+ style="@style/digit_pad"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:baselineAligned="true"
+ android:orientation="horizontal" >
+
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:orientation="vertical" >
+
+ <Button
+ android:id="@+id/digit7"
+ style="@style/digit_button"
+ android:text="@string/digit7" />
+
+ <Button
+ android:id="@+id/digit4"
+ style="@style/digit_button"
+ android:text="@string/digit4" />
+
+ <Button
+ android:id="@+id/digit1"
+ style="@style/digit_button"
+ android:text="@string/digit1" />
+
+ <Button
+ android:id="@+id/dot"
+ style="@style/digit_button"
+ android:contentDescription="@string/dotDesc"
+ android:text="@string/dot" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:orientation="vertical" >
+
+ <Button
+ android:id="@+id/digit8"
+ style="@style/digit_button"
+ android:text="@string/digit8" />
+
+ <Button
+ android:id="@+id/digit5"
+ style="@style/digit_button"
+ android:text="@string/digit5" />
+
+ <Button
+ android:id="@+id/digit2"
+ style="@style/digit_button"
+ android:text="@string/digit2" />
+
+ <Button
+ android:id="@+id/digit0"
+ style="@style/digit_button"
+ android:text="@string/digit0" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:orientation="vertical" >
+
+ <Button
+ android:id="@+id/digit9"
+ style="@style/digit_button"
+ android:text="@string/digit9" />
+
+ <Button
+ android:id="@+id/digit6"
+ style="@style/digit_button"
+ android:text="@string/digit6" />
+
+ <Button
+ android:id="@+id/digit3"
+ style="@style/digit_button"
+ android:text="@string/digit3" />
+
+ <Button
+ android:id="@+id/equal"
+ style="@style/digit_button"
+ android:contentDescription="@string/equalDesc"
+ android:text="@string/equal" />
+ </LinearLayout>
+
+ <LinearLayout
+ style="@style/function_pad"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:orientation="vertical" >
+
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="1" >
+
+ <ImageButton
+ android:id="@+id/del"
+ style="@style/function_button"
+ android:contentDescription="@string/delDesc"
+ android:src="@drawable/ic_delete"
+ android:textSize="@dimen/small_text_size" />
+
+ <Button
+ android:id="@+id/clear"
+ style="@style/function_button"
+ android:contentDescription="@string/clearDesc"
+ android:text="@string/clear"
+ android:textSize="@dimen/small_text_size"
+ android:visibility="invisible" />
+ </FrameLayout>
+
+ <Button
+ android:id="@+id/div"
+ style="@style/function_button"
+ android:contentDescription="@string/divDesc"
+ android:text="@string/div" />
+
+ <Button
+ android:id="@+id/mul"
+ style="@style/function_button"
+ android:contentDescription="@string/mulDesc"
+ android:text="@string/mul" />
+
+ <Button
+ android:id="@+id/minus"
+ style="@style/function_button"
+ android:contentDescription="@string/minusDesc"
+ android:text="@string/minus" />
+
+ <Button
+ android:id="@+id/plus"
+ style="@style/function_button"
+ android:contentDescription="@string/plusDesc"
+ android:text="@string/plus" />
+ </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/menu/menu.xml b/res/menu/menu.xml
deleted file mode 100644
index 21eb71a..0000000
--- a/res/menu/menu.xml
+++ /dev/null
@@ -1,37 +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.
- */
--->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
- <item android:id="@+id/clear_history"
- android:showAsAction="ifRoom|withText"
- android:icon="@drawable/clear_history"
- android:title="@string/clear_history"/>
-
- <item android:id="@+id/advanced"
- android:showAsAction="ifRoom|withText"
- android:icon="@drawable/advanced"
- android:title="@string/advanced"/>
-
- <item android:id="@+id/basic"
- android:showAsAction="ifRoom|withText"
- android:icon="@drawable/simple"
- android:title="@string/basic"/>
-
-</menu>
diff --git a/res/mipmap-hdpi/ic_launcher_calculator.png b/res/mipmap-hdpi/ic_launcher_calculator.png
index 008c565..737788f 100644
--- a/res/mipmap-hdpi/ic_launcher_calculator.png
+++ b/res/mipmap-hdpi/ic_launcher_calculator.png
Binary files differ
diff --git a/res/mipmap-mdpi/ic_launcher_calculator.png b/res/mipmap-mdpi/ic_launcher_calculator.png
index 8f02ef1..8500be8 100644
--- a/res/mipmap-mdpi/ic_launcher_calculator.png
+++ b/res/mipmap-mdpi/ic_launcher_calculator.png
Binary files differ
diff --git a/res/mipmap-xhdpi/ic_launcher_calculator.png b/res/mipmap-xhdpi/ic_launcher_calculator.png
index 9636c19..f7f2c15 100644
--- a/res/mipmap-xhdpi/ic_launcher_calculator.png
+++ b/res/mipmap-xhdpi/ic_launcher_calculator.png
Binary files differ
diff --git a/res/mipmap-xxhdpi/ic_launcher_calculator.png b/res/mipmap-xxhdpi/ic_launcher_calculator.png
index 13f4b6c..274bca7 100644
--- a/res/mipmap-xxhdpi/ic_launcher_calculator.png
+++ b/res/mipmap-xxhdpi/ic_launcher_calculator.png
Binary files differ
diff --git a/res/mipmap-xxxhdpi/ic_launcher_calculator.png b/res/mipmap-xxxhdpi/ic_launcher_calculator.png
index 8594b24..2ad08c2 100644
--- a/res/mipmap-xxxhdpi/ic_launcher_calculator.png
+++ b/res/mipmap-xxxhdpi/ic_launcher_calculator.png
Binary files differ
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 371bd33..2fac1d6 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!--
+ Copyright (C) 2007 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.
@@ -28,7 +29,7 @@
<string name="digit7" msgid="658125644218958447">"7"</string>
<string name="digit8" msgid="3134686906411558886">"8"</string>
<string name="digit9" msgid="765379157698748031">"9"</string>
- <string name="del" msgid="6248896117422989693">"VEE UIT"</string>
+ <string name="del" msgid="2051454354221101970">"DEL"</string>
<string name="clear" msgid="8103610981407459768">"CLR"</string>
<string name="sin" msgid="6793866152659175277">"sin"</string>
<string name="cos" msgid="6901841853098114414">"cos"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index ff96c4c..c384bb2 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!--
+ Copyright (C) 2007 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.
@@ -28,8 +29,8 @@
<string name="digit7" msgid="658125644218958447">"7"</string>
<string name="digit8" msgid="3134686906411558886">"8"</string>
<string name="digit9" msgid="765379157698748031">"9"</string>
- <string name="del" msgid="6248896117422989693">"ሰርዝ"</string>
- <string name="clear" msgid="8103610981407459768">"አጥራ"</string>
+ <string name="del" msgid="2051454354221101970">"DEL"</string>
+ <string name="clear" msgid="8103610981407459768">"አጽዳ"</string>
<string name="sin" msgid="6793866152659175277">"sin"</string>
<string name="cos" msgid="6901841853098114414">"cos"</string>
<string name="tan" msgid="7957459816738554960">"tan"</string>
@@ -40,7 +41,7 @@
<string name="rightParen" msgid="3177971166159324016">")"</string>
<string name="basic" msgid="7691469861698059753">"መሠረታዊ መደብ"</string>
<string name="advanced" msgid="7122495413742976492">"የላቀ ፓናል"</string>
- <string name="clear_history" msgid="8458043980601165012">"ታሪክ አጥራ"</string>
+ <string name="clear_history" msgid="8458043980601165012">"ታሪክ አጽዳ"</string>
<string name="text_copied_toast" msgid="5801480710472541833">"ፅሁፍ ተገልብጧል።"</string>
<string name="leftParenDesc" msgid="8446428211982811379">"የግራ ቅንፍ"</string>
<string name="rightParenDesc" msgid="9133691645148976523">"የቀኝ ቅንፍ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index cb82d25..65d1939 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!--
+ Copyright (C) 2007 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.
@@ -28,7 +29,7 @@
<string name="digit7" msgid="658125644218958447">"7"</string>
<string name="digit8" msgid="3134686906411558886">"8"</string>
<string name="digit9" msgid="765379157698748031">"9"</string>
- <string name="del" msgid="6248896117422989693">"حذف"</string>
+ <string name="del" msgid="2051454354221101970">"DEL"</string>
<string name="clear" msgid="8103610981407459768">"محو"</string>
<string name="sin" msgid="6793866152659175277">"sin"</string>
<string name="cos" msgid="6901841853098114414">"cos"</string>
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
new file mode 100644
index 0000000..8690819
--- /dev/null
+++ b/res/values-az-rAZ/strings.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2007 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 xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_name" msgid="8095131950334945205">"Kalkulyator"</string>
+ <string name="error" msgid="9197457880925804499">"Xəta"</string>
+ <string name="digit0" msgid="8069590963464434135">"0"</string>
+ <string name="digit1" msgid="8535041374797804029">"1"</string>
+ <string name="digit2" msgid="8977354203154316247">"2"</string>
+ <string name="digit3" msgid="148544090755132760">"3"</string>
+ <string name="digit4" msgid="2199490603838247678">"4"</string>
+ <string name="digit5" msgid="7568514524384173087">"5"</string>
+ <string name="digit6" msgid="6705952561049362551">"6"</string>
+ <string name="digit7" msgid="658125644218958447">"7"</string>
+ <string name="digit8" msgid="3134686906411558886">"8"</string>
+ <string name="digit9" msgid="765379157698748031">"9"</string>
+ <string name="del" msgid="6248896117422989693">"SİLİN"</string>
+ <string name="clear" msgid="8103610981407459768">"CLR"</string>
+ <string name="sin" msgid="6793866152659175277">"sin"</string>
+ <string name="cos" msgid="6901841853098114414">"kos"</string>
+ <string name="tan" msgid="7957459816738554960">"qaralt"</string>
+ <string name="e" msgid="1377847800971731483">"e"</string>
+ <string name="ln" msgid="6888500680285403344">"in"</string>
+ <string name="lg" msgid="873623857385418182">"qeydiyyat"</string>
+ <string name="leftParen" msgid="4850643713953092099">"("</string>
+ <string name="rightParen" msgid="3177971166159324016">")"</string>
+ <string name="basic" msgid="7691469861698059753">"Əsas panel"</string>
+ <string name="advanced" msgid="7122495413742976492">"Ətraflı panel"</string>
+ <string name="clear_history" msgid="8458043980601165012">"Tarixçəni silin"</string>
+ <string name="text_copied_toast" msgid="5801480710472541833">"Mətn kopyalandı."</string>
+ <string name="leftParenDesc" msgid="8446428211982811379">"sol mötərizə"</string>
+ <string name="rightParenDesc" msgid="9133691645148976523">"sağ mötərizə"</string>
+ <string name="factorialDesc" msgid="9217024218012761574">"faktorial"</string>
+ <string name="lnDesc" msgid="1052579286300842270">"təbii loqaritm"</string>
+ <string name="lgDesc" msgid="6490920451513731160">"loqaritm"</string>
+ <string name="sqrtDesc" msgid="2247252128762219267">"kvadrat kök"</string>
+ <string name="divDesc" msgid="7442623079124315427">"böl"</string>
+ <string name="mulDesc" msgid="9003016819648670694">"çoxaltmaq"</string>
+ <string name="plusDesc" msgid="3145322700823848264">"plus"</string>
+ <string name="minusDesc" msgid="5033462008907390900">"minus"</string>
+ <string name="dotDesc" msgid="5253752241630161722">"nöqtə"</string>
+ <string name="powerDesc" msgid="9034898318444176910">"güc"</string>
+ <string name="delDesc" msgid="8211175878012032240">"silin"</string>
+ <string name="clearDesc" msgid="8015748901120751476">"Təmizləyin"</string>
+ <string name="tanDesc" msgid="2055554933130702423">"toxunan"</string>
+ <string name="sinDesc" msgid="6563285042235077204">"sinus"</string>
+ <string name="cosDesc" msgid="4048942450207926538">"kosinus"</string>
+ <string name="eDesc" msgid="6709583372168924068">"Euler\'in nömrəsi"</string>
+ <string name="piDesc" msgid="8838151606775021517">"pi"</string>
+ <string name="equalDesc" msgid="4164435100263313101">"bərabərliklər"</string>
+ <string-array name="operatorDescs">
+ <item msgid="7903565108986789641">"sol mötərizə"</item>
+ <item msgid="1688156211934459752">"sağ mötərizə"</item>
+ <item msgid="6664829080840305856">"faktorial"</item>
+ <item msgid="2880199289575144121">"təbii loqaritm"</item>
+ <item msgid="4398774906998694599">"loqaritm"</item>
+ <item msgid="1791869359785943266">"kvadrat kök"</item>
+ <item msgid="6833720171974254459">"bölünmə"</item>
+ <item msgid="2646574635189709515">"vurma"</item>
+ <item msgid="3487936384379753697">"plus"</item>
+ <item msgid="8608534484562258856">"minus"</item>
+ <item msgid="3456824579675198186">" nöqtə "</item>
+ <item msgid="4528629783180278651">"güc"</item>
+ <item msgid="4050948027333760159">"toxunan"</item>
+ <item msgid="8716478860618683850">"sinus"</item>
+ <item msgid="3203211483560707480">"kosinus"</item>
+ <item msgid="8587490959348493065">"pi"</item>
+ <item msgid="8134315487552198394">"bərabərdir"</item>
+ </string-array>
+</resources>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
new file mode 100644
index 0000000..8690819
--- /dev/null
+++ b/res/values-az/strings.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2007 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 xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_name" msgid="8095131950334945205">"Kalkulyator"</string>
+ <string name="error" msgid="9197457880925804499">"Xəta"</string>
+ <string name="digit0" msgid="8069590963464434135">"0"</string>
+ <string name="digit1" msgid="8535041374797804029">"1"</string>
+ <string name="digit2" msgid="8977354203154316247">"2"</string>
+ <string name="digit3" msgid="148544090755132760">"3"</string>
+ <string name="digit4" msgid="2199490603838247678">"4"</string>
+ <string name="digit5" msgid="7568514524384173087">"5"</string>
+ <string name="digit6" msgid="6705952561049362551">"6"</string>
+ <string name="digit7" msgid="658125644218958447">"7"</string>
+ <string name="digit8" msgid="3134686906411558886">"8"</string>
+ <string name="digit9" msgid="765379157698748031">"9"</string>
+ <string name="del" msgid="6248896117422989693">"SİLİN"</string>
+ <string name="clear" msgid="8103610981407459768">"CLR"</string>
+ <string name="sin" msgid="6793866152659175277">"sin"</string>
+ <string name="cos" msgid="6901841853098114414">"kos"</string>
+ <string name="tan" msgid="7957459816738554960">"qaralt"</string>
+ <string name="e" msgid="1377847800971731483">"e"</string>
+ <string name="ln" msgid="6888500680285403344">"in"</string>
+ <string name="lg" msgid="873623857385418182">"qeydiyyat"</string>
+ <string name="leftParen" msgid="4850643713953092099">"("</string>
+ <string name="rightParen" msgid="3177971166159324016">")"</string>
+ <string name="basic" msgid="7691469861698059753">"Əsas panel"</string>
+ <string name="advanced" msgid="7122495413742976492">"Ətraflı panel"</string>
+ <string name="clear_history" msgid="8458043980601165012">"Tarixçəni silin"</string>
+ <string name="text_copied_toast" msgid="5801480710472541833">"Mətn kopyalandı."</string>
+ <string name="leftParenDesc" msgid="8446428211982811379">"sol mötərizə"</string>
+ <string name="rightParenDesc" msgid="9133691645148976523">"sağ mötərizə"</string>
+ <string name="factorialDesc" msgid="9217024218012761574">"faktorial"</string>
+ <string name="lnDesc" msgid="1052579286300842270">"təbii loqaritm"</string>
+ <string name="lgDesc" msgid="6490920451513731160">"loqaritm"</string>
+ <string name="sqrtDesc" msgid="2247252128762219267">"kvadrat kök"</string>
+ <string name="divDesc" msgid="7442623079124315427">"böl"</string>
+ <string name="mulDesc" msgid="9003016819648670694">"çoxaltmaq"</string>
+ <string name="plusDesc" msgid="3145322700823848264">"plus"</string>
+ <string name="minusDesc" msgid="5033462008907390900">"minus"</string>
+ <string name="dotDesc" msgid="5253752241630161722">"nöqtə"</string>
+ <string name="powerDesc" msgid="9034898318444176910">"güc"</string>
+ <string name="delDesc" msgid="8211175878012032240">"silin"</string>
+ <string name="clearDesc" msgid="8015748901120751476">"Təmizləyin"</string>
+ <string name="tanDesc" msgid="2055554933130702423">"toxunan"</string>
+ <string name="sinDesc" msgid="6563285042235077204">"sinus"</string>
+ <string name="cosDesc" msgid="4048942450207926538">"kosinus"</string>
+ <string name="eDesc" msgid="6709583372168924068">"Euler\'in nömrəsi"</string>
+ <string name="piDesc" msgid="8838151606775021517">"pi"</string>
+ <string name="equalDesc" msgid="4164435100263313101">"bərabərliklər"</string>
+ <string-array name="operatorDescs">
+ <item msgid="7903565108986789641">"sol mötərizə"</item>
+ <item msgid="1688156211934459752">"sağ mötərizə"</item>
+ <item msgid="6664829080840305856">"faktorial"</item>
+ <item msgid="2880199289575144121">"təbii loqaritm"</item>
+ <item msgid="4398774906998694599">"loqaritm"</item>
+ <item msgid="1791869359785943266">"kvadrat kök"</item>
+ <item msgid="6833720171974254459">"bölünmə"</item>
+ <item msgid="2646574635189709515">"vurma"</item>
+ <item msgid="3487936384379753697">"plus"</item>
+ <item msgid="8608534484562258856">"minus"</item>
+ <item msgid="3456824579675198186">" nöqtə "</item>
+ <item msgid="4528629783180278651">"güc"</item>
+ <item msgid="4050948027333760159">"toxunan"</item>
+ <item msgid="8716478860618683850">"sinus"</item>
+ <item msgid="3203211483560707480">"kosinus"</item>
+ <item msgid="8587490959348493065">"pi"</item>
+ <item msgid="8134315487552198394">"bərabərdir"</item>
+ </string-array>
+</resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
deleted file mode 100644
index afb86ad..0000000
--- a/res/values-be/strings.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2007 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 xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_name" msgid="8095131950334945205">"Калькулятар"</string>
- <string name="error" msgid="9197457880925804499">"Памылка"</string>
- <string name="digit0" msgid="8069590963464434135">"0"</string>
- <string name="digit1" msgid="8535041374797804029">"1"</string>
- <string name="digit2" msgid="8977354203154316247">"2"</string>
- <string name="digit3" msgid="148544090755132760">"3"</string>
- <string name="digit4" msgid="2199490603838247678">"4"</string>
- <string name="digit5" msgid="7568514524384173087">"5"</string>
- <string name="digit6" msgid="6705952561049362551">"6"</string>
- <string name="digit7" msgid="658125644218958447">"7"</string>
- <string name="digit8" msgid="3134686906411558886">"8"</string>
- <string name="digit9" msgid="765379157698748031">"9"</string>
- <string name="del" msgid="6248896117422989693">"ВЫДАЛІЦЬ"</string>
- <string name="clear" msgid="8103610981407459768">"CLR"</string>
- <string name="sin" msgid="6793866152659175277">"сін"</string>
- <string name="cos" msgid="6901841853098114414">"кос"</string>
- <string name="tan" msgid="7957459816738554960">"Тан"</string>
- <string name="e" msgid="1377847800971731483">"е"</string>
- <string name="ln" msgid="6888500680285403344">"нат. лог."</string>
- <string name="lg" msgid="873623857385418182">"часопic"</string>
- <string name="leftParen" msgid="4850643713953092099">"("</string>
- <string name="rightParen" msgid="3177971166159324016">")"</string>
- <string name="basic" msgid="7691469861698059753">"Звычайная панэль"</string>
- <string name="advanced" msgid="7122495413742976492">"Пашыраная панэль"</string>
- <string name="clear_history" msgid="8458043980601165012">"Выдаліць гісторыю"</string>
- <string name="text_copied_toast" msgid="5801480710472541833">"Тэкст скапіяваны"</string>
- <string name="leftParenDesc" msgid="8446428211982811379">"левая дужка"</string>
- <string name="rightParenDesc" msgid="9133691645148976523">"правая дужка"</string>
- <string name="factorialDesc" msgid="9217024218012761574">"фактарыял"</string>
- <string name="lnDesc" msgid="1052579286300842270">"натуральны лагарыфм"</string>
- <string name="lgDesc" msgid="6490920451513731160">"лагарыфм"</string>
- <string name="sqrtDesc" msgid="2247252128762219267">"квадратны корань"</string>
- <string name="divDesc" msgid="7442623079124315427">"падзяліць"</string>
- <string name="mulDesc" msgid="9003016819648670694">"памножыць"</string>
- <string name="plusDesc" msgid="3145322700823848264">"плюс"</string>
- <string name="minusDesc" msgid="5033462008907390900">"мінус"</string>
- <string name="dotDesc" msgid="5253752241630161722">"коска"</string>
- <string name="powerDesc" msgid="9034898318444176910">"сілкаванне"</string>
- <string name="delDesc" msgid="8211175878012032240">"выдаліць"</string>
- <string name="clearDesc" msgid="8015748901120751476">"ачысціць"</string>
- <string name="tanDesc" msgid="2055554933130702423">"тангенс"</string>
- <string name="sinDesc" msgid="6563285042235077204">"сінус"</string>
- <string name="cosDesc" msgid="4048942450207926538">"косінус"</string>
- <string name="eDesc" msgid="6709583372168924068">"лік Эйлера"</string>
- <string name="piDesc" msgid="8838151606775021517">"пі"</string>
- <string name="equalDesc" msgid="4164435100263313101">"роўна"</string>
- <string-array name="operatorDescs">
- <item msgid="7903565108986789641">"левая дужка"</item>
- <item msgid="1688156211934459752">"правая дужка"</item>
- <item msgid="6664829080840305856">"фактарыял"</item>
- <item msgid="2880199289575144121">"натуральны лагарыфм"</item>
- <item msgid="4398774906998694599">"лагарыфм"</item>
- <item msgid="1791869359785943266">"квадратны корань"</item>
- <item msgid="6833720171974254459">"дзеліцца на"</item>
- <item msgid="2646574635189709515">"памнажаецца на"</item>
- <item msgid="3487936384379753697">"плюс"</item>
- <item msgid="8608534484562258856">"мінус"</item>
- <item msgid="3456824579675198186">" кропка "</item>
- <item msgid="4528629783180278651">"сілкаванне"</item>
- <item msgid="4050948027333760159">"тангенс"</item>
- <item msgid="8716478860618683850">"сінус"</item>
- <item msgid="3203211483560707480">"косінус"</item>
- <item msgid="8587490959348493065">"пі"</item>
- <item msgid="8134315487552198394">"роўна"</item>
- </string-array>
-</resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 48a4d29..d0c8d50 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!--
+ Copyright (C) 2007 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.
@@ -28,7 +29,7 @@
<string name="digit7" msgid="658125644218958447">"7"</string>
<string name="digit8" msgid="3134686906411558886">"8"</string>
<string name="digit9" msgid="765379157698748031">"9"</string>
- <string name="del" msgid="6248896117422989693">"ИЗТРИВАНЕ"</string>
+ <string name="del" msgid="2051454354221101970">"DEL"</string>
<string name="clear" msgid="8103610981407459768">"CLR"</string>
<string name="sin" msgid="6793866152659175277">"sin"</string>
<string name="cos" msgid="6901841853098114414">"cos"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index c4bff1b..712668b 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!--
+ Copyright (C) 2007 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.
@@ -28,7 +29,7 @@
<string name="digit7" msgid="658125644218958447">"7"</string>
<string name="digit8" msgid="3134686906411558886">"8"</string>
<string name="digit9" msgid="765379157698748031">"9"</string>
- <string name="del" msgid="6248896117422989693">"SUPRIMEIX"</string>
+ <string name="del" msgid="2051454354221101970">"SUPR"</string>
<string name="clear" msgid="8103610981407459768">"CLR"</string>
<string name="sin" msgid="6793866152659175277">"sin"</string>
<string name="cos" msgid="6901841853098114414">"cos"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 6c53e1c..2b75652 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!--
+ Copyright (C) 2007 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.
@@ -28,7 +29,7 @@
<string name="digit7" msgid="658125644218958447">"7"</string>
<string name="digit8" msgid="3134686906411558886">"8"</string>
<string name="digit9" msgid="765379157698748031">"9"</string>
- <string name="del" msgid="6248896117422989693">"SMAZAT"</string>
+ <string name="del" msgid="2051454354221101970">"DEL"</string>
<string name="clear" msgid="8103610981407459768">"CLR"</string>
<string name="sin" msgid="6793866152659175277">"sin"</string>
<string name="cos" msgid="6901841853098114414">"cos"</string>
@@ -74,7 +75,7 @@
<item msgid="3487936384379753697">"plus"</item>
<item msgid="8608534484562258856">"mínus"</item>
<item msgid="3456824579675198186">" bod "</item>
- <item msgid="4528629783180278651">"síla"</item>
+ <item msgid="4528629783180278651">"mocnina"</item>
<item msgid="4050948027333760159">"tangens"</item>
<item msgid="8716478860618683850">"sinus"</item>
<item msgid="3203211483560707480">"kosinus"</item>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 2fe8913..a8b3c59 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!--
+ Copyright (C) 2007 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.
@@ -16,7 +17,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_name" msgid="8095131950334945205">"Lommereg."</string>
+ <string name="app_name" msgid="8095131950334945205">"Lommeregner"</string>
<string name="error" msgid="9197457880925804499">"Fejl"</string>
<string name="digit0" msgid="8069590963464434135">"0"</string>
<string name="digit1" msgid="8535041374797804029">"1"</string>
@@ -28,7 +29,7 @@
<string name="digit7" msgid="658125644218958447">"7"</string>
<string name="digit8" msgid="3134686906411558886">"8"</string>
<string name="digit9" msgid="765379157698748031">"9"</string>
- <string name="del" msgid="6248896117422989693">"SLET"</string>
+ <string name="del" msgid="2051454354221101970">"SLET"</string>
<string name="clear" msgid="8103610981407459768">"RYD"</string>
<string name="sin" msgid="6793866152659175277">"sin"</string>
<string name="cos" msgid="6901841853098114414">"cos"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 6579c77..b7e4589 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!--
+ Copyright (C) 2007 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.
@@ -28,7 +29,7 @@
<string name="digit7" msgid="658125644218958447">"7"</string>
<string name="digit8" msgid="3134686906411558886">"8"</string>
<string name="digit9" msgid="765379157698748031">"9"</string>
- <string name="del" msgid="6248896117422989693">"Löschen"</string>
+ <string name="del" msgid="2051454354221101970">"Entf"</string>
<string name="clear" msgid="8103610981407459768">"Löschen"</string>
<string name="sin" msgid="6793866152659175277">"sin"</string>
<string name="cos" msgid="6901841853098114414">"cos"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index f8b2263..22d10f0 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!--
+ Copyright (C) 2007 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.
@@ -28,7 +29,7 @@
<string name="digit7" msgid="658125644218958447">"7"</string>
<string name="digit8" msgid="3134686906411558886">"8"</string>
<string name="digit9" msgid="765379157698748031">"9"</string>
- <string name="del" msgid="6248896117422989693">"DELETE"</string>
+ <string name="del" msgid="2051454354221101970">"DEL"</string>
<string name="clear" msgid="8103610981407459768">"ΔΙΑΓΡ."</string>
<string name="sin" msgid="6793866152659175277">"sin"</string>
<string name="cos" msgid="6901841853098114414">"cos"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index d944932..8fe689a 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!--
+ Copyright (C) 2007 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.
@@ -28,7 +29,7 @@
<string name="digit7" msgid="658125644218958447">"7"</string>
<string name="digit8" msgid="3134686906411558886">"8"</string>
<string name="digit9" msgid="765379157698748031">"9"</string>
- <string name="del" msgid="6248896117422989693">"DELETE"</string>
+ <string name="del" msgid="2051454354221101970">"DEL"</string>
<string name="clear" msgid="8103610981407459768">"CLR"</string>
<string name="sin" msgid="6793866152659175277">"sin"</string>
<string name="cos" msgid="6901841853098114414">"cos"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000..8fe689a
--- /dev/null
+++ b/res/values-en-rIN/strings.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2007 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 xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_name" msgid="8095131950334945205">"Calculator"</string>
+ <string name="error" msgid="9197457880925804499">"Error"</string>
+ <string name="digit0" msgid="8069590963464434135">"0"</string>
+ <string name="digit1" msgid="8535041374797804029">"1"</string>
+ <string name="digit2" msgid="8977354203154316247">"2"</string>
+ <string name="digit3" msgid="148544090755132760">"3"</string>
+ <string name="digit4" msgid="2199490603838247678">"4"</string>
+ <string name="digit5" msgid="7568514524384173087">"5"</string>
+ <string name="digit6" msgid="6705952561049362551">"6"</string>
+ <string name="digit7" msgid="658125644218958447">"7"</string>
+ <string name="digit8" msgid="3134686906411558886">"8"</string>
+ <string name="digit9" msgid="765379157698748031">"9"</string>
+ <string name="del" msgid="2051454354221101970">"DEL"</string>
+ <string name="clear" msgid="8103610981407459768">"CLR"</string>
+ <string name="sin" msgid="6793866152659175277">"sin"</string>
+ <string name="cos" msgid="6901841853098114414">"cos"</string>
+ <string name="tan" msgid="7957459816738554960">"tan"</string>
+ <string name="e" msgid="1377847800971731483">"e"</string>
+ <string name="ln" msgid="6888500680285403344">"ln"</string>
+ <string name="lg" msgid="873623857385418182">"log"</string>
+ <string name="leftParen" msgid="4850643713953092099">"("</string>
+ <string name="rightParen" msgid="3177971166159324016">")"</string>
+ <string name="basic" msgid="7691469861698059753">"Basic panel"</string>
+ <string name="advanced" msgid="7122495413742976492">"Advanced panel"</string>
+ <string name="clear_history" msgid="8458043980601165012">"Clear history"</string>
+ <string name="text_copied_toast" msgid="5801480710472541833">"Text copied."</string>
+ <string name="leftParenDesc" msgid="8446428211982811379">"left parenthesis"</string>
+ <string name="rightParenDesc" msgid="9133691645148976523">"right parenthesis"</string>
+ <string name="factorialDesc" msgid="9217024218012761574">"factorial"</string>
+ <string name="lnDesc" msgid="1052579286300842270">"natural logarithm"</string>
+ <string name="lgDesc" msgid="6490920451513731160">"logarithm"</string>
+ <string name="sqrtDesc" msgid="2247252128762219267">"square root"</string>
+ <string name="divDesc" msgid="7442623079124315427">"divide"</string>
+ <string name="mulDesc" msgid="9003016819648670694">"multiply"</string>
+ <string name="plusDesc" msgid="3145322700823848264">"plus"</string>
+ <string name="minusDesc" msgid="5033462008907390900">"minus"</string>
+ <string name="dotDesc" msgid="5253752241630161722">"point"</string>
+ <string name="powerDesc" msgid="9034898318444176910">"power"</string>
+ <string name="delDesc" msgid="8211175878012032240">"delete"</string>
+ <string name="clearDesc" msgid="8015748901120751476">"clear"</string>
+ <string name="tanDesc" msgid="2055554933130702423">"tangent"</string>
+ <string name="sinDesc" msgid="6563285042235077204">"sine"</string>
+ <string name="cosDesc" msgid="4048942450207926538">"cosine"</string>
+ <string name="eDesc" msgid="6709583372168924068">"Euler\'s number"</string>
+ <string name="piDesc" msgid="8838151606775021517">"pi"</string>
+ <string name="equalDesc" msgid="4164435100263313101">"equals"</string>
+ <string-array name="operatorDescs">
+ <item msgid="7903565108986789641">"left parenthesis"</item>
+ <item msgid="1688156211934459752">"right parenthesis"</item>
+ <item msgid="6664829080840305856">"factorial"</item>
+ <item msgid="2880199289575144121">"natural logarithm"</item>
+ <item msgid="4398774906998694599">"logarithm"</item>
+ <item msgid="1791869359785943266">"square root"</item>
+ <item msgid="6833720171974254459">"divided by"</item>
+ <item msgid="2646574635189709515">"multiplied by"</item>
+ <item msgid="3487936384379753697">"plus"</item>
+ <item msgid="8608534484562258856">"minus"</item>
+ <item msgid="3456824579675198186">" point "</item>
+ <item msgid="4528629783180278651">"power"</item>
+ <item msgid="4050948027333760159">"tangent"</item>
+ <item msgid="8716478860618683850">"sine"</item>
+ <item msgid="3203211483560707480">"cosine"</item>
+ <item msgid="8587490959348493065">"pi"</item>
+ <item msgid="8134315487552198394">"equals"</item>
+ </string-array>
+</resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 979e8b6..6d6f4df 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!--
+ Copyright (C) 2007 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.
@@ -28,7 +29,7 @@
<string name="digit7" msgid="658125644218958447">"7"</string>
<string name="digit8" msgid="3134686906411558886">"8"</string>
<string name="digit9" msgid="765379157698748031">"9"</string>
- <string name="del" msgid="6248896117422989693">"ELIMINAR"</string>
+ <string name="del" msgid="2051454354221101970">"ELIMINAR"</string>
<string name="clear" msgid="8103610981407459768">"CLR"</string>
<string name="sin" msgid="6793866152659175277">"sen"</string>
<string name="cos" msgid="6901841853098114414">"cos"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 8234d8d..f62832e 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!--
+ Copyright (C) 2007 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.
@@ -28,7 +29,7 @@
<string name="digit7" msgid="658125644218958447">"7"</string>
<string name="digit8" msgid="3134686906411558886">"8"</string>
<string name="digit9" msgid="765379157698748031">"9"</string>
- <string name="del" msgid="6248896117422989693">"BORRAR"</string>
+ <string name="del" msgid="2051454354221101970">"DEL"</string>
<string name="clear" msgid="8103610981407459768">"BORRAR"</string>
<string name="sin" msgid="6793866152659175277">"sen"</string>
<string name="cos" msgid="6901841853098114414">"cos"</string>
diff --git a/res/values-et/strings.xml b/res/values-et-rEE/strings.xml
similarity index 97%
rename from res/values-et/strings.xml
rename to res/values-et-rEE/strings.xml
index 769cc9a..6f57aa4 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!--
+ Copyright (C) 2007 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.
@@ -28,7 +29,7 @@
<string name="digit7" msgid="658125644218958447">"7"</string>
<string name="digit8" msgid="3134686906411558886">"8"</string>
<string name="digit9" msgid="765379157698748031">"9"</string>
- <string name="del" msgid="6248896117422989693">"KUSTUTA"</string>
+ <string name="del" msgid="2051454354221101970">"DEL"</string>
<string name="clear" msgid="8103610981407459768">"CLR"</string>
<string name="sin" msgid="6793866152659175277">"sin"</string>
<string name="cos" msgid="6901841853098114414">"cos"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 51fc294..b77cb39 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!--
+ Copyright (C) 2007 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.
@@ -28,7 +29,7 @@
<string name="digit7" msgid="658125644218958447">"7"</string>
<string name="digit8" msgid="3134686906411558886">"8"</string>
<string name="digit9" msgid="765379157698748031">"9"</string>
- <string name="del" msgid="6248896117422989693">"حذف"</string>
+ <string name="del" msgid="2051454354221101970">"حذف"</string>
<string name="clear" msgid="8103610981407459768">"پاک"</string>
<string name="sin" msgid="6793866152659175277">"sin"</string>
<string name="cos" msgid="6901841853098114414">"cos"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 801280c..c19e57a 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!--
+ Copyright (C) 2007 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.
@@ -28,7 +29,7 @@
<string name="digit7" msgid="658125644218958447">"7"</string>
<string name="digit8" msgid="3134686906411558886">"8"</string>
<string name="digit9" msgid="765379157698748031">"9"</string>
- <string name="del" msgid="6248896117422989693">"POISTA"</string>
+ <string name="del" msgid="2051454354221101970">"DEL"</string>
<string name="clear" msgid="8103610981407459768">"CLR"</string>
<string name="sin" msgid="6793866152659175277">"sin"</string>
<string name="cos" msgid="6901841853098114414">"cos"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
new file mode 100644
index 0000000..6e8a029
--- /dev/null
+++ b/res/values-fr-rCA/strings.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2007 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 xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_name" msgid="8095131950334945205">"Calculatrice"</string>
+ <string name="error" msgid="9197457880925804499">"Erreur"</string>
+ <string name="digit0" msgid="8069590963464434135">"0"</string>
+ <string name="digit1" msgid="8535041374797804029">"1"</string>
+ <string name="digit2" msgid="8977354203154316247">"2"</string>
+ <string name="digit3" msgid="148544090755132760">"3"</string>
+ <string name="digit4" msgid="2199490603838247678">"4"</string>
+ <string name="digit5" msgid="7568514524384173087">"5"</string>
+ <string name="digit6" msgid="6705952561049362551">"6"</string>
+ <string name="digit7" msgid="658125644218958447">"7"</string>
+ <string name="digit8" msgid="3134686906411558886">"8"</string>
+ <string name="digit9" msgid="765379157698748031">"9"</string>
+ <string name="del" msgid="2051454354221101970">"SUPPR."</string>
+ <string name="clear" msgid="8103610981407459768">"EFF."</string>
+ <string name="sin" msgid="6793866152659175277">"sin"</string>
+ <string name="cos" msgid="6901841853098114414">"cos"</string>
+ <string name="tan" msgid="7957459816738554960">"tan"</string>
+ <string name="e" msgid="1377847800971731483">"e"</string>
+ <string name="ln" msgid="6888500680285403344">"ln"</string>
+ <string name="lg" msgid="873623857385418182">"log"</string>
+ <string name="leftParen" msgid="4850643713953092099">"("</string>
+ <string name="rightParen" msgid="3177971166159324016">")"</string>
+ <string name="basic" msgid="7691469861698059753">"Panneau de base"</string>
+ <string name="advanced" msgid="7122495413742976492">"Fonctions avancées"</string>
+ <string name="clear_history" msgid="8458043980601165012">"Effacer l\'historique"</string>
+ <string name="text_copied_toast" msgid="5801480710472541833">"Texte copié."</string>
+ <string name="leftParenDesc" msgid="8446428211982811379">"parenthèse gauche"</string>
+ <string name="rightParenDesc" msgid="9133691645148976523">"parenthèse droite"</string>
+ <string name="factorialDesc" msgid="9217024218012761574">"factoriel"</string>
+ <string name="lnDesc" msgid="1052579286300842270">"logarithme naturel"</string>
+ <string name="lgDesc" msgid="6490920451513731160">"logarithme"</string>
+ <string name="sqrtDesc" msgid="2247252128762219267">"racine carrée"</string>
+ <string name="divDesc" msgid="7442623079124315427">"diviser"</string>
+ <string name="mulDesc" msgid="9003016819648670694">"multiplier"</string>
+ <string name="plusDesc" msgid="3145322700823848264">"plus"</string>
+ <string name="minusDesc" msgid="5033462008907390900">"moins"</string>
+ <string name="dotDesc" msgid="5253752241630161722">"point"</string>
+ <string name="powerDesc" msgid="9034898318444176910">"puissance"</string>
+ <string name="delDesc" msgid="8211175878012032240">"Supprimer"</string>
+ <string name="clearDesc" msgid="8015748901120751476">"effacer"</string>
+ <string name="tanDesc" msgid="2055554933130702423">"tangeante"</string>
+ <string name="sinDesc" msgid="6563285042235077204">"sinus"</string>
+ <string name="cosDesc" msgid="4048942450207926538">"cosinus"</string>
+ <string name="eDesc" msgid="6709583372168924068">"nombre d\'Euler"</string>
+ <string name="piDesc" msgid="8838151606775021517">"pi"</string>
+ <string name="equalDesc" msgid="4164435100263313101">"signe égal"</string>
+ <string-array name="operatorDescs">
+ <item msgid="7903565108986789641">"parenthèse gauche"</item>
+ <item msgid="1688156211934459752">"parenthèse droite"</item>
+ <item msgid="6664829080840305856">"factoriel"</item>
+ <item msgid="2880199289575144121">"logarithme naturel"</item>
+ <item msgid="4398774906998694599">"logarithme"</item>
+ <item msgid="1791869359785943266">"racine carrée"</item>
+ <item msgid="6833720171974254459">"divisé par"</item>
+ <item msgid="2646574635189709515">"multiplié par"</item>
+ <item msgid="3487936384379753697">"plus"</item>
+ <item msgid="8608534484562258856">"moins"</item>
+ <item msgid="3456824579675198186">" point "</item>
+ <item msgid="4528629783180278651">"puissance"</item>
+ <item msgid="4050948027333760159">"tangeante"</item>
+ <item msgid="8716478860618683850">"sinus"</item>
+ <item msgid="3203211483560707480">"cosinus"</item>
+ <item msgid="8587490959348493065">"pi"</item>
+ <item msgid="8134315487552198394">"signe égal"</item>
+ </string-array>
+</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 7fb29c8..70e4a32 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!--
+ Copyright (C) 2007 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.
@@ -28,7 +29,7 @@
<string name="digit7" msgid="658125644218958447">"7"</string>
<string name="digit8" msgid="3134686906411558886">"8"</string>
<string name="digit9" msgid="765379157698748031">"9"</string>
- <string name="del" msgid="6248896117422989693">"SUPPRIMER"</string>
+ <string name="del" msgid="2051454354221101970">"SUPPR."</string>
<string name="clear" msgid="8103610981407459768">"EFF."</string>
<string name="sin" msgid="6793866152659175277">"sin"</string>
<string name="cos" msgid="6901841853098114414">"cos"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 6fe585e..5f0f0db 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!--
+ Copyright (C) 2007 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.
@@ -28,7 +29,7 @@
<string name="digit7" msgid="658125644218958447">"7"</string>
<string name="digit8" msgid="3134686906411558886">"8"</string>
<string name="digit9" msgid="765379157698748031">"9"</string>
- <string name="del" msgid="6248896117422989693">"DELETE"</string>
+ <string name="del" msgid="2051454354221101970">"DEL"</string>
<string name="clear" msgid="8103610981407459768">"CLR"</string>
<string name="sin" msgid="6793866152659175277">"sin"</string>
<string name="cos" msgid="6901841853098114414">"cos"</string>
@@ -39,7 +40,7 @@
<string name="leftParen" msgid="4850643713953092099">"("</string>
<string name="rightParen" msgid="3177971166159324016">")"</string>
<string name="basic" msgid="7691469861698059753">"मूल पैनल"</string>
- <string name="advanced" msgid="7122495413742976492">"उन्नत पैनल"</string>
+ <string name="advanced" msgid="7122495413742976492">"अतिरिक्त पैनल"</string>
<string name="clear_history" msgid="8458043980601165012">"इतिहास साफ़ करें"</string>
<string name="text_copied_toast" msgid="5801480710472541833">"पाठ की प्रतिलिपि बनाई गई."</string>
<string name="leftParenDesc" msgid="8446428211982811379">"बायां कोष्ठक"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index a1f4f31..ee3a503 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!--
+ Copyright (C) 2007 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.
@@ -28,7 +29,7 @@
<string name="digit7" msgid="658125644218958447">"7"</string>
<string name="digit8" msgid="3134686906411558886">"8"</string>
<string name="digit9" msgid="765379157698748031">"9"</string>
- <string name="del" msgid="6248896117422989693">"IZBRIŠI"</string>
+ <string name="del" msgid="2051454354221101970">"DEL"</string>
<string name="clear" msgid="8103610981407459768">"Briši"</string>
<string name="sin" msgid="6793866152659175277">"sin"</string>
<string name="cos" msgid="6901841853098114414">"cos"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 5b36a3b..1e1b89c 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!--
+ Copyright (C) 2007 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.
@@ -28,7 +29,7 @@
<string name="digit7" msgid="658125644218958447">"7"</string>
<string name="digit8" msgid="3134686906411558886">"8"</string>
<string name="digit9" msgid="765379157698748031">"9"</string>
- <string name="del" msgid="6248896117422989693">"TÖRLÉS"</string>
+ <string name="del" msgid="2051454354221101970">"DEL"</string>
<string name="clear" msgid="8103610981407459768">"Törlés"</string>
<string name="sin" msgid="6793866152659175277">"sin"</string>
<string name="cos" msgid="6901841853098114414">"cos"</string>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
new file mode 100644
index 0000000..9874152
--- /dev/null
+++ b/res/values-hy-rAM/strings.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2007 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 xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_name" msgid="8095131950334945205">"Հաշվիչ"</string>
+ <string name="error" msgid="9197457880925804499">"Սխալ"</string>
+ <string name="digit0" msgid="8069590963464434135">"0"</string>
+ <string name="digit1" msgid="8535041374797804029">"1"</string>
+ <string name="digit2" msgid="8977354203154316247">"2"</string>
+ <string name="digit3" msgid="148544090755132760">"3"</string>
+ <string name="digit4" msgid="2199490603838247678">"4"</string>
+ <string name="digit5" msgid="7568514524384173087">"5"</string>
+ <string name="digit6" msgid="6705952561049362551">"6"</string>
+ <string name="digit7" msgid="658125644218958447">"7"</string>
+ <string name="digit8" msgid="3134686906411558886">"8"</string>
+ <string name="digit9" msgid="765379157698748031">"9"</string>
+ <string name="del" msgid="2051454354221101970">"ՋՆՋ"</string>
+ <string name="clear" msgid="8103610981407459768">"Մքր"</string>
+ <string name="sin" msgid="6793866152659175277">"sin"</string>
+ <string name="cos" msgid="6901841853098114414">"cos"</string>
+ <string name="tan" msgid="7957459816738554960">"tg"</string>
+ <string name="e" msgid="1377847800971731483">"e"</string>
+ <string name="ln" msgid="6888500680285403344">"ln"</string>
+ <string name="lg" msgid="873623857385418182">"log"</string>
+ <string name="leftParen" msgid="4850643713953092099">"("</string>
+ <string name="rightParen" msgid="3177971166159324016">")"</string>
+ <string name="basic" msgid="7691469861698059753">"Հիմնական վահանակ"</string>
+ <string name="advanced" msgid="7122495413742976492">"Ընդլայնված վահանակ"</string>
+ <string name="clear_history" msgid="8458043980601165012">"Մաքրել պատմությունը"</string>
+ <string name="text_copied_toast" msgid="5801480710472541833">"Տեսքտը պատճենվեց:"</string>
+ <string name="leftParenDesc" msgid="8446428211982811379">"ձախ փակագիծ"</string>
+ <string name="rightParenDesc" msgid="9133691645148976523">"աջ փակագիծ"</string>
+ <string name="factorialDesc" msgid="9217024218012761574">"ֆակտորիալ"</string>
+ <string name="lnDesc" msgid="1052579286300842270">"բնական լոգարիթմ"</string>
+ <string name="lgDesc" msgid="6490920451513731160">"լոգարիթմ"</string>
+ <string name="sqrtDesc" msgid="2247252128762219267">"քառակուսի արմատ"</string>
+ <string name="divDesc" msgid="7442623079124315427">"բաժանում"</string>
+ <string name="mulDesc" msgid="9003016819648670694">"բազմապատկում"</string>
+ <string name="plusDesc" msgid="3145322700823848264">"գումարում"</string>
+ <string name="minusDesc" msgid="5033462008907390900">"հանում"</string>
+ <string name="dotDesc" msgid="5253752241630161722">"կետ"</string>
+ <string name="powerDesc" msgid="9034898318444176910">"աստիճան"</string>
+ <string name="delDesc" msgid="8211175878012032240">"ջնջել"</string>
+ <string name="clearDesc" msgid="8015748901120751476">"մաքրել"</string>
+ <string name="tanDesc" msgid="2055554933130702423">"տանգենս"</string>
+ <string name="sinDesc" msgid="6563285042235077204">"սինուս"</string>
+ <string name="cosDesc" msgid="4048942450207926538">"կոսինուս"</string>
+ <string name="eDesc" msgid="6709583372168924068">"Էյլերյան թիվ"</string>
+ <string name="piDesc" msgid="8838151606775021517">"պի"</string>
+ <string name="equalDesc" msgid="4164435100263313101">"հավասար"</string>
+ <string-array name="operatorDescs">
+ <item msgid="7903565108986789641">"ձախ փակագիծ"</item>
+ <item msgid="1688156211934459752">"աջ փակագիծ"</item>
+ <item msgid="6664829080840305856">"ֆակտորիալ"</item>
+ <item msgid="2880199289575144121">"բնական լոգարիթմ"</item>
+ <item msgid="4398774906998694599">"լոգարիթմ"</item>
+ <item msgid="1791869359785943266">"քառակուսի արմատ"</item>
+ <item msgid="6833720171974254459">"բաժանում"</item>
+ <item msgid="2646574635189709515">"բազմապատկում"</item>
+ <item msgid="3487936384379753697">"գումարում"</item>
+ <item msgid="8608534484562258856">"հանում"</item>
+ <item msgid="3456824579675198186">" կետ "</item>
+ <item msgid="4528629783180278651">"աստիճան"</item>
+ <item msgid="4050948027333760159">"տանգենս"</item>
+ <item msgid="8716478860618683850">"սինուս"</item>
+ <item msgid="3203211483560707480">"կոսինուս"</item>
+ <item msgid="8587490959348493065">"պի"</item>
+ <item msgid="8134315487552198394">"հավասար"</item>
+ </string-array>
+</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index a1a2376..3d555cc 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!--
+ Copyright (C) 2007 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.
@@ -28,7 +29,7 @@
<string name="digit7" msgid="658125644218958447">"7"</string>
<string name="digit8" msgid="3134686906411558886">"8"</string>
<string name="digit9" msgid="765379157698748031">"9"</string>
- <string name="del" msgid="6248896117422989693">"DELETE"</string>
+ <string name="del" msgid="2051454354221101970">"DEL"</string>
<string name="clear" msgid="8103610981407459768">"HAPUS"</string>
<string name="sin" msgid="6793866152659175277">"sin"</string>
<string name="cos" msgid="6901841853098114414">"cos"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 9278123..70528b7 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!--
+ Copyright (C) 2007 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.
@@ -28,7 +29,7 @@
<string name="digit7" msgid="658125644218958447">"7"</string>
<string name="digit8" msgid="3134686906411558886">"8"</string>
<string name="digit9" msgid="765379157698748031">"9"</string>
- <string name="del" msgid="6248896117422989693">"ELIMINA"</string>
+ <string name="del" msgid="2051454354221101970">"CANC"</string>
<string name="clear" msgid="8103610981407459768">"CANC"</string>
<string name="sin" msgid="6793866152659175277">"sin"</string>
<string name="cos" msgid="6901841853098114414">"cos"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index e287002..09b35fb 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!--
+ Copyright (C) 2007 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.
@@ -28,7 +29,7 @@
<string name="digit7" msgid="658125644218958447">"7"</string>
<string name="digit8" msgid="3134686906411558886">"8"</string>
<string name="digit9" msgid="765379157698748031">"9"</string>
- <string name="del" msgid="6248896117422989693">"מחק"</string>
+ <string name="del" msgid="2051454354221101970">"DEL"</string>
<string name="clear" msgid="8103610981407459768">"CLR"</string>
<string name="sin" msgid="6793866152659175277">"sin"</string>
<string name="cos" msgid="6901841853098114414">"cos"</string>
@@ -59,7 +60,7 @@
<string name="tanDesc" msgid="2055554933130702423">"טנגנס"</string>
<string name="sinDesc" msgid="6563285042235077204">"סינוס"</string>
<string name="cosDesc" msgid="4048942450207926538">"קוסינוס"</string>
- <string name="eDesc" msgid="6709583372168924068">"המספר e"</string>
+ <string name="eDesc" msgid="6709583372168924068">"המספר e"</string>
<string name="piDesc" msgid="8838151606775021517">"פאי"</string>
<string name="equalDesc" msgid="4164435100263313101">"שווה"</string>
<string-array name="operatorDescs">
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index b69735c..ede9033 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!--
+ Copyright (C) 2007 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.
@@ -28,7 +29,7 @@
<string name="digit7" msgid="658125644218958447">"7"</string>
<string name="digit8" msgid="3134686906411558886">"8"</string>
<string name="digit9" msgid="765379157698748031">"9"</string>
- <string name="del" msgid="6248896117422989693">"削除"</string>
+ <string name="del" msgid="2051454354221101970">"Del"</string>
<string name="clear" msgid="8103610981407459768">"消去"</string>
<string name="sin" msgid="6793866152659175277">"sin"</string>
<string name="cos" msgid="6901841853098114414">"cos"</string>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
new file mode 100644
index 0000000..b7f0fe4
--- /dev/null
+++ b/res/values-ka-rGE/strings.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2007 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 xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_name" msgid="8095131950334945205">"კალკულატორი"</string>
+ <string name="error" msgid="9197457880925804499">"შეცდომა"</string>
+ <string name="digit0" msgid="8069590963464434135">"0"</string>
+ <string name="digit1" msgid="8535041374797804029">"1"</string>
+ <string name="digit2" msgid="8977354203154316247">"2"</string>
+ <string name="digit3" msgid="148544090755132760">"3"</string>
+ <string name="digit4" msgid="2199490603838247678">"4"</string>
+ <string name="digit5" msgid="7568514524384173087">"5"</string>
+ <string name="digit6" msgid="6705952561049362551">"6"</string>
+ <string name="digit7" msgid="658125644218958447">"7"</string>
+ <string name="digit8" msgid="3134686906411558886">"8"</string>
+ <string name="digit9" msgid="765379157698748031">"9"</string>
+ <string name="del" msgid="2051454354221101970">"წაშლა"</string>
+ <string name="clear" msgid="8103610981407459768">"CLR"</string>
+ <string name="sin" msgid="6793866152659175277">"sin"</string>
+ <string name="cos" msgid="6901841853098114414">"cos"</string>
+ <string name="tan" msgid="7957459816738554960">"tan"</string>
+ <string name="e" msgid="1377847800971731483">"e"</string>
+ <string name="ln" msgid="6888500680285403344">"ln"</string>
+ <string name="lg" msgid="873623857385418182">"log"</string>
+ <string name="leftParen" msgid="4850643713953092099">"("</string>
+ <string name="rightParen" msgid="3177971166159324016">")"</string>
+ <string name="basic" msgid="7691469861698059753">"ძირითადი პანელი"</string>
+ <string name="advanced" msgid="7122495413742976492">"დამატებითი ფუნქციების პანელი"</string>
+ <string name="clear_history" msgid="8458043980601165012">"ისტორიის წაშლა"</string>
+ <string name="text_copied_toast" msgid="5801480710472541833">"ტექსტი დაკოპირდა."</string>
+ <string name="leftParenDesc" msgid="8446428211982811379">"მარცხენა ფრჩხილი"</string>
+ <string name="rightParenDesc" msgid="9133691645148976523">"მარჯვენა ფრჩხილი"</string>
+ <string name="factorialDesc" msgid="9217024218012761574">"ფაქტორიალი"</string>
+ <string name="lnDesc" msgid="1052579286300842270">"ნატურალური ლოგარითმი"</string>
+ <string name="lgDesc" msgid="6490920451513731160">"ლოგარითმი"</string>
+ <string name="sqrtDesc" msgid="2247252128762219267">"კვადრატული ფესვი"</string>
+ <string name="divDesc" msgid="7442623079124315427">"გაყოფა"</string>
+ <string name="mulDesc" msgid="9003016819648670694">"გამრავლება"</string>
+ <string name="plusDesc" msgid="3145322700823848264">"პლუსი"</string>
+ <string name="minusDesc" msgid="5033462008907390900">"მინუსი"</string>
+ <string name="dotDesc" msgid="5253752241630161722">"ათობითი გამყოფი"</string>
+ <string name="powerDesc" msgid="9034898318444176910">"ხარისხში აყვანა"</string>
+ <string name="delDesc" msgid="8211175878012032240">"წაშლა"</string>
+ <string name="clearDesc" msgid="8015748901120751476">"გასუფთავება"</string>
+ <string name="tanDesc" msgid="2055554933130702423">"ტანგენსი"</string>
+ <string name="sinDesc" msgid="6563285042235077204">"სინუსი"</string>
+ <string name="cosDesc" msgid="4048942450207926538">"კოსინუსი"</string>
+ <string name="eDesc" msgid="6709583372168924068">"ეილერის რიცხვი"</string>
+ <string name="piDesc" msgid="8838151606775021517">"pi"</string>
+ <string name="equalDesc" msgid="4164435100263313101">"ტოლია"</string>
+ <string-array name="operatorDescs">
+ <item msgid="7903565108986789641">"მარცხენა ფრჩხილი"</item>
+ <item msgid="1688156211934459752">"მარჯვენა ფრჩხილი"</item>
+ <item msgid="6664829080840305856">"ფაქტორიალი"</item>
+ <item msgid="2880199289575144121">"ნატურალური ლოგარითმი"</item>
+ <item msgid="4398774906998694599">"ლოგარითმი"</item>
+ <item msgid="1791869359785943266">"კვადრატული ფესვი"</item>
+ <item msgid="6833720171974254459">"გაყოფილი"</item>
+ <item msgid="2646574635189709515">"გამრავლებული"</item>
+ <item msgid="3487936384379753697">"პლუს"</item>
+ <item msgid="8608534484562258856">"მინუს"</item>
+ <item msgid="3456824579675198186">" ათობითი გამყოფი "</item>
+ <item msgid="4528629783180278651">"ხარისხში აყვანილი"</item>
+ <item msgid="4050948027333760159">"ტანგენსი"</item>
+ <item msgid="8716478860618683850">"სინუსი"</item>
+ <item msgid="3203211483560707480">"კოსინუსი"</item>
+ <item msgid="8587490959348493065">"pi"</item>
+ <item msgid="8134315487552198394">"ტოლია"</item>
+ </string-array>
+</resources>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
new file mode 100644
index 0000000..4f1b6ec
--- /dev/null
+++ b/res/values-km-rKH/strings.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2007 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 xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_name" msgid="8095131950334945205">"ម៉ាស៊ីនគិតលេខ"</string>
+ <string name="error" msgid="9197457880925804499">"កំហុស"</string>
+ <string name="digit0" msgid="8069590963464434135">"0"</string>
+ <string name="digit1" msgid="8535041374797804029">"1"</string>
+ <string name="digit2" msgid="8977354203154316247">"2"</string>
+ <string name="digit3" msgid="148544090755132760">"3"</string>
+ <string name="digit4" msgid="2199490603838247678">"4"</string>
+ <string name="digit5" msgid="7568514524384173087">"5"</string>
+ <string name="digit6" msgid="6705952561049362551">"6"</string>
+ <string name="digit7" msgid="658125644218958447">"7"</string>
+ <string name="digit8" msgid="3134686906411558886">"8"</string>
+ <string name="digit9" msgid="765379157698748031">"9"</string>
+ <string name="del" msgid="2051454354221101970">"DEL"</string>
+ <string name="clear" msgid="8103610981407459768">"CLR"</string>
+ <string name="sin" msgid="6793866152659175277">"sin"</string>
+ <string name="cos" msgid="6901841853098114414">"cos"</string>
+ <string name="tan" msgid="7957459816738554960">"tan"</string>
+ <string name="e" msgid="1377847800971731483">"e"</string>
+ <string name="ln" msgid="6888500680285403344">"ln"</string>
+ <string name="lg" msgid="873623857385418182">"log"</string>
+ <string name="leftParen" msgid="4850643713953092099">"("</string>
+ <string name="rightParen" msgid="3177971166159324016">")"</string>
+ <string name="basic" msgid="7691469861698059753">"បន្ទះមូលដ្ឋាន"</string>
+ <string name="advanced" msgid="7122495413742976492">"បន្ទះកម្រិតខ្ពស់"</string>
+ <string name="clear_history" msgid="8458043980601165012">"សម្អាតប្រវត្តិ"</string>
+ <string name="text_copied_toast" msgid="5801480710472541833">"បានចម្លងអត្ថបទ។"</string>
+ <string name="leftParenDesc" msgid="8446428211982811379">"left parenthesis"</string>
+ <string name="rightParenDesc" msgid="9133691645148976523">"right parenthesis"</string>
+ <string name="factorialDesc" msgid="9217024218012761574">"factorial"</string>
+ <string name="lnDesc" msgid="1052579286300842270">"natural logarithm"</string>
+ <string name="lgDesc" msgid="6490920451513731160">"logarithm"</string>
+ <string name="sqrtDesc" msgid="2247252128762219267">"square root"</string>
+ <string name="divDesc" msgid="7442623079124315427">"divide"</string>
+ <string name="mulDesc" msgid="9003016819648670694">"multiply"</string>
+ <string name="plusDesc" msgid="3145322700823848264">"plus"</string>
+ <string name="minusDesc" msgid="5033462008907390900">"minus"</string>
+ <string name="dotDesc" msgid="5253752241630161722">"point"</string>
+ <string name="powerDesc" msgid="9034898318444176910">"power"</string>
+ <string name="delDesc" msgid="8211175878012032240">"លុប"</string>
+ <string name="clearDesc" msgid="8015748901120751476">"សម្អាត"</string>
+ <string name="tanDesc" msgid="2055554933130702423">"tangent"</string>
+ <string name="sinDesc" msgid="6563285042235077204">"sine"</string>
+ <string name="cosDesc" msgid="4048942450207926538">"cosine"</string>
+ <string name="eDesc" msgid="6709583372168924068">"Euler\'s number"</string>
+ <string name="piDesc" msgid="8838151606775021517">"pi"</string>
+ <string name="equalDesc" msgid="4164435100263313101">"equals"</string>
+ <string-array name="operatorDescs">
+ <item msgid="7903565108986789641">"left parenthesis"</item>
+ <item msgid="1688156211934459752">"right parenthesis"</item>
+ <item msgid="6664829080840305856">"factorial"</item>
+ <item msgid="2880199289575144121">"natural logarithm"</item>
+ <item msgid="4398774906998694599">"logarithm"</item>
+ <item msgid="1791869359785943266">"square root"</item>
+ <item msgid="6833720171974254459">"divided by"</item>
+ <item msgid="2646574635189709515">"multiplied by"</item>
+ <item msgid="3487936384379753697">"plus"</item>
+ <item msgid="8608534484562258856">"minus"</item>
+ <item msgid="3456824579675198186">" point "</item>
+ <item msgid="4528629783180278651">"power"</item>
+ <item msgid="4050948027333760159">"tangent"</item>
+ <item msgid="8716478860618683850">"sine"</item>
+ <item msgid="3203211483560707480">"cosine"</item>
+ <item msgid="8587490959348493065">"pi"</item>
+ <item msgid="8134315487552198394">"equals"</item>
+ </string-array>
+</resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index a817855..9408e1c 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!--
+ Copyright (C) 2007 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.
@@ -28,7 +29,7 @@
<string name="digit7" msgid="658125644218958447">"7"</string>
<string name="digit8" msgid="3134686906411558886">"8"</string>
<string name="digit9" msgid="765379157698748031">"9"</string>
- <string name="del" msgid="6248896117422989693">"DEL"</string>
+ <string name="del" msgid="2051454354221101970">"삭제"</string>
<string name="clear" msgid="8103610981407459768">"CLR"</string>
<string name="sin" msgid="6793866152659175277">"sin"</string>
<string name="cos" msgid="6901841853098114414">"cos"</string>
diff --git a/res/values-land/arrays.xml b/res/values-land/arrays.xml
index 8c518d1..0046fe0 100644
--- a/res/values-land/arrays.xml
+++ b/res/values-land/arrays.xml
@@ -51,4 +51,4 @@
<item>@+id/sqrt</item>
</array>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
new file mode 100644
index 0000000..6580ba0
--- /dev/null
+++ b/res/values-lo-rLA/strings.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2007 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 xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_name" msgid="8095131950334945205">"ຈັກຄິດໄລ່"</string>
+ <string name="error" msgid="9197457880925804499">"ຜິດພາດ"</string>
+ <string name="digit0" msgid="8069590963464434135">"0"</string>
+ <string name="digit1" msgid="8535041374797804029">"1"</string>
+ <string name="digit2" msgid="8977354203154316247">"2"</string>
+ <string name="digit3" msgid="148544090755132760">"3"</string>
+ <string name="digit4" msgid="2199490603838247678">"4"</string>
+ <string name="digit5" msgid="7568514524384173087">"5"</string>
+ <string name="digit6" msgid="6705952561049362551">"6"</string>
+ <string name="digit7" msgid="658125644218958447">"7"</string>
+ <string name="digit8" msgid="3134686906411558886">"8"</string>
+ <string name="digit9" msgid="765379157698748031">"9"</string>
+ <string name="del" msgid="2051454354221101970">"ລຶບ"</string>
+ <string name="clear" msgid="8103610981407459768">"CLR"</string>
+ <string name="sin" msgid="6793866152659175277">"sin"</string>
+ <string name="cos" msgid="6901841853098114414">"cos"</string>
+ <string name="tan" msgid="7957459816738554960">"tan"</string>
+ <string name="e" msgid="1377847800971731483">"e"</string>
+ <string name="ln" msgid="6888500680285403344">"ln"</string>
+ <string name="lg" msgid="873623857385418182">"log"</string>
+ <string name="leftParen" msgid="4850643713953092099">"("</string>
+ <string name="rightParen" msgid="3177971166159324016">")"</string>
+ <string name="basic" msgid="7691469861698059753">"ແຜງຄວບຄຸມພື້ນຖານ"</string>
+ <string name="advanced" msgid="7122495413742976492">"ແຜງຄວບຄຸມພິເສດ"</string>
+ <string name="clear_history" msgid="8458043980601165012">"ລ້າງປະຫວັດ"</string>
+ <string name="text_copied_toast" msgid="5801480710472541833">"ຂໍ້ຄວາມຖືກຄັດລອກ."</string>
+ <string name="leftParenDesc" msgid="8446428211982811379">"ວົງເລັບຊ້າຍ"</string>
+ <string name="rightParenDesc" msgid="9133691645148976523">"ວົງເລັບຂວາ"</string>
+ <string name="factorialDesc" msgid="9217024218012761574">"ແຟັກໂຕຣຽວ"</string>
+ <string name="lnDesc" msgid="1052579286300842270">"ໂລກາຣິດທຳມະຊາດ"</string>
+ <string name="lgDesc" msgid="6490920451513731160">"ໂລກາຣິດ"</string>
+ <string name="sqrtDesc" msgid="2247252128762219267">"ຮາກ"</string>
+ <string name="divDesc" msgid="7442623079124315427">"ຫານ"</string>
+ <string name="mulDesc" msgid="9003016819648670694">"ຄູນ"</string>
+ <string name="plusDesc" msgid="3145322700823848264">"ບວກ"</string>
+ <string name="minusDesc" msgid="5033462008907390900">"ລົບ"</string>
+ <string name="dotDesc" msgid="5253752241630161722">"ຈຸດ"</string>
+ <string name="powerDesc" msgid="9034898318444176910">"ຂຶ້ນກຳລັງ"</string>
+ <string name="delDesc" msgid="8211175878012032240">"ລຶບ"</string>
+ <string name="clearDesc" msgid="8015748901120751476">"ເຄລຍ"</string>
+ <string name="tanDesc" msgid="2055554933130702423">"ຕັງ"</string>
+ <string name="sinDesc" msgid="6563285042235077204">"ຊີນ"</string>
+ <string name="cosDesc" msgid="4048942450207926538">"ໂກຊິນ"</string>
+ <string name="eDesc" msgid="6709583372168924068">"ຈຳນວນອອຍເລີ"</string>
+ <string name="piDesc" msgid="8838151606775021517">"ປີ້"</string>
+ <string name="equalDesc" msgid="4164435100263313101">"ເທົ່າກັບ"</string>
+ <string-array name="operatorDescs">
+ <item msgid="7903565108986789641">"ວົງເລັບຊ້າຍ"</item>
+ <item msgid="1688156211934459752">"ວົງເລັບຂວາ"</item>
+ <item msgid="6664829080840305856">"ແຟັກໂຕຣຽວ"</item>
+ <item msgid="2880199289575144121">"ໂລກາຣິດທຳມະຊາດ"</item>
+ <item msgid="4398774906998694599">"ໂລກາຣິດ"</item>
+ <item msgid="1791869359785943266">"ຮາກ"</item>
+ <item msgid="6833720171974254459">"ຫານກັບ"</item>
+ <item msgid="2646574635189709515">"ຄູນກັບ"</item>
+ <item msgid="3487936384379753697">"ບວກ"</item>
+ <item msgid="8608534484562258856">"ລົບ"</item>
+ <item msgid="3456824579675198186">" ຈຸດ "</item>
+ <item msgid="4528629783180278651">"ຂຶ້ນກຳລັງ"</item>
+ <item msgid="4050948027333760159">"ຕັງ"</item>
+ <item msgid="8716478860618683850">"ຊິນ"</item>
+ <item msgid="3203211483560707480">"ໂກຊິນ"</item>
+ <item msgid="8587490959348493065">"ປີ້"</item>
+ <item msgid="8134315487552198394">"ເທົ່າກັບ"</item>
+ </string-array>
+</resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 8779402..9decfb2 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!--
+ Copyright (C) 2007 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.
@@ -28,7 +29,7 @@
<string name="digit7" msgid="658125644218958447">"7"</string>
<string name="digit8" msgid="3134686906411558886">"8"</string>
<string name="digit9" msgid="765379157698748031">"9"</string>
- <string name="del" msgid="6248896117422989693">"IŠTRINTI"</string>
+ <string name="del" msgid="2051454354221101970">"IŠTR."</string>
<string name="clear" msgid="8103610981407459768">"CLR"</string>
<string name="sin" msgid="6793866152659175277">"sin"</string>
<string name="cos" msgid="6901841853098114414">"cos"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 0c9af79..e4224e4 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!--
+ Copyright (C) 2007 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.
@@ -28,7 +29,7 @@
<string name="digit7" msgid="658125644218958447">"7"</string>
<string name="digit8" msgid="3134686906411558886">"8"</string>
<string name="digit9" msgid="765379157698748031">"9"</string>
- <string name="del" msgid="6248896117422989693">"DZĒST"</string>
+ <string name="del" msgid="2051454354221101970">"DZĒST"</string>
<string name="clear" msgid="8103610981407459768">"CLR"</string>
<string name="sin" msgid="6793866152659175277">"sin"</string>
<string name="cos" msgid="6901841853098114414">"cos"</string>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
new file mode 100644
index 0000000..b74c5ae
--- /dev/null
+++ b/res/values-mn-rMN/strings.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2007 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 xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_name" msgid="8095131950334945205">"Тооны машин"</string>
+ <string name="error" msgid="9197457880925804499">"Алдаа"</string>
+ <string name="digit0" msgid="8069590963464434135">"0"</string>
+ <string name="digit1" msgid="8535041374797804029">"1"</string>
+ <string name="digit2" msgid="8977354203154316247">"2"</string>
+ <string name="digit3" msgid="148544090755132760">"3"</string>
+ <string name="digit4" msgid="2199490603838247678">"4"</string>
+ <string name="digit5" msgid="7568514524384173087">"5"</string>
+ <string name="digit6" msgid="6705952561049362551">"6"</string>
+ <string name="digit7" msgid="658125644218958447">"7"</string>
+ <string name="digit8" msgid="3134686906411558886">"8"</string>
+ <string name="digit9" msgid="765379157698748031">"9"</string>
+ <string name="del" msgid="2051454354221101970">"DEL"</string>
+ <string name="clear" msgid="8103610981407459768">"CLR"</string>
+ <string name="sin" msgid="6793866152659175277">"sin"</string>
+ <string name="cos" msgid="6901841853098114414">"cos"</string>
+ <string name="tan" msgid="7957459816738554960">"tan"</string>
+ <string name="e" msgid="1377847800971731483">"e"</string>
+ <string name="ln" msgid="6888500680285403344">"ln"</string>
+ <string name="lg" msgid="873623857385418182">"log"</string>
+ <string name="leftParen" msgid="4850643713953092099">"("</string>
+ <string name="rightParen" msgid="3177971166159324016">")"</string>
+ <string name="basic" msgid="7691469861698059753">"Үндсэн самбар"</string>
+ <string name="advanced" msgid="7122495413742976492">"Дэлгэрэнгүй самбар"</string>
+ <string name="clear_history" msgid="8458043980601165012">"Түүх цэвэрлэх"</string>
+ <string name="text_copied_toast" msgid="5801480710472541833">"Текст хуулагдав."</string>
+ <string name="leftParenDesc" msgid="8446428211982811379">"зүүн хаалт"</string>
+ <string name="rightParenDesc" msgid="9133691645148976523">"баруун хаалт"</string>
+ <string name="factorialDesc" msgid="9217024218012761574">"факториал"</string>
+ <string name="lnDesc" msgid="1052579286300842270">"натурал логарифм"</string>
+ <string name="lgDesc" msgid="6490920451513731160">"логарифм"</string>
+ <string name="sqrtDesc" msgid="2247252128762219267">"язгуур"</string>
+ <string name="divDesc" msgid="7442623079124315427">"хуваах"</string>
+ <string name="mulDesc" msgid="9003016819648670694">"үржүүлэх"</string>
+ <string name="plusDesc" msgid="3145322700823848264">"нэмэх"</string>
+ <string name="minusDesc" msgid="5033462008907390900">"хасах"</string>
+ <string name="dotDesc" msgid="5253752241630161722">"цэг"</string>
+ <string name="powerDesc" msgid="9034898318444176910">"зэрэг"</string>
+ <string name="delDesc" msgid="8211175878012032240">"Устгах"</string>
+ <string name="clearDesc" msgid="8015748901120751476">"цэвэрлэх"</string>
+ <string name="tanDesc" msgid="2055554933130702423">"тангенс"</string>
+ <string name="sinDesc" msgid="6563285042235077204">"синус"</string>
+ <string name="cosDesc" msgid="4048942450207926538">"косинус"</string>
+ <string name="eDesc" msgid="6709583372168924068">"Эйлерийн тоо"</string>
+ <string name="piDesc" msgid="8838151606775021517">"пи"</string>
+ <string name="equalDesc" msgid="4164435100263313101">"тэнцүү"</string>
+ <string-array name="operatorDescs">
+ <item msgid="7903565108986789641">"зүүн хаалт"</item>
+ <item msgid="1688156211934459752">"баруун хаалт"</item>
+ <item msgid="6664829080840305856">"факториал"</item>
+ <item msgid="2880199289575144121">"натурал логарифм"</item>
+ <item msgid="4398774906998694599">"логарифм"</item>
+ <item msgid="1791869359785943266">"язгуур"</item>
+ <item msgid="6833720171974254459">"хуваагч"</item>
+ <item msgid="2646574635189709515">"үржүүлэгч"</item>
+ <item msgid="3487936384379753697">"нэмэх"</item>
+ <item msgid="8608534484562258856">"хасах"</item>
+ <item msgid="3456824579675198186">" цэг "</item>
+ <item msgid="4528629783180278651">"зэрэг"</item>
+ <item msgid="4050948027333760159">"тангенс"</item>
+ <item msgid="8716478860618683850">"синус"</item>
+ <item msgid="3203211483560707480">"косинус"</item>
+ <item msgid="8587490959348493065">"пи"</item>
+ <item msgid="8134315487552198394">"тэнцүү"</item>
+ </string-array>
+</resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms-rMY/strings.xml
similarity index 97%
rename from res/values-ms/strings.xml
rename to res/values-ms-rMY/strings.xml
index 8d4a3a1..f0e7158 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!--
+ Copyright (C) 2007 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.
@@ -28,7 +29,7 @@
<string name="digit7" msgid="658125644218958447">"7"</string>
<string name="digit8" msgid="3134686906411558886">"8"</string>
<string name="digit9" msgid="765379157698748031">"9"</string>
- <string name="del" msgid="6248896117422989693">"PADAM"</string>
+ <string name="del" msgid="2051454354221101970">"PADAM"</string>
<string name="clear" msgid="8103610981407459768">"CLR"</string>
<string name="sin" msgid="6793866152659175277">"sin"</string>
<string name="cos" msgid="6901841853098114414">"kos"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 8533a5c..aceb510 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!--
+ Copyright (C) 2007 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.
@@ -28,7 +29,7 @@
<string name="digit7" msgid="658125644218958447">"7"</string>
<string name="digit8" msgid="3134686906411558886">"8"</string>
<string name="digit9" msgid="765379157698748031">"9"</string>
- <string name="del" msgid="6248896117422989693">"SLETT"</string>
+ <string name="del" msgid="2051454354221101970">"SLETT"</string>
<string name="clear" msgid="8103610981407459768">"CLR"</string>
<string name="sin" msgid="6793866152659175277">"sin"</string>
<string name="cos" msgid="6901841853098114414">"cos"</string>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
new file mode 100644
index 0000000..ff0e43c
--- /dev/null
+++ b/res/values-ne-rNP/strings.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2007 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 xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_name" msgid="8095131950334945205">"क्यालकुलेटर"</string>
+ <string name="error" msgid="9197457880925804499">"त्रुटि"</string>
+ <string name="digit0" msgid="8069590963464434135">"०"</string>
+ <string name="digit1" msgid="8535041374797804029">"१"</string>
+ <string name="digit2" msgid="8977354203154316247">"२"</string>
+ <string name="digit3" msgid="148544090755132760">"३"</string>
+ <string name="digit4" msgid="2199490603838247678">"४"</string>
+ <string name="digit5" msgid="7568514524384173087">"५"</string>
+ <string name="digit6" msgid="6705952561049362551">"६"</string>
+ <string name="digit7" msgid="658125644218958447">"७"</string>
+ <string name="digit8" msgid="3134686906411558886">"८"</string>
+ <string name="digit9" msgid="765379157698748031">"९"</string>
+ <string name="del" msgid="6248896117422989693">"मेटाउनुहोस्"</string>
+ <string name="clear" msgid="8103610981407459768">"CLR"</string>
+ <string name="sin" msgid="6793866152659175277">"साइन"</string>
+ <string name="cos" msgid="6901841853098114414">"कस"</string>
+ <string name="tan" msgid="7957459816738554960">"ट्यान"</string>
+ <string name="e" msgid="1377847800971731483">"e"</string>
+ <string name="ln" msgid="6888500680285403344">"मा"</string>
+ <string name="lg" msgid="873623857385418182">"लग"</string>
+ <string name="leftParen" msgid="4850643713953092099">"("</string>
+ <string name="rightParen" msgid="3177971166159324016">")"</string>
+ <string name="basic" msgid="7691469861698059753">"साधारण प्यानल"</string>
+ <string name="advanced" msgid="7122495413742976492">"जटिल प्यानल"</string>
+ <string name="clear_history" msgid="8458043980601165012">"इतिहास हटाउनुहोस्"</string>
+ <string name="text_copied_toast" msgid="5801480710472541833">"पाठ प्रतिलिपी गरिएको।"</string>
+ <string name="leftParenDesc" msgid="8446428211982811379">"बायाँ कोष्ठ"</string>
+ <string name="rightParenDesc" msgid="9133691645148976523">"बायाँ कोष्ठ"</string>
+ <string name="factorialDesc" msgid="9217024218012761574">"क्रमगुणित"</string>
+ <string name="lnDesc" msgid="1052579286300842270">"प्राकृतिक लोगारिदम"</string>
+ <string name="lgDesc" msgid="6490920451513731160">"लोगारिदम"</string>
+ <string name="sqrtDesc" msgid="2247252128762219267">"वर्गमूल"</string>
+ <string name="divDesc" msgid="7442623079124315427">"भाग गर्नुहोस्"</string>
+ <string name="mulDesc" msgid="9003016819648670694">"गुणन"</string>
+ <string name="plusDesc" msgid="3145322700823848264">"जोड"</string>
+ <string name="minusDesc" msgid="5033462008907390900">"घटाउ"</string>
+ <string name="dotDesc" msgid="5253752241630161722">"बिन्दु"</string>
+ <string name="powerDesc" msgid="9034898318444176910">"उर्जा"</string>
+ <string name="delDesc" msgid="8211175878012032240">"मेटाउनुहोस्"</string>
+ <string name="clearDesc" msgid="8015748901120751476">"सफा गर्नुहोस्"</string>
+ <string name="tanDesc" msgid="2055554933130702423">"ट्यान्जेन्ट"</string>
+ <string name="sinDesc" msgid="6563285042235077204">"साइन"</string>
+ <string name="cosDesc" msgid="4048942450207926538">"कसाइन"</string>
+ <string name="eDesc" msgid="6709583372168924068">"युलरको अङ्क"</string>
+ <string name="piDesc" msgid="8838151606775021517">"पाइ"</string>
+ <string name="equalDesc" msgid="4164435100263313101">"बराबर"</string>
+ <string-array name="operatorDescs">
+ <item msgid="7903565108986789641">"बायाँ कोष्ठ"</item>
+ <item msgid="1688156211934459752">"दायाँ कोष्ठ"</item>
+ <item msgid="6664829080840305856">"क्रमगुणित"</item>
+ <item msgid="2880199289575144121">"प्राकृतिक लगारिदम"</item>
+ <item msgid="4398774906998694599">"लोगारिदम"</item>
+ <item msgid="1791869359785943266">"वर्गमूल"</item>
+ <item msgid="6833720171974254459">"ले भाग गरेको"</item>
+ <item msgid="2646574635189709515">"ले गुणन गरेको"</item>
+ <item msgid="3487936384379753697">"जोड"</item>
+ <item msgid="8608534484562258856">"घटाउ"</item>
+ <item msgid="3456824579675198186">" बिन्दु "</item>
+ <item msgid="4528629783180278651">"उर्जा"</item>
+ <item msgid="4050948027333760159">"ट्यान्जेन्ट"</item>
+ <item msgid="8716478860618683850">"साइन"</item>
+ <item msgid="3203211483560707480">"कोसाइन"</item>
+ <item msgid="8587490959348493065">"पाइ"</item>
+ <item msgid="8134315487552198394">"बराबर"</item>
+ </string-array>
+</resources>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
new file mode 100644
index 0000000..ff0e43c
--- /dev/null
+++ b/res/values-ne/strings.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2007 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 xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_name" msgid="8095131950334945205">"क्यालकुलेटर"</string>
+ <string name="error" msgid="9197457880925804499">"त्रुटि"</string>
+ <string name="digit0" msgid="8069590963464434135">"०"</string>
+ <string name="digit1" msgid="8535041374797804029">"१"</string>
+ <string name="digit2" msgid="8977354203154316247">"२"</string>
+ <string name="digit3" msgid="148544090755132760">"३"</string>
+ <string name="digit4" msgid="2199490603838247678">"४"</string>
+ <string name="digit5" msgid="7568514524384173087">"५"</string>
+ <string name="digit6" msgid="6705952561049362551">"६"</string>
+ <string name="digit7" msgid="658125644218958447">"७"</string>
+ <string name="digit8" msgid="3134686906411558886">"८"</string>
+ <string name="digit9" msgid="765379157698748031">"९"</string>
+ <string name="del" msgid="6248896117422989693">"मेटाउनुहोस्"</string>
+ <string name="clear" msgid="8103610981407459768">"CLR"</string>
+ <string name="sin" msgid="6793866152659175277">"साइन"</string>
+ <string name="cos" msgid="6901841853098114414">"कस"</string>
+ <string name="tan" msgid="7957459816738554960">"ट्यान"</string>
+ <string name="e" msgid="1377847800971731483">"e"</string>
+ <string name="ln" msgid="6888500680285403344">"मा"</string>
+ <string name="lg" msgid="873623857385418182">"लग"</string>
+ <string name="leftParen" msgid="4850643713953092099">"("</string>
+ <string name="rightParen" msgid="3177971166159324016">")"</string>
+ <string name="basic" msgid="7691469861698059753">"साधारण प्यानल"</string>
+ <string name="advanced" msgid="7122495413742976492">"जटिल प्यानल"</string>
+ <string name="clear_history" msgid="8458043980601165012">"इतिहास हटाउनुहोस्"</string>
+ <string name="text_copied_toast" msgid="5801480710472541833">"पाठ प्रतिलिपी गरिएको।"</string>
+ <string name="leftParenDesc" msgid="8446428211982811379">"बायाँ कोष्ठ"</string>
+ <string name="rightParenDesc" msgid="9133691645148976523">"बायाँ कोष्ठ"</string>
+ <string name="factorialDesc" msgid="9217024218012761574">"क्रमगुणित"</string>
+ <string name="lnDesc" msgid="1052579286300842270">"प्राकृतिक लोगारिदम"</string>
+ <string name="lgDesc" msgid="6490920451513731160">"लोगारिदम"</string>
+ <string name="sqrtDesc" msgid="2247252128762219267">"वर्गमूल"</string>
+ <string name="divDesc" msgid="7442623079124315427">"भाग गर्नुहोस्"</string>
+ <string name="mulDesc" msgid="9003016819648670694">"गुणन"</string>
+ <string name="plusDesc" msgid="3145322700823848264">"जोड"</string>
+ <string name="minusDesc" msgid="5033462008907390900">"घटाउ"</string>
+ <string name="dotDesc" msgid="5253752241630161722">"बिन्दु"</string>
+ <string name="powerDesc" msgid="9034898318444176910">"उर्जा"</string>
+ <string name="delDesc" msgid="8211175878012032240">"मेटाउनुहोस्"</string>
+ <string name="clearDesc" msgid="8015748901120751476">"सफा गर्नुहोस्"</string>
+ <string name="tanDesc" msgid="2055554933130702423">"ट्यान्जेन्ट"</string>
+ <string name="sinDesc" msgid="6563285042235077204">"साइन"</string>
+ <string name="cosDesc" msgid="4048942450207926538">"कसाइन"</string>
+ <string name="eDesc" msgid="6709583372168924068">"युलरको अङ्क"</string>
+ <string name="piDesc" msgid="8838151606775021517">"पाइ"</string>
+ <string name="equalDesc" msgid="4164435100263313101">"बराबर"</string>
+ <string-array name="operatorDescs">
+ <item msgid="7903565108986789641">"बायाँ कोष्ठ"</item>
+ <item msgid="1688156211934459752">"दायाँ कोष्ठ"</item>
+ <item msgid="6664829080840305856">"क्रमगुणित"</item>
+ <item msgid="2880199289575144121">"प्राकृतिक लगारिदम"</item>
+ <item msgid="4398774906998694599">"लोगारिदम"</item>
+ <item msgid="1791869359785943266">"वर्गमूल"</item>
+ <item msgid="6833720171974254459">"ले भाग गरेको"</item>
+ <item msgid="2646574635189709515">"ले गुणन गरेको"</item>
+ <item msgid="3487936384379753697">"जोड"</item>
+ <item msgid="8608534484562258856">"घटाउ"</item>
+ <item msgid="3456824579675198186">" बिन्दु "</item>
+ <item msgid="4528629783180278651">"उर्जा"</item>
+ <item msgid="4050948027333760159">"ट्यान्जेन्ट"</item>
+ <item msgid="8716478860618683850">"साइन"</item>
+ <item msgid="3203211483560707480">"कोसाइन"</item>
+ <item msgid="8587490959348493065">"पाइ"</item>
+ <item msgid="8134315487552198394">"बराबर"</item>
+ </string-array>
+</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 2ef47df..3839c4a 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!--
+ Copyright (C) 2007 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.
@@ -28,7 +29,7 @@
<string name="digit7" msgid="658125644218958447">"7"</string>
<string name="digit8" msgid="3134686906411558886">"8"</string>
<string name="digit9" msgid="765379157698748031">"9"</string>
- <string name="del" msgid="6248896117422989693">"VERWIJDEREN"</string>
+ <string name="del" msgid="2051454354221101970">"WIS"</string>
<string name="clear" msgid="8103610981407459768">"WISSEN"</string>
<string name="sin" msgid="6793866152659175277">"sin"</string>
<string name="cos" msgid="6901841853098114414">"cos"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 4360f79..1611c6b 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!--
+ Copyright (C) 2007 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.
@@ -28,7 +29,7 @@
<string name="digit7" msgid="658125644218958447">"7"</string>
<string name="digit8" msgid="3134686906411558886">"8"</string>
<string name="digit9" msgid="765379157698748031">"9"</string>
- <string name="del" msgid="6248896117422989693">"USUŃ"</string>
+ <string name="del" msgid="2051454354221101970">"DEL"</string>
<string name="clear" msgid="8103610981407459768">"CZYŚĆ"</string>
<string name="sin" msgid="6793866152659175277">"sin"</string>
<string name="cos" msgid="6901841853098114414">"cos"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 48c8134..ee1f45e 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!--
+ Copyright (C) 2007 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.
@@ -28,7 +29,7 @@
<string name="digit7" msgid="658125644218958447">"7"</string>
<string name="digit8" msgid="3134686906411558886">"8"</string>
<string name="digit9" msgid="765379157698748031">"9"</string>
- <string name="del" msgid="6248896117422989693">"ELIMINAR"</string>
+ <string name="del" msgid="2051454354221101970">"DEL"</string>
<string name="clear" msgid="8103610981407459768">"LIMPAR"</string>
<string name="sin" msgid="6793866152659175277">"sen"</string>
<string name="cos" msgid="6901841853098114414">"cos"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 613d72c..f46710b 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!--
+ Copyright (C) 2007 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.
@@ -28,7 +29,7 @@
<string name="digit7" msgid="658125644218958447">"7"</string>
<string name="digit8" msgid="3134686906411558886">"8"</string>
<string name="digit9" msgid="765379157698748031">"9"</string>
- <string name="del" msgid="6248896117422989693">"EXCLUIR"</string>
+ <string name="del" msgid="2051454354221101970">"DEL"</string>
<string name="clear" msgid="8103610981407459768">"CLR"</string>
<string name="sin" msgid="6793866152659175277">"sin"</string>
<string name="cos" msgid="6901841853098114414">"cos"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index ea64f2c..9fb8287 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!--
+ Copyright (C) 2007 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.
@@ -28,7 +29,8 @@
<string name="digit7" msgid="658125644218958447">"7"</string>
<string name="digit8" msgid="3134686906411558886">"8"</string>
<string name="digit9" msgid="765379157698748031">"9"</string>
- <string name="del" msgid="6248896117422989693">"C"</string>
+ <!-- no translation found for del (2051454354221101970) -->
+ <skip />
<!-- no translation found for clear (8103610981407459768) -->
<skip />
<string name="sin" msgid="6793866152659175277">"sin"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index adbf59b..8ebc33e 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!--
+ Copyright (C) 2007 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.
@@ -28,7 +29,7 @@
<string name="digit7" msgid="658125644218958447">"7"</string>
<string name="digit8" msgid="3134686906411558886">"8"</string>
<string name="digit9" msgid="765379157698748031">"9"</string>
- <string name="del" msgid="6248896117422989693">"ȘTERGEŢI"</string>
+ <string name="del" msgid="2051454354221101970">"DEL"</string>
<string name="clear" msgid="8103610981407459768">"ȘTERGE"</string>
<string name="sin" msgid="6793866152659175277">"sin"</string>
<string name="cos" msgid="6901841853098114414">"cos"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index e6576ae..d59030d 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!--
+ Copyright (C) 2007 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.
@@ -28,7 +29,7 @@
<string name="digit7" msgid="658125644218958447">"7"</string>
<string name="digit8" msgid="3134686906411558886">"8"</string>
<string name="digit9" msgid="765379157698748031">"9"</string>
- <string name="del" msgid="6248896117422989693">"Удалить"</string>
+ <string name="del" msgid="2051454354221101970">"Удалить"</string>
<string name="clear" msgid="8103610981407459768">"CLR"</string>
<string name="sin" msgid="6793866152659175277">"sin"</string>
<string name="cos" msgid="6901841853098114414">"cos"</string>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
new file mode 100644
index 0000000..1f82914
--- /dev/null
+++ b/res/values-si-rLK/strings.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2007 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 xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_name" msgid="8095131950334945205">"ගණක යන්ත්රය"</string>
+ <string name="error" msgid="9197457880925804499">"දෝෂය"</string>
+ <string name="digit0" msgid="8069590963464434135">"0"</string>
+ <string name="digit1" msgid="8535041374797804029">"1"</string>
+ <string name="digit2" msgid="8977354203154316247">"2"</string>
+ <string name="digit3" msgid="148544090755132760">"3"</string>
+ <string name="digit4" msgid="2199490603838247678">"4"</string>
+ <string name="digit5" msgid="7568514524384173087">"5"</string>
+ <string name="digit6" msgid="6705952561049362551">"6"</string>
+ <string name="digit7" msgid="658125644218958447">"7"</string>
+ <string name="digit8" msgid="3134686906411558886">"8"</string>
+ <string name="digit9" msgid="765379157698748031">"9"</string>
+ <string name="del" msgid="6248896117422989693">"මකන්න"</string>
+ <string name="clear" msgid="8103610981407459768">"CLR"</string>
+ <string name="sin" msgid="6793866152659175277">"සයින"</string>
+ <string name="cos" msgid="6901841853098114414">"කොස්"</string>
+ <string name="tan" msgid="7957459816738554960">"ටෑන්"</string>
+ <string name="e" msgid="1377847800971731483">"e"</string>
+ <string name="ln" msgid="6888500680285403344">"ශ්රිතයක් ලෙස"</string>
+ <string name="lg" msgid="873623857385418182">"ලොගය"</string>
+ <string name="leftParen" msgid="4850643713953092099">"("</string>
+ <string name="rightParen" msgid="3177971166159324016">")"</string>
+ <string name="basic" msgid="7691469861698059753">"මූලික පැනලය"</string>
+ <string name="advanced" msgid="7122495413742976492">"උසස් පැනලය"</string>
+ <string name="clear_history" msgid="8458043980601165012">"ඉතිහාසය හිස් කරන්න"</string>
+ <string name="text_copied_toast" msgid="5801480710472541833">"පෙළ පිටපත් කරන ලදි."</string>
+ <string name="leftParenDesc" msgid="8446428211982811379">"වම් වරහන"</string>
+ <string name="rightParenDesc" msgid="9133691645148976523">"දකුණු වරහන"</string>
+ <string name="factorialDesc" msgid="9217024218012761574">"ක්රමාරෝපිත"</string>
+ <string name="lnDesc" msgid="1052579286300842270">"ප්රති ලඝු"</string>
+ <string name="lgDesc" msgid="6490920451513731160">"ලඝු"</string>
+ <string name="sqrtDesc" msgid="2247252128762219267">"වර්ග මූලය"</string>
+ <string name="divDesc" msgid="7442623079124315427">"බෙදන්න"</string>
+ <string name="mulDesc" msgid="9003016819648670694">"ගුණිතය"</string>
+ <string name="plusDesc" msgid="3145322700823848264">"ධන"</string>
+ <string name="minusDesc" msgid="5033462008907390900">"සෘණ"</string>
+ <string name="dotDesc" msgid="5253752241630161722">"දශම"</string>
+ <string name="powerDesc" msgid="9034898318444176910">"බලය"</string>
+ <string name="delDesc" msgid="8211175878012032240">"මකන්න"</string>
+ <string name="clearDesc" msgid="8015748901120751476">"හිස් කරන්න"</string>
+ <string name="tanDesc" msgid="2055554933130702423">"ටැන්ජන"</string>
+ <string name="sinDesc" msgid="6563285042235077204">"සයින"</string>
+ <string name="cosDesc" msgid="4048942450207926538">"කෝසයින"</string>
+ <string name="eDesc" msgid="6709583372168924068">"ඔයිලර් අංකය"</string>
+ <string name="piDesc" msgid="8838151606775021517">"පයි"</string>
+ <string name="equalDesc" msgid="4164435100263313101">"සමාන"</string>
+ <string-array name="operatorDescs">
+ <item msgid="7903565108986789641">"වම් වරහන"</item>
+ <item msgid="1688156211934459752">"දකුණු වරහන"</item>
+ <item msgid="6664829080840305856">"ක්රමාරෝපිත"</item>
+ <item msgid="2880199289575144121">"ස්වාභාවික ලඝු"</item>
+ <item msgid="4398774906998694599">"ලඝු"</item>
+ <item msgid="1791869359785943266">"වර්ග මූල"</item>
+ <item msgid="6833720171974254459">"මඟින් බෙදන ලදි"</item>
+ <item msgid="2646574635189709515">"මඟින් ගුණකරන ලදි"</item>
+ <item msgid="3487936384379753697">"ධන"</item>
+ <item msgid="8608534484562258856">"සෘණ"</item>
+ <item msgid="3456824579675198186">" දශම "</item>
+ <item msgid="4528629783180278651">"බලය"</item>
+ <item msgid="4050948027333760159">"ටැන්ජන"</item>
+ <item msgid="8716478860618683850">"සයින"</item>
+ <item msgid="3203211483560707480">"කෝසයින"</item>
+ <item msgid="8587490959348493065">"පයි"</item>
+ <item msgid="8134315487552198394">"සමාන"</item>
+ </string-array>
+</resources>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
new file mode 100644
index 0000000..1f82914
--- /dev/null
+++ b/res/values-si/strings.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2007 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 xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_name" msgid="8095131950334945205">"ගණක යන්ත්රය"</string>
+ <string name="error" msgid="9197457880925804499">"දෝෂය"</string>
+ <string name="digit0" msgid="8069590963464434135">"0"</string>
+ <string name="digit1" msgid="8535041374797804029">"1"</string>
+ <string name="digit2" msgid="8977354203154316247">"2"</string>
+ <string name="digit3" msgid="148544090755132760">"3"</string>
+ <string name="digit4" msgid="2199490603838247678">"4"</string>
+ <string name="digit5" msgid="7568514524384173087">"5"</string>
+ <string name="digit6" msgid="6705952561049362551">"6"</string>
+ <string name="digit7" msgid="658125644218958447">"7"</string>
+ <string name="digit8" msgid="3134686906411558886">"8"</string>
+ <string name="digit9" msgid="765379157698748031">"9"</string>
+ <string name="del" msgid="6248896117422989693">"මකන්න"</string>
+ <string name="clear" msgid="8103610981407459768">"CLR"</string>
+ <string name="sin" msgid="6793866152659175277">"සයින"</string>
+ <string name="cos" msgid="6901841853098114414">"කොස්"</string>
+ <string name="tan" msgid="7957459816738554960">"ටෑන්"</string>
+ <string name="e" msgid="1377847800971731483">"e"</string>
+ <string name="ln" msgid="6888500680285403344">"ශ්රිතයක් ලෙස"</string>
+ <string name="lg" msgid="873623857385418182">"ලොගය"</string>
+ <string name="leftParen" msgid="4850643713953092099">"("</string>
+ <string name="rightParen" msgid="3177971166159324016">")"</string>
+ <string name="basic" msgid="7691469861698059753">"මූලික පැනලය"</string>
+ <string name="advanced" msgid="7122495413742976492">"උසස් පැනලය"</string>
+ <string name="clear_history" msgid="8458043980601165012">"ඉතිහාසය හිස් කරන්න"</string>
+ <string name="text_copied_toast" msgid="5801480710472541833">"පෙළ පිටපත් කරන ලදි."</string>
+ <string name="leftParenDesc" msgid="8446428211982811379">"වම් වරහන"</string>
+ <string name="rightParenDesc" msgid="9133691645148976523">"දකුණු වරහන"</string>
+ <string name="factorialDesc" msgid="9217024218012761574">"ක්රමාරෝපිත"</string>
+ <string name="lnDesc" msgid="1052579286300842270">"ප්රති ලඝු"</string>
+ <string name="lgDesc" msgid="6490920451513731160">"ලඝු"</string>
+ <string name="sqrtDesc" msgid="2247252128762219267">"වර්ග මූලය"</string>
+ <string name="divDesc" msgid="7442623079124315427">"බෙදන්න"</string>
+ <string name="mulDesc" msgid="9003016819648670694">"ගුණිතය"</string>
+ <string name="plusDesc" msgid="3145322700823848264">"ධන"</string>
+ <string name="minusDesc" msgid="5033462008907390900">"සෘණ"</string>
+ <string name="dotDesc" msgid="5253752241630161722">"දශම"</string>
+ <string name="powerDesc" msgid="9034898318444176910">"බලය"</string>
+ <string name="delDesc" msgid="8211175878012032240">"මකන්න"</string>
+ <string name="clearDesc" msgid="8015748901120751476">"හිස් කරන්න"</string>
+ <string name="tanDesc" msgid="2055554933130702423">"ටැන්ජන"</string>
+ <string name="sinDesc" msgid="6563285042235077204">"සයින"</string>
+ <string name="cosDesc" msgid="4048942450207926538">"කෝසයින"</string>
+ <string name="eDesc" msgid="6709583372168924068">"ඔයිලර් අංකය"</string>
+ <string name="piDesc" msgid="8838151606775021517">"පයි"</string>
+ <string name="equalDesc" msgid="4164435100263313101">"සමාන"</string>
+ <string-array name="operatorDescs">
+ <item msgid="7903565108986789641">"වම් වරහන"</item>
+ <item msgid="1688156211934459752">"දකුණු වරහන"</item>
+ <item msgid="6664829080840305856">"ක්රමාරෝපිත"</item>
+ <item msgid="2880199289575144121">"ස්වාභාවික ලඝු"</item>
+ <item msgid="4398774906998694599">"ලඝු"</item>
+ <item msgid="1791869359785943266">"වර්ග මූල"</item>
+ <item msgid="6833720171974254459">"මඟින් බෙදන ලදි"</item>
+ <item msgid="2646574635189709515">"මඟින් ගුණකරන ලදි"</item>
+ <item msgid="3487936384379753697">"ධන"</item>
+ <item msgid="8608534484562258856">"සෘණ"</item>
+ <item msgid="3456824579675198186">" දශම "</item>
+ <item msgid="4528629783180278651">"බලය"</item>
+ <item msgid="4050948027333760159">"ටැන්ජන"</item>
+ <item msgid="8716478860618683850">"සයින"</item>
+ <item msgid="3203211483560707480">"කෝසයින"</item>
+ <item msgid="8587490959348493065">"පයි"</item>
+ <item msgid="8134315487552198394">"සමාන"</item>
+ </string-array>
+</resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 9f39e22..772f3bf 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!--
+ Copyright (C) 2007 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.
@@ -28,7 +29,7 @@
<string name="digit7" msgid="658125644218958447">"7"</string>
<string name="digit8" msgid="3134686906411558886">"8"</string>
<string name="digit9" msgid="765379157698748031">"9"</string>
- <string name="del" msgid="6248896117422989693">"ODSTRÁNIŤ"</string>
+ <string name="del" msgid="2051454354221101970">"DEL"</string>
<string name="clear" msgid="8103610981407459768">"Vymaz."</string>
<string name="sin" msgid="6793866152659175277">"sin"</string>
<string name="cos" msgid="6901841853098114414">"cos"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index c61d850..fb12274 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!--
+ Copyright (C) 2007 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.
@@ -28,7 +29,7 @@
<string name="digit7" msgid="658125644218958447">"7"</string>
<string name="digit8" msgid="3134686906411558886">"8"</string>
<string name="digit9" msgid="765379157698748031">"9"</string>
- <string name="del" msgid="6248896117422989693">"IZBRIŠI"</string>
+ <string name="del" msgid="2051454354221101970">"IZB"</string>
<string name="clear" msgid="8103610981407459768">"IZBRIS"</string>
<string name="sin" msgid="6793866152659175277">"sin"</string>
<string name="cos" msgid="6901841853098114414">"cos"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 0345791..0d30dcd 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!--
+ Copyright (C) 2007 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.
@@ -28,7 +29,7 @@
<string name="digit7" msgid="658125644218958447">"7"</string>
<string name="digit8" msgid="3134686906411558886">"8"</string>
<string name="digit9" msgid="765379157698748031">"9"</string>
- <string name="del" msgid="6248896117422989693">"ИЗБРИШИ"</string>
+ <string name="del" msgid="2051454354221101970">"DEL"</string>
<string name="clear" msgid="8103610981407459768">"ОБРИШИ"</string>
<string name="sin" msgid="6793866152659175277">"sin"</string>
<string name="cos" msgid="6901841853098114414">"cos"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index ba580aa..1a7741d 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!--
+ Copyright (C) 2007 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.
@@ -28,7 +29,7 @@
<string name="digit7" msgid="658125644218958447">"7"</string>
<string name="digit8" msgid="3134686906411558886">"8"</string>
<string name="digit9" msgid="765379157698748031">"9"</string>
- <string name="del" msgid="6248896117422989693">"RADERA"</string>
+ <string name="del" msgid="2051454354221101970">"RADERA"</string>
<string name="clear" msgid="8103610981407459768">"Rensa"</string>
<string name="sin" msgid="6793866152659175277">"sin"</string>
<string name="cos" msgid="6901841853098114414">"cos"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 2bc864a..d4c5bb8 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!--
+ Copyright (C) 2007 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.
@@ -28,7 +29,7 @@
<string name="digit7" msgid="658125644218958447">"7"</string>
<string name="digit8" msgid="3134686906411558886">"8"</string>
<string name="digit9" msgid="765379157698748031">"9"</string>
- <string name="del" msgid="6248896117422989693">"FUTA"</string>
+ <string name="del" msgid="2051454354221101970">"DEL"</string>
<string name="clear" msgid="8103610981407459768">"FUT"</string>
<string name="sin" msgid="6793866152659175277">"sin"</string>
<string name="cos" msgid="6901841853098114414">"cos"</string>
diff --git a/res/values-sw600dp-port/styles.xml b/res/values-sw600dp-port/dimens.xml
similarity index 100%
rename from res/values-sw600dp-port/styles.xml
rename to res/values-sw600dp-port/dimens.xml
diff --git a/res/values-sw800dp/styles.xml b/res/values-sw600dp/dimens.xml
similarity index 65%
copy from res/values-sw800dp/styles.xml
copy to res/values-sw600dp/dimens.xml
index 9dd6b4e..ec548bb 100644
--- a/res/values-sw800dp/styles.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -14,9 +14,12 @@
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="btn_digit_text_size">50sp</dimen>
+ <dimen name="btn_operation_text_size">50sp</dimen>
+ <dimen name="btn_function_text_size">25sp</dimen>
+ <dimen name="btn_clear_text_size">40sp</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-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
deleted file mode 100644
index 8676d59..0000000
--- a/res/values-sw600dp/styles.xml
+++ /dev/null
@@ -1,43 +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">50sp</dimen>
- <dimen name="btn_operation_text_size">50sp</dimen>
- <dimen name="btn_function_text_size">25sp</dimen>
- <dimen name="btn_clear_text_size">40sp</dimen>
- <dimen name="display_text_size">60sp</dimen>
-
- <dimen name="left_right_padding">16sp</dimen>
- <dimen name="top_bottom_padding">16sp</dimen>
- <dimen name="group_padding">16sp</dimen>
-
- <style name="display_style">
- <item name="android:textSize">@dimen/display_text_size</item>
- <item name="android:inputType">text|textNoSuggestions</item>
- <item name="android:gravity">right|bottom</item>
- <item name="android:layout_gravity">right|bottom</item>
- <item name="android:textColor">#ffffff</item>
- <item name="android:maxLines">1</item>
- <item name="android:scrollbars">none</item>
- <item name="android:scrollHorizontally">true</item>
- <item name="android:layout_width">match_parent</item>
- <item name="android:layout_height">wrap_content</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>
-</resources>
\ No newline at end of file
diff --git a/res/values-sw800dp-land/styles.xml b/res/values-sw800dp-land/dimens.xml
similarity index 100%
rename from res/values-sw800dp-land/styles.xml
rename to res/values-sw800dp-land/dimens.xml
diff --git a/res/values-sw800dp-port/styles.xml b/res/values-sw800dp-port/dimens.xml
similarity index 100%
rename from res/values-sw800dp-port/styles.xml
rename to res/values-sw800dp-port/dimens.xml
diff --git a/res/values-sw800dp/styles.xml b/res/values-sw800dp/dimens.xml
similarity index 94%
rename from res/values-sw800dp/styles.xml
rename to res/values-sw800dp/dimens.xml
index 9dd6b4e..7bd649f 100644
--- a/res/values-sw800dp/styles.xml
+++ b/res/values-sw800dp/dimens.xml
@@ -18,5 +18,4 @@
<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-th/strings.xml b/res/values-th/strings.xml
index ce74db2..20f8d6b 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!--
+ Copyright (C) 2007 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.
@@ -28,7 +29,7 @@
<string name="digit7" msgid="658125644218958447">"7"</string>
<string name="digit8" msgid="3134686906411558886">"8"</string>
<string name="digit9" msgid="765379157698748031">"9"</string>
- <string name="del" msgid="6248896117422989693">"DELETE"</string>
+ <string name="del" msgid="2051454354221101970">"DEL"</string>
<string name="clear" msgid="8103610981407459768">"CLR"</string>
<string name="sin" msgid="6793866152659175277">"sin"</string>
<string name="cos" msgid="6901841853098114414">"cos"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 181df8e..afd9c33 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!--
+ Copyright (C) 2007 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.
@@ -28,7 +29,7 @@
<string name="digit7" msgid="658125644218958447">"7"</string>
<string name="digit8" msgid="3134686906411558886">"8"</string>
<string name="digit9" msgid="765379157698748031">"9"</string>
- <string name="del" msgid="6248896117422989693">"TANGGALIN"</string>
+ <string name="del" msgid="2051454354221101970">"DEL"</string>
<string name="clear" msgid="8103610981407459768">"CLR"</string>
<string name="sin" msgid="6793866152659175277">"sin"</string>
<string name="cos" msgid="6901841853098114414">"cos"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 9a2cc61..d810a56 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!--
+ Copyright (C) 2007 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.
@@ -28,7 +29,7 @@
<string name="digit7" msgid="658125644218958447">"7"</string>
<string name="digit8" msgid="3134686906411558886">"8"</string>
<string name="digit9" msgid="765379157698748031">"9"</string>
- <string name="del" msgid="6248896117422989693">"SİL"</string>
+ <string name="del" msgid="2051454354221101970">"SİL"</string>
<string name="clear" msgid="8103610981407459768">"CLR"</string>
<string name="sin" msgid="6793866152659175277">"sin"</string>
<string name="cos" msgid="6901841853098114414">"cos"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index d2801ca..b547b66 100755
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!--
+ Copyright (C) 2007 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.
@@ -28,7 +29,7 @@
<string name="digit7" msgid="658125644218958447">"7"</string>
<string name="digit8" msgid="3134686906411558886">"8"</string>
<string name="digit9" msgid="765379157698748031">"9"</string>
- <string name="del" msgid="6248896117422989693">"ВИДАЛИТИ"</string>
+ <string name="del" msgid="2051454354221101970">"ВИДАЛИТИ"</string>
<string name="clear" msgid="8103610981407459768">"CLR"</string>
<string name="sin" msgid="6793866152659175277">"sin"</string>
<string name="cos" msgid="6901841853098114414">"cos"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 31527ee..9a627d1 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!--
+ Copyright (C) 2007 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.
@@ -28,7 +29,7 @@
<string name="digit7" msgid="658125644218958447">"7"</string>
<string name="digit8" msgid="3134686906411558886">"8"</string>
<string name="digit9" msgid="765379157698748031">"9"</string>
- <string name="del" msgid="6248896117422989693">"XOÁ"</string>
+ <string name="del" msgid="2051454354221101970">"DEL"</string>
<string name="clear" msgid="8103610981407459768">"CLR"</string>
<string name="sin" msgid="6793866152659175277">"sin"</string>
<string name="cos" msgid="6901841853098114414">"cos"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index be93218..561b02f 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!--
+ Copyright (C) 2007 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.
@@ -28,7 +29,7 @@
<string name="digit7" msgid="658125644218958447">"7"</string>
<string name="digit8" msgid="3134686906411558886">"8"</string>
<string name="digit9" msgid="765379157698748031">"9"</string>
- <string name="del" msgid="6248896117422989693">"删除"</string>
+ <string name="del" msgid="2051454354221101970">"删除"</string>
<string name="clear" msgid="8103610981407459768">"清除"</string>
<string name="sin" msgid="6793866152659175277">"sin"</string>
<string name="cos" msgid="6901841853098114414">"cos"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000..3785ce9
--- /dev/null
+++ b/res/values-zh-rHK/strings.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2007 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 xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_name" msgid="8095131950334945205">"計算機"</string>
+ <string name="error" msgid="9197457880925804499">"發生錯誤"</string>
+ <string name="digit0" msgid="8069590963464434135">"0"</string>
+ <string name="digit1" msgid="8535041374797804029">"1"</string>
+ <string name="digit2" msgid="8977354203154316247">"2"</string>
+ <string name="digit3" msgid="148544090755132760">"3"</string>
+ <string name="digit4" msgid="2199490603838247678">"4"</string>
+ <string name="digit5" msgid="7568514524384173087">"5"</string>
+ <string name="digit6" msgid="6705952561049362551">"6"</string>
+ <string name="digit7" msgid="658125644218958447">"7"</string>
+ <string name="digit8" msgid="3134686906411558886">"8"</string>
+ <string name="digit9" msgid="765379157698748031">"9"</string>
+ <string name="del" msgid="2051454354221101970">"刪除"</string>
+ <string name="clear" msgid="8103610981407459768">"清除"</string>
+ <string name="sin" msgid="6793866152659175277">"sin"</string>
+ <string name="cos" msgid="6901841853098114414">"cos"</string>
+ <string name="tan" msgid="7957459816738554960">"Tan"</string>
+ <string name="e" msgid="1377847800971731483">"e"</string>
+ <string name="ln" msgid="6888500680285403344">"LN"</string>
+ <string name="lg" msgid="873623857385418182">"記錄"</string>
+ <string name="leftParen" msgid="4850643713953092099">"("</string>
+ <string name="rightParen" msgid="3177971166159324016">")"</string>
+ <string name="basic" msgid="7691469861698059753">"基本面板"</string>
+ <string name="advanced" msgid="7122495413742976492">"進階面板"</string>
+ <string name="clear_history" msgid="8458043980601165012">"清除記錄"</string>
+ <string name="text_copied_toast" msgid="5801480710472541833">"文字已複製。"</string>
+ <string name="leftParenDesc" msgid="8446428211982811379">"左括弧"</string>
+ <string name="rightParenDesc" msgid="9133691645148976523">"右括弧"</string>
+ <string name="factorialDesc" msgid="9217024218012761574">"階乘"</string>
+ <string name="lnDesc" msgid="1052579286300842270">"自然對數"</string>
+ <string name="lgDesc" msgid="6490920451513731160">"對數"</string>
+ <string name="sqrtDesc" msgid="2247252128762219267">"平方根"</string>
+ <string name="divDesc" msgid="7442623079124315427">"除"</string>
+ <string name="mulDesc" msgid="9003016819648670694">"乘"</string>
+ <string name="plusDesc" msgid="3145322700823848264">"加"</string>
+ <string name="minusDesc" msgid="5033462008907390900">"減"</string>
+ <string name="dotDesc" msgid="5253752241630161722">"點"</string>
+ <string name="powerDesc" msgid="9034898318444176910">"指數"</string>
+ <string name="delDesc" msgid="8211175878012032240">"刪除"</string>
+ <string name="clearDesc" msgid="8015748901120751476">"清除"</string>
+ <string name="tanDesc" msgid="2055554933130702423">"正切"</string>
+ <string name="sinDesc" msgid="6563285042235077204">"正弦"</string>
+ <string name="cosDesc" msgid="4048942450207926538">"餘弦"</string>
+ <string name="eDesc" msgid="6709583372168924068">"歐拉數"</string>
+ <string name="piDesc" msgid="8838151606775021517">"圓周率"</string>
+ <string name="equalDesc" msgid="4164435100263313101">"等於"</string>
+ <string-array name="operatorDescs">
+ <item msgid="7903565108986789641">"左括弧"</item>
+ <item msgid="1688156211934459752">"右括弧"</item>
+ <item msgid="6664829080840305856">"階乘"</item>
+ <item msgid="2880199289575144121">"自然對數"</item>
+ <item msgid="4398774906998694599">"對數"</item>
+ <item msgid="1791869359785943266">"平方根"</item>
+ <item msgid="6833720171974254459">"除以"</item>
+ <item msgid="2646574635189709515">"乘以"</item>
+ <item msgid="3487936384379753697">"加"</item>
+ <item msgid="8608534484562258856">"減"</item>
+ <item msgid="3456824579675198186">"點"</item>
+ <item msgid="4528629783180278651">"指數"</item>
+ <item msgid="4050948027333760159">"正切"</item>
+ <item msgid="8716478860618683850">"正弦"</item>
+ <item msgid="3203211483560707480">"餘弦"</item>
+ <item msgid="8587490959348493065">"圓周率"</item>
+ <item msgid="8134315487552198394">"等於"</item>
+ </string-array>
+</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index bceb3b9..9213b5a 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!--
+ Copyright (C) 2007 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.
@@ -28,8 +29,8 @@
<string name="digit7" msgid="658125644218958447">"7"</string>
<string name="digit8" msgid="3134686906411558886">"8"</string>
<string name="digit9" msgid="765379157698748031">"9"</string>
- <string name="del" msgid="6248896117422989693">"刪除"</string>
- <string name="clear" msgid="8103610981407459768">"CLR"</string>
+ <string name="del" msgid="2051454354221101970">"DEL"</string>
+ <string name="clear" msgid="8103610981407459768">"清除"</string>
<string name="sin" msgid="6793866152659175277">"sin"</string>
<string name="cos" msgid="6901841853098114414">"cos"</string>
<string name="tan" msgid="7957459816738554960">"tan"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 706cfa2..def24fc 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!--
+ Copyright (C) 2007 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.
@@ -28,7 +29,7 @@
<string name="digit7" msgid="658125644218958447">"7"</string>
<string name="digit8" msgid="3134686906411558886">"8"</string>
<string name="digit9" msgid="765379157698748031">"9"</string>
- <string name="del" msgid="6248896117422989693">"SUSA"</string>
+ <string name="del" msgid="2051454354221101970">"I-DEL"</string>
<string name="clear" msgid="8103610981407459768">"CLR"</string>
<string name="sin" msgid="6793866152659175277">"sin"</string>
<string name="cos" msgid="6901841853098114414">"cos"</string>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 54171e9..3eaf995 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -16,5 +16,24 @@
<resources>
<color name="magic_flame">#00ffffff</color>
- <color name="button_text">#ffffffff</color>
+
+ <color name="accent">#18FFFF</color>
+
+ <color name="primary_light">#B3E5FC</color>
+ <color name="primary">#03A9F4</color>
+ <color name="primary_dark">#0288D1</color>
+
+ <color name="gray_80">#CCCCCC</color>
+ <color name="gray_70">#B3B3B3</color>
+ <color name="gray_60">#999999</color>
+ <color name="gray_50">#808080</color>
+ <color name="gray_40">#666666</color>
+ <color name="gray_30">#4D4D4D</color>
+ <color name="gray_20">#333333</color>
+
+ <color name="white">#FFFFFF</color>
+ <color name="black">#000000</color>
+
+ <color name="text_light">#B3FFFFFF</color>
+ <color name="text_dark">#B3000000</color>
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
new file mode 100644
index 0000000..74a949b
--- /dev/null
+++ b/res/values/dimens.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+ <dimen name="btn_digit_text_size">40sp</dimen>
+ <dimen name="btn_operation_text_size">40sp</dimen>
+ <dimen name="btn_function_text_size">30sp</dimen>
+ <dimen name="btn_clear_text_size">30sp</dimen>
+ <dimen name="small_text_size">16dp</dimen>
+ <dimen name="pager_shadow_width">16dp</dimen>
+ <dimen name="activity_horizontal_margin">16dp</dimen>
+ <dimen name="activity_vertical_margin">16dp</dimen>
+
+ <!-- 72 = 16 + 8N -->
+ <dimen name="display_maximum_text_size">72sp</dimen>
+ <dimen name="display_minimum_text_size">16sp</dimen>
+ <dimen name="display_step_text_size">8sp</dimen>
+
+</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a24cd4e..b1c990a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!--
+ Copyright (C) 2007 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.
@@ -15,6 +16,7 @@
-->
<resources>
+
<!-- Application name -->
<string name="app_name">Calculator</string>
<!-- If there is a syntax error in the user entered calculation, an error dialog will appear. This is the title. -->
@@ -40,7 +42,7 @@
<!-- Displayed numbers for the digit buttons -->
<string name="digit9">9</string>
<!-- Button name on screen to delete the last entered digit or operator -->
- <string name="del">DELETE</string>
+ <string name="del">DEL</string>
<!-- Button name on screen to clear the entire calculation field. [CHAR LIMIT=6] -->
<string name="clear">CLR</string>
<!-- Do not translate. Unicode division sign; don't translate. Displayed as button on screen. -->
@@ -59,30 +61,30 @@
<string name="enter">\u2193</string>
<!-- Displayed on buttons on screen for the sin function. -->
<string name="sin">sin</string>
- <!-- Do not translate. What we replace translated SIN with for calculating sin.-->
- <string translate="false" name="sin_mathematical_value">sin</string>
+ <!-- Do not translate. What we replace translated SIN with for calculating sin. -->
+ <string name="sin_mathematical_value" translate="false">sin</string>
<!-- Displayed on buttons on screen for the cos function. -->
<string name="cos">cos</string>
<!-- Do not translate. What we replace translated COS with for calculating cos. -->
- <string translate="false" name="cos_mathematical_value">cos</string>
+ <string name="cos_mathematical_value" translate="false">cos</string>
<!-- Displayed on buttons on screen for the tan function. -->
<string name="tan">tan</string>
<!-- Do not translate. What we replace translated TAN with for calculating tan. -->
- <string translate="false" name="tan_mathematical_value">tan</string>
+ <string name="tan_mathematical_value" translate="false">tan</string>
<!-- Do not translate. Unicode pi sign; don't translate. Displayed as button on screen. -->
<string name="pi">\u03c0</string>
<!-- Displayed on buttons on screen for the e function. -->
<string name="e">e</string>
<!-- Do not translate. What we replace translated e with for calculating e. -->
- <string translate="false" name="e_mathematical_value">e</string>
+ <string name="e_mathematical_value" translate="false">e</string>
<!-- Displayed on buttons on screen for the ln function. -->
<string name="ln">ln</string>
<!-- Do not translate. What we replace translated ln with for calculating ln. -->
- <string translate="false" name="ln_mathematical_value">ln</string>
+ <string name="ln_mathematical_value" translate="false">ln</string>
<!-- Displayed on buttons on screen for the log function. -->
<string name="lg">log</string>
<!-- Do not translate. What we replace translated lg with for calculating lg. -->
- <string translate="false" name="lg_mathematical_value">lg</string>
+ <string name="lg_mathematical_value" translate="false">lg</string>
<!-- Displayed on buttons on screen for a left parenthesis. -->
<string name="leftParen">(</string>
<!-- Displayed on buttons on screen for a right parenthesis. -->
@@ -102,9 +104,11 @@
<!-- Toast shown when text is copied to the clipboard. -->
<string name="text_copied_toast">Text copied.</string>
- <!--Content descriptions for accessibility. These strings will be read aloud to users who are using the calculator with
+ <!--
+ Content descriptions for accessibility. These strings will be read aloud to users who are using the calculator with
accessibility features enabled and should reflect the mathematical concept instead of a direct representation of what is shown
- on the button-->
+ on the button
+ -->
<string name="leftParenDesc">left parenthesis</string>
<string name="rightParenDesc">right parenthesis</string>
<string name="factorialDesc">factorial</string>
@@ -126,9 +130,11 @@
<string name="piDesc">pi</string>
<string name="equalDesc">equals</string>
- <!--Content descriptions for accessibility used as keys when determining which mathematical
+ <!--
+ Content descriptions for accessibility used as keys when determining which mathematical
concept description to speak when accessibility features are enabled. Order of the array is
- important. -->
+ important.
+ -->
<string-array name="operators" translatable="false">
<item>(</item>
<item>)</item>
@@ -149,44 +155,48 @@
<item>=</item>
</string-array>
- <!--Content descriptions for accessibility. These strings will be read aloud to users who
+ <!--
+ Content descriptions for accessibility. These strings will be read aloud to users who
are using the calculator with accessibility features enabled and hover over the edit text
field. These should reflect the mathematical concept instead of a direct representation of
- what is shown in the text field. Order of the array is important.-->
+ what is shown in the text field. Order of the array is important.
+ -->
<string-array name="operatorDescs">
- <!-- Description for mathematical ( [CHAR LIMIT=200]-->
+
+ <!-- Description for mathematical ( [CHAR LIMIT=200] -->
<item>left parenthesis</item>
- <!-- Description for mathematical ) [CHAR LIMIT=200]-->
+ <!-- Description for mathematical ) [CHAR LIMIT=200] -->
<item>right parenthesis</item>
- <!-- Description for mathematical ! (factorial) function [CHAR LIMIT=200]-->
+ <!-- Description for mathematical ! (factorial) function [CHAR LIMIT=200] -->
<item>factorial</item>
- <!-- Description for mathematical ln [CHAR LIMIT=200]-->
+ <!-- Description for mathematical ln [CHAR LIMIT=200] -->
<item>natural logarithm</item>
- <!-- Description for mathematical log [CHAR LIMIT=200]-->
+ <!-- Description for mathematical log [CHAR LIMIT=200] -->
<item>logarithm</item>
- <!-- Description for mathematical square root [CHAR LIMIT=200]-->
+ <!-- Description for mathematical square root [CHAR LIMIT=200] -->
<item>square root</item>
- <!-- Description for mathematical / [CHAR LIMIT=200]-->
+ <!-- Description for mathematical / [CHAR LIMIT=200] -->
<item>divided by</item>
- <!-- Description for mathematical x [CHAR LIMIT=200]-->
+ <!-- Description for mathematical x [CHAR LIMIT=200] -->
<item>multiplied by</item>
- <!-- Description for mathematical + [CHAR LIMIT=200]-->
+ <!-- Description for mathematical + [CHAR LIMIT=200] -->
<item>plus</item>
- <!-- Description for mathematical - [CHAR LIMIT=200]-->
+ <!-- Description for mathematical - [CHAR LIMIT=200] -->
<item>minus</item>
- <!-- Description for mathematical . [CHAR LIMIT=200]-->
+ <!-- Description for mathematical . [CHAR LIMIT=200] -->
<item> point </item>
- <!-- Description for mathematical ^ [CHAR LIMIT=200]-->
+ <!-- Description for mathematical ^ [CHAR LIMIT=200] -->
<item>power</item>
- <!-- Description for mathematical TAN [CHAR LIMIT=200]-->
+ <!-- Description for mathematical TAN [CHAR LIMIT=200] -->
<item>tangent</item>
- <!-- Description for mathematical SIN [CHAR LIMIT=200]-->
+ <!-- Description for mathematical SIN [CHAR LIMIT=200] -->
<item>sine</item>
- <!-- Description for mathematical COS [CHAR LIMIT=200]-->
+ <!-- Description for mathematical COS [CHAR LIMIT=200] -->
<item>cosine</item>
- <!-- Description for mathematical PI [CHAR LIMIT=200]-->
+ <!-- Description for mathematical PI [CHAR LIMIT=200] -->
<item>pi</item>
- <!-- Description for mathematical = [CHAR LIMIT=200]-->
+ <!-- Description for mathematical = [CHAR LIMIT=200] -->
<item>equals</item>
</string-array>
+
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 4680f31..156da37 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!--
+ Copyright (C) 2007 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.
@@ -13,82 +14,113 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<resources>
- <dimen name="btn_digit_text_size">40sp</dimen>
- <dimen name="btn_operation_text_size">40sp</dimen>
- <dimen name="btn_function_text_size">30sp</dimen>
- <dimen name="btn_clear_text_size">30sp</dimen>
- <dimen name="display_text_size">30sp</dimen>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
- <style name="button_style">
- <item name="android:textSize">40dp</item>
- <item name="android:layout_width">match_parent</item>
- <item name="android:layout_height">match_parent</item>
- <item name="android:layout_weight">1</item>
- <item name="android:focusable">true</item>
- <item name="android:background">@drawable/btn_function</item>
- <item name="android:layout_marginLeft">1dp</item>
+ <style name="button_style" parent="@android:style/Widget.Quantum.Button.Borderless">
+ <item name="android:textSize">24dp</item>
+ <item name="android:fontFamily">sans-serif-light</item>
+ <item name="android:textAllCaps">false</item>
+ <item name="android:layout_width">match_parent</item>
+ <item name="android:layout_height">match_parent</item>
+ <item name="android:layout_weight">1</item>
+ <item name="android:focusable">true</item>
+ <item name="android:onClick">onClick</item>
+ </style>
+
+ <style name="function_pad">
+ <item name="android:background">@color/gray_40</item>
</style>
- <style name="digit_button_style" parent="button_style">
- <item name="android:background">@drawable/btn_digit</item>
+ <style name="function_button" parent="button_style">
+ <item name="android:background">@drawable/btn_digit</item>
+ <item name="android:textColor">@color/text_light</item>
+ </style>
+
+ <!-- Function button used on sw600 devices. -->
+ <style name="function_button_sw600" parent="function_button">
+ <item name="android:layout_width">0dip</item>
+ <item name="android:layout_weight">1</item>
+ </style>
+
+ <style name="digit_pad">
+ <item name="android:background">@color/gray_30</item>
+ </style>
+
+ <style name="digit_button" parent="button_style">
+ <item name="android:background">@drawable/btn_digit</item>
+ <item name="android:textColor">@color/text_light</item>
+ </style>
+
+ <!-- Digit button used on sw600 devices. -->
+ <style name="digit_button_sw600" parent="digit_button">
+ <item name="android:layout_width">0dip</item>
+ <item name="android:layout_weight">1</item>
+ </style>
+
+ <style name="advanced_pad">
+ <item name="android:background">@color/primary</item>
+ </style>
+
+ <style name="advanced_button" parent="button_style">
+ <item name="android:background">@drawable/btn_advanced</item>
+ <item name="android:textColor">@color/text_light</item>
+ </style>
+
+ <!-- Advanced button used on sw600 devices. -->
+ <style name="advanced_button_s600" parent="advanced_button">
+ <item name="android:layout_width">0dip</item>
+ <item name="android:layout_weight">1</item>
+ </style>
+
+ <style name="advanced_button_small" parent="advanced_button">
+ <item name="android:textSize">30dp</item>
</style>
<style name="button_small_style" parent="button_style">
- <item name="android:textSize">30dp</item>
+ <item name="android:textSize">30dp</item>
</style>
+ <!-- Style applied to a display card. -->
<style name="display_style">
- <item name="android:textSize">@dimen/display_text_size</item>
- <item name="android:inputType">text|textNoSuggestions</item>
- <item name="android:gravity">right|center_vertical</item>
- <item name="android:textColor">#ffffff</item>
- <item name="android:maxLines">1</item>
- <item name="android:scrollbars">none</item>
- <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:paddingTop">8dp</item>
- <item name="android:paddingLeft">8dp</item>
- <item name="android:paddingRight">8dp</item>
- <item name="android:paddingBottom">0dp</item>
+ <item name="android:textSize">@dimen/display_maximum_text_size</item>
+ <item name="android:inputType">text|textNoSuggestions</item>
+ <item name="android:gravity">right|center_vertical</item>
+ <item name="android:textColor">@color/text_dark</item>
+ <item name="android:maxLines">1</item>
+ <item name="android:scrollbars">none</item>
+ <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:paddingTop">16dp</item>
+ <item name="android:paddingLeft">8dp</item>
+ <item name="android:paddingRight">8dp</item>
+ <item name="android:paddingBottom">16dp</item>
+ <item name="android:background">@drawable/card_background</item>
+ <item name="android:layout_margin">8sp</item>
</style>
+ <!-- Style applied to the display card container. -->
+ <style name="display_holder_style">
+ <item name="android:background">@color/gray_80</item>
+ </style>
+
+ <!-- Style used in sw600dp single-screen mode. -->
<style name="btn_row_style">
- <item name="android:layout_width">match_parent</item>
- <item name="android:layout_height">0dip</item>
- <item name="android:layout_weight">1</item>
- <item name="android:orientation">horizontal</item>
- </style>
-
- <style name="btn_function_cell_style">
- <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:background">@drawable/btn_function</item>
- <item name="android:textSize">@dimen/btn_function_text_size</item>
- </style>
-
- <style name="btn_operation_cell_style">
- <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>
-
- <style name="btn_digit_cell_style">
- <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>
+ <item name="android:layout_width">match_parent</item>
+ <item name="android:layout_height">0dip</item>
+ <item name="android:layout_weight">1</item>
+ <item name="android:orientation">horizontal</item>
</style>
<style name="btn_clear">
- <item name="android:background">?android:attr/selectableItemBackground</item>
- <item name="android:textSize">@dimen/btn_clear_text_size</item>
+ <item name="android:background">?android:attr/selectableItemBackground</item>
+ <item name="android:textSize">@dimen/btn_clear_text_size</item>
</style>
-</resources>
\ No newline at end of file
+
+ <style name="AppTheme" parent="@android:style/Theme.Quantum.NoActionBar">
+ <item name="android:colorPrimary">@color/primary</item>
+ <item name="android:colorPrimaryLight">@color/primary_light</item>
+ <item name="android:colorPrimaryDark">@color/primary_dark</item>
+ </style>
+
+</resources>
diff --git a/src/com/android/calculator2/Calculator.java b/src/com/android/calculator2/Calculator.java
index d7b7742..bb48147 100644
--- a/src/com/android/calculator2/Calculator.java
+++ b/src/com/android/calculator2/Calculator.java
@@ -17,209 +17,91 @@
package com.android.calculator2;
import android.app.Activity;
-import android.content.res.Resources;
-import android.content.res.TypedArray;
import android.os.Bundle;
-import android.os.Parcelable;
-import android.support.v4.view.PagerAdapter;
import android.support.v4.view.ViewPager;
import android.util.Log;
-import android.view.KeyEvent;
import android.view.LayoutInflater;
-import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewConfiguration;
-import android.view.ViewGroup;
import android.view.WindowManager;
-import android.widget.PopupMenu;
import android.widget.PopupMenu.OnMenuItemClickListener;
+import com.android.calculator2.R;
+
public class Calculator extends Activity implements PanelSwitcher.Listener, Logic.Listener,
- OnClickListener, OnMenuItemClickListener {
- EventListener mListener = new EventListener();
+ OnMenuItemClickListener, View.OnClickListener {
+ private static final String STATE_CURRENT_VIEW = "state-current-view";
+
+ private final EventListener mListener = new EventListener();
+
private CalculatorDisplay mDisplay;
private Persist mPersist;
private History mHistory;
private Logic mLogic;
private ViewPager mPager;
- private View mClearButton;
- private View mBackspaceButton;
- private View mOverflowMenuButton;
- static final int BASIC_PANEL = 0;
- static final int ADVANCED_PANEL = 1;
-
- private static final String LOG_TAG = "Calculator";
- private static final boolean DEBUG = false;
- private static final boolean LOG_ENABLED = false;
- private static final String STATE_CURRENT_VIEW = "state-current-view";
+ private View mClr;
+ private View mDel;
@Override
public void onCreate(Bundle state) {
super.onCreate(state);
- // Disable IME for this application
- getWindow().setFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM,
- WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
-
setContentView(R.layout.main);
+
mPager = (ViewPager) findViewById(R.id.panelswitch);
if (mPager != null) {
- mPager.setAdapter(new PageAdapter(mPager));
- } else {
- // Single page UI
- final TypedArray buttons = getResources().obtainTypedArray(R.array.buttons);
- for (int i = 0; i < buttons.length(); i++) {
- setOnClickListener(null, buttons.getResourceId(i, 0));
- }
- buttons.recycle();
- }
+ final LayoutInflater inflater = LayoutInflater.from(this);
+ final View simple = inflater.inflate(R.layout.simple_pad, mPager, false);
+ final View advanced = inflater.inflate(R.layout.advanced_pad, mPager, false);
+ mClr = simple.findViewById(R.id.clear);
+ mDel = simple.findViewById(R.id.del);
- if (mClearButton == null) {
- mClearButton = findViewById(R.id.clear);
- mClearButton.setOnClickListener(mListener);
- mClearButton.setOnLongClickListener(mListener);
- }
- if (mBackspaceButton == null) {
- mBackspaceButton = findViewById(R.id.del);
- mBackspaceButton.setOnClickListener(mListener);
- mBackspaceButton.setOnLongClickListener(mListener);
+ final PageAdapter adapter = new PageAdapter();
+ adapter.add(simple);
+ adapter.add(advanced);
+
+ mPager.setAdapter(adapter);
+ mPager.setCurrentItem(state == null ? 0 : state.getInt(STATE_CURRENT_VIEW, 0));
+ } else {
+ mClr = findViewById(R.id.clear);
+ mDel = findViewById(R.id.del);
}
mPersist = new Persist(this);
mPersist.load();
- mHistory = mPersist.history;
+ mHistory = mPersist.getHistory();
mDisplay = (CalculatorDisplay) findViewById(R.id.display);
mLogic = new Logic(this, mHistory, mDisplay);
mLogic.setListener(this);
-
mLogic.setDeleteMode(mPersist.getDeleteMode());
mLogic.setLineLength(mDisplay.getMaxDigits());
- HistoryAdapter historyAdapter = new HistoryAdapter(this, mHistory, mLogic);
+ final HistoryAdapter historyAdapter = new HistoryAdapter(this, mHistory, mLogic);
mHistory.setObserver(historyAdapter);
- if (mPager != null) {
- mPager.setCurrentItem(state == null ? 0 : state.getInt(STATE_CURRENT_VIEW, 0));
- }
-
mListener.setHandler(mLogic, mPager);
mDisplay.setOnKeyListener(mListener);
-
- if (!ViewConfiguration.get(this).hasPermanentMenuKey()) {
- createFakeMenu();
- }
-
mLogic.resumeWithHistory();
- updateDeleteMode();
}
- private void updateDeleteMode() {
- if (mLogic.getDeleteMode() == Logic.DELETE_MODE_BACKSPACE) {
- mClearButton.setVisibility(View.GONE);
- mBackspaceButton.setVisibility(View.VISIBLE);
- } else {
- mClearButton.setVisibility(View.VISIBLE);
- mBackspaceButton.setVisibility(View.GONE);
- }
- }
-
- void setOnClickListener(View root, int id) {
- final View target = root != null ? root.findViewById(id) : findViewById(id);
- target.setOnClickListener(mListener);
- }
-
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- super.onCreateOptionsMenu(menu);
- getMenuInflater().inflate(R.menu.menu, menu);
- return true;
- }
-
- @Override
- public boolean onPrepareOptionsMenu(Menu menu) {
- super.onPrepareOptionsMenu(menu);
- menu.findItem(R.id.basic).setVisible(!getBasicVisibility());
- menu.findItem(R.id.advanced).setVisible(!getAdvancedVisibility());
- return true;
- }
-
-
- private void createFakeMenu() {
- mOverflowMenuButton = findViewById(R.id.overflow_menu);
- if (mOverflowMenuButton != null) {
- mOverflowMenuButton.setVisibility(View.VISIBLE);
- mOverflowMenuButton.setOnClickListener(this);
- }
- }
-
- @Override
- public void onClick(View v) {
- switch (v.getId()) {
- case R.id.overflow_menu:
- PopupMenu menu = constructPopupMenu();
- if (menu != null) {
- menu.show();
- }
- break;
- }
- }
-
- private PopupMenu constructPopupMenu() {
- final PopupMenu popupMenu = new PopupMenu(this, mOverflowMenuButton);
- mOverflowMenuButton.setOnTouchListener(popupMenu.getDragToOpenListener());
- final Menu menu = popupMenu.getMenu();
- popupMenu.inflate(R.menu.menu);
- popupMenu.setOnMenuItemClickListener(this);
- onPrepareOptionsMenu(menu);
- return popupMenu;
- }
-
-
@Override
public boolean onMenuItemClick(MenuItem item) {
return onOptionsItemSelected(item);
}
- private boolean getBasicVisibility() {
- return mPager != null && mPager.getCurrentItem() == BASIC_PANEL;
- }
-
- private boolean getAdvancedVisibility() {
- return mPager != null && mPager.getCurrentItem() == ADVANCED_PANEL;
- }
-
@Override
- public boolean onOptionsItemSelected(MenuItem item) {
- switch (item.getItemId()) {
- case R.id.clear_history:
- mHistory.clear();
- mLogic.onClear();
- break;
-
- case R.id.basic:
- if (!getBasicVisibility() && mPager != null) {
- mPager.setCurrentItem(BASIC_PANEL, true);
- }
- break;
-
- case R.id.advanced:
- if (!getAdvancedVisibility() && mPager != null) {
- mPager.setCurrentItem(ADVANCED_PANEL, true);
- }
- break;
- }
- return super.onOptionsItemSelected(item);
+ public void onClick(View v) {
+ mListener.onClick(v);
}
@Override
protected void onSaveInstanceState(Bundle state) {
super.onSaveInstanceState(state);
+
if (mPager != null) {
state.putInt(STATE_CURRENT_VIEW, mPager.getCurrentItem());
}
@@ -228,25 +110,20 @@
@Override
public void onPause() {
super.onPause();
+
mLogic.updateHistory();
mPersist.setDeleteMode(mLogic.getDeleteMode());
mPersist.save();
}
@Override
- public boolean onKeyDown(int keyCode, KeyEvent keyEvent) {
- if (keyCode == KeyEvent.KEYCODE_BACK && getAdvancedVisibility()
- && mPager != null) {
- mPager.setCurrentItem(BASIC_PANEL);
- return true;
+ public void onDeleteModeChange(int deleteMode) {
+ if (deleteMode == Logic.DELETE_MODE_BACKSPACE) {
+ mDel.setVisibility(View.VISIBLE);
+ mClr.setVisibility(View.GONE);
} else {
- return super.onKeyDown(keyCode, keyEvent);
- }
- }
-
- static void log(String message) {
- if (LOG_ENABLED) {
- Log.v(LOG_TAG, message);
+ mDel.setVisibility(View.GONE);
+ mClr.setVisibility(View.VISIBLE);
}
}
@@ -254,84 +131,4 @@
public void onChange() {
invalidateOptionsMenu();
}
-
- @Override
- public void onDeleteModeChange() {
- updateDeleteMode();
- }
-
- class PageAdapter extends PagerAdapter {
- private View mSimplePage;
- private View mAdvancedPage;
-
- public PageAdapter(ViewPager parent) {
- final LayoutInflater inflater = LayoutInflater.from(parent.getContext());
- final View simplePage = inflater.inflate(R.layout.simple_pad, parent, false);
- final View advancedPage = inflater.inflate(R.layout.advanced_pad, parent, false);
- mSimplePage = simplePage;
- mAdvancedPage = advancedPage;
-
- final Resources res = getResources();
- final TypedArray simpleButtons = res.obtainTypedArray(R.array.simple_buttons);
- for (int i = 0; i < simpleButtons.length(); i++) {
- setOnClickListener(simplePage, simpleButtons.getResourceId(i, 0));
- }
- simpleButtons.recycle();
-
- final TypedArray advancedButtons = res.obtainTypedArray(R.array.advanced_buttons);
- for (int i = 0; i < advancedButtons.length(); i++) {
- setOnClickListener(advancedPage, advancedButtons.getResourceId(i, 0));
- }
- advancedButtons.recycle();
-
- final View clearButton = simplePage.findViewById(R.id.clear);
- if (clearButton != null) {
- mClearButton = clearButton;
- }
-
- final View backspaceButton = simplePage.findViewById(R.id.del);
- if (backspaceButton != null) {
- mBackspaceButton = backspaceButton;
- }
- }
-
- @Override
- public int getCount() {
- return 2;
- }
-
- @Override
- public void startUpdate(View container) {
- }
-
- @Override
- public Object instantiateItem(View container, int position) {
- final View page = position == 0 ? mSimplePage : mAdvancedPage;
- ((ViewGroup) container).addView(page);
- return page;
- }
-
- @Override
- public void destroyItem(View container, int position, Object object) {
- ((ViewGroup) container).removeView((View) object);
- }
-
- @Override
- public void finishUpdate(View container) {
- }
-
- @Override
- public boolean isViewFromObject(View view, Object object) {
- return view == object;
- }
-
- @Override
- public Parcelable saveState() {
- return null;
- }
-
- @Override
- public void restoreState(Parcelable state, ClassLoader loader) {
- }
- }
}
diff --git a/src/com/android/calculator2/CalculatorDisplay.java b/src/com/android/calculator2/CalculatorDisplay.java
index 3a19143..ec4070e 100644
--- a/src/com/android/calculator2/CalculatorDisplay.java
+++ b/src/com/android/calculator2/CalculatorDisplay.java
@@ -50,9 +50,16 @@
private int mMaxDigits = DEFAULT_MAX_DIGITS;
+ public CalculatorDisplay(Context context) {
+ this(context, null);
+ }
+
public CalculatorDisplay(Context context, AttributeSet attrs) {
super(context, attrs);
- mMaxDigits = attrs.getAttributeIntValue(null, ATTR_MAX_DIGITS, DEFAULT_MAX_DIGITS);
+
+ if (attrs != null) {
+ mMaxDigits = attrs.getAttributeIntValue(null, ATTR_MAX_DIGITS, DEFAULT_MAX_DIGITS);
+ }
}
public int getMaxDigits() {
@@ -62,6 +69,7 @@
protected void setLogic(Logic logic) {
NumberKeyListener calculatorKeyListener =
new NumberKeyListener() {
+ @Override
public int getInputType() {
return InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS;
}
@@ -84,7 +92,6 @@
Editable.Factory factory = new CalculatorEditable.Factory(logic);
for (int i = 0; i < 2; ++i) {
EditText text = (EditText) getChildAt(i);
- text.setBackground(null);
text.setEditableFactory(factory);
text.setKeyListener(calculatorKeyListener);
text.setSingleLine();
@@ -116,6 +123,11 @@
editor.getText().insert(cursor, delta);
}
+ void append(String delta) {
+ EditText editor = (EditText) getCurrentView();
+ editor.getText().append(delta);
+ }
+
EditText getEditText() {
return (EditText) getCurrentView();
}
diff --git a/src/com/android/calculator2/CalculatorEditText.java b/src/com/android/calculator2/CalculatorEditText.java
index 2135b38..b40bb1e 100644
--- a/src/com/android/calculator2/CalculatorEditText.java
+++ b/src/com/android/calculator2/CalculatorEditText.java
@@ -20,11 +20,13 @@
import android.content.ClipboardManager;
import android.content.Context;
import android.content.res.Resources;
+import android.graphics.Paint;
import android.text.Editable;
import android.text.InputType;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.util.Log;
+import android.util.TypedValue;
import android.view.ActionMode;
import android.view.ContextMenu;
import android.view.Menu;
@@ -35,43 +37,68 @@
import android.widget.EditText;
import android.widget.Toast;
-import com.google.common.collect.ImmutableMap;
+import com.android.calculator2.R;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
public class CalculatorEditText extends EditText {
-
private static final String LOG_TAG = "Calculator2";
private static final int CUT = 0;
private static final int COPY = 1;
private static final int PASTE = 2;
+
+ private static Map<String, String> sReplacementTable;
+ private static String[] sOperators;
+
+ private final int mMaximumTextSize;
+ private final int mMinimumTextSize;
+ private final int mStepTextSize;
+
+ private int mWidthConstraint = -1;
+
private String[] mMenuItemsStrings;
- private ImmutableMap<String, String> sReplacementTable;
- private String[] sOperators;
+
+ public CalculatorEditText(Context context) {
+ this(context, null);
+ }
public CalculatorEditText(Context context, AttributeSet attrs) {
super(context, attrs);
+
setCustomSelectionActionModeCallback(new NoTextSelectionMode());
setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
+ setCursorVisible(false);
+
+ final Resources res = getResources();
+ mMaximumTextSize = res.getDimensionPixelSize(R.dimen.display_maximum_text_size);
+ mMinimumTextSize = res.getDimensionPixelSize(R.dimen.display_minimum_text_size);
+ mStepTextSize = res.getDimensionPixelSize(R.dimen.display_step_text_size);
}
@Override
public boolean onTouchEvent(MotionEvent event) {
- if (event.getActionMasked() == MotionEvent.ACTION_UP) {
+ if (event.getActionMasked() == MotionEvent.ACTION_UP) {
// Hack to prevent keyboard and insertion handle from showing.
- cancelLongPress();
+ cancelLongPress();
}
+
return super.onTouchEvent(event);
}
@Override
public boolean performLongClick() {
showContextMenu();
+
return true;
}
@Override
public void onInitializeAccessibilityEvent(AccessibilityEvent event) {
super.onInitializeAccessibilityEvent(event);
- String mathText = mathParse(getText().toString());
+
+ final String mathText = mathParse(getText().toString());
// Parse the string into something more "mathematical" sounding.
if (!TextUtils.isEmpty(mathText)) {
event.getText().clear();
@@ -83,6 +110,7 @@
@Override
public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) {
super.onInitializeAccessibilityNodeInfo(info);
+
info.setText(mathParse(getText().toString()));
}
@@ -91,6 +119,51 @@
// Do nothing.
}
+ @Override
+ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+ super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+
+ mWidthConstraint =
+ MeasureSpec.getSize(widthMeasureSpec) - getPaddingLeft() - getPaddingRight();
+ setVariableFontSize();
+ }
+
+ @Override
+ protected void onTextChanged(CharSequence text, int start, int lengthBefore, int lengthAfter) {
+ super.onTextChanged(text, start, lengthBefore, lengthAfter);
+
+ if (TextUtils.isEmpty(text)) {
+ setTextSize(TypedValue.COMPLEX_UNIT_PX, mMaximumTextSize);
+ return;
+ }
+
+ setVariableFontSize();
+ }
+
+ private void setVariableFontSize() {
+ if (mWidthConstraint < 0) {
+ // Not measured, bail early.
+ return;
+ }
+
+ final Paint paint = new Paint();
+ final String measureText = getText().toString();
+ int lastFitTextSize = mMinimumTextSize;
+
+ while (lastFitTextSize < mMaximumTextSize) {
+ final int nextSize = lastFitTextSize + mStepTextSize;
+ paint.setTextSize(nextSize);
+ final float measuredTextWidth = paint.measureText(measureText);
+ if (measuredTextWidth > mWidthConstraint) {
+ break;
+ } else {
+ lastFitTextSize = nextSize;
+ }
+ }
+
+ setTextSize(TypedValue.COMPLEX_UNIT_PX, lastFitTextSize);
+ }
+
private String mathParse(String plainText) {
String parsedText = plainText;
if (!TextUtils.isEmpty(parsedText)) {
@@ -102,63 +175,63 @@
}
}
}
+
return parsedText;
}
private synchronized void initializeReplacementTable() {
if (sReplacementTable == null) {
- ImmutableMap.Builder<String, String> builder = ImmutableMap.builder();
- Resources res = getContext().getResources();
- sOperators = res.getStringArray(R.array.operators);
- String[] descs = res.getStringArray(R.array.operatorDescs);
- int pos = 0;
- for (String key : sOperators) {
- builder.put(key, descs[pos]);
- pos++;
+ final Resources res = getContext().getResources();
+ final String[] descs = res.getStringArray(R.array.operatorDescs);
+ final String[] ops = res.getStringArray(R.array.operators);
+ final HashMap<String, String> table = new HashMap<String, String>();
+ final int len = ops.length;
+ for (int i = 0; i < len; i++) {
+ table.put(ops[i], descs[i]);
}
- sReplacementTable = builder.build();
- }
- }
- private class MenuHandler implements MenuItem.OnMenuItemClickListener {
- public boolean onMenuItemClick(MenuItem item) {
- return onTextContextMenuItem(item.getTitle());
+ sOperators = ops;
+ sReplacementTable = Collections.unmodifiableMap(table);
}
}
public boolean onTextContextMenuItem(CharSequence title) {
- boolean handled = false;
if (TextUtils.equals(title, mMenuItemsStrings[CUT])) {
cutContent();
- handled = true;
- } else if (TextUtils.equals(title, mMenuItemsStrings[COPY])) {
+ return true;
+ } else if (TextUtils.equals(title, mMenuItemsStrings[COPY])) {
copyContent();
- handled = true;
- } else if (TextUtils.equals(title, mMenuItemsStrings[PASTE])) {
+ return true;
+ } else if (TextUtils.equals(title, mMenuItemsStrings[PASTE])) {
pasteContent();
- handled = true;
+ return true;
}
- return handled;
+
+ return false;
}
@Override
public void onCreateContextMenu(ContextMenu menu) {
- MenuHandler handler = new MenuHandler();
if (mMenuItemsStrings == null) {
- Resources resources = getResources();
+ final Resources resources = getResources();
mMenuItemsStrings = new String[3];
mMenuItemsStrings[CUT] = resources.getString(android.R.string.cut);
mMenuItemsStrings[COPY] = resources.getString(android.R.string.copy);
mMenuItemsStrings[PASTE] = resources.getString(android.R.string.paste);
}
- for (int i = 0; i < mMenuItemsStrings.length; i++) {
+
+ final MenuHandler handler = new MenuHandler();
+ final int len = mMenuItemsStrings.length;
+ for (int i = 0; i < len; i++) {
menu.add(Menu.NONE, i, i, mMenuItemsStrings[i]).setOnMenuItemClickListener(handler);
}
+
if (getText().length() == 0) {
menu.getItem(CUT).setVisible(false);
menu.getItem(COPY).setVisible(false);
}
- ClipData primaryClip = getPrimaryClip();
+
+ final ClipData primaryClip = getPrimaryClip();
if (primaryClip == null || primaryClip.getItemCount() == 0
|| !canPaste(primaryClip.getItemAt(0).coerceToText(getContext()))) {
menu.getItem(PASTE).setVisible(false);
@@ -166,61 +239,67 @@
}
private void setPrimaryClip(ClipData clip) {
- ClipboardManager clipboard = (ClipboardManager) getContext().
- getSystemService(Context.CLIPBOARD_SERVICE);
+ final ClipboardManager clipboard = (ClipboardManager) getContext().getSystemService(
+ Context.CLIPBOARD_SERVICE);
clipboard.setPrimaryClip(clip);
}
private void copyContent() {
final Editable text = getText();
- int textLength = text.length();
+ final int textLength = text.length();
setSelection(0, textLength);
- ClipboardManager clipboard = (ClipboardManager) getContext().getSystemService(
- Context.CLIPBOARD_SERVICE);
- clipboard.setPrimaryClip(ClipData.newPlainText(null, text));
- Toast.makeText(getContext(), R.string.text_copied_toast, Toast.LENGTH_SHORT).show();
+ setPrimaryClip(ClipData.newPlainText(null, text));
setSelection(textLength);
+
+ Toast.makeText(getContext(), R.string.text_copied_toast, Toast.LENGTH_SHORT).show();
}
private void cutContent() {
final Editable text = getText();
- int textLength = text.length();
+ final int textLength = text.length();
setSelection(0, textLength);
setPrimaryClip(ClipData.newPlainText(null, text));
- ((Editable) getText()).delete(0, textLength);
+ getText().delete(0, textLength);
setSelection(0);
}
private ClipData getPrimaryClip() {
- ClipboardManager clipboard = (ClipboardManager) getContext().getSystemService(
+ final ClipboardManager clipboard = (ClipboardManager) getContext().getSystemService(
Context.CLIPBOARD_SERVICE);
return clipboard.getPrimaryClip();
}
private void pasteContent() {
- ClipData clip = getPrimaryClip();
+ final ClipData clip = getPrimaryClip();
if (clip != null) {
- for (int i = 0; i < clip.getItemCount(); i++) {
- CharSequence paste = clip.getItemAt(i).coerceToText(getContext());
+ final int len = clip.getItemCount();
+ for (int i = 0; i < len; i++) {
+ final CharSequence paste = clip.getItemAt(i).coerceToText(getContext());
if (canPaste(paste)) {
- ((Editable) getText()).insert(getSelectionEnd(), paste);
+ getText().insert(getSelectionEnd(), paste);
}
}
}
}
private boolean canPaste(CharSequence paste) {
- boolean canPaste = true;
try {
Float.parseFloat(paste.toString());
+ return true;
} catch (NumberFormatException e) {
Log.e(LOG_TAG, "Error turning string to integer. Ignoring paste.", e);
- canPaste = false;
+ return false;
}
- return canPaste;
}
- class NoTextSelectionMode implements ActionMode.Callback {
+ private class MenuHandler implements MenuItem.OnMenuItemClickListener {
+ @Override
+ public boolean onMenuItemClick(MenuItem item) {
+ return onTextContextMenuItem(item.getTitle());
+ }
+ }
+
+ private class NoTextSelectionMode implements ActionMode.Callback {
@Override
public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
return false;
@@ -234,7 +313,8 @@
}
@Override
- public void onDestroyActionMode(ActionMode mode) {}
+ public void onDestroyActionMode(ActionMode mode) {
+ }
@Override
public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
diff --git a/src/com/android/calculator2/CalculatorEditable.java b/src/com/android/calculator2/CalculatorEditable.java
index cfa39f6..4550971 100644
--- a/src/com/android/calculator2/CalculatorEditable.java
+++ b/src/com/android/calculator2/CalculatorEditable.java
@@ -20,8 +20,9 @@
import android.text.Editable;
class CalculatorEditable extends SpannableStringBuilder {
- private static final char[] ORIGINALS = {'-', '*', '/'};
- private static final char[] REPLACEMENTS = {'\u2212', '\u00d7', '\u00f7'};
+ private static final char[] ORIGINALS = { '-', '*', '/' };
+ private static final char[] REPLACEMENTS = { '\u2212', '\u00d7', '\u00f7' };
+
private boolean isInsideReplace = false;
private Logic mLogic;
@@ -31,23 +32,23 @@
}
@Override
- public SpannableStringBuilder
- replace(int start, int end, CharSequence tb, int tbstart, int tbend) {
+ public SpannableStringBuilder replace(int start, int end, CharSequence tb, int tbstart,
+ int tbend) {
if (isInsideReplace) {
return super.replace(start, end, tb, tbstart, tbend);
- } else {
+ } else {
isInsideReplace = true;
try {
- String delta = tb.subSequence(tbstart, tbend).toString();
+ String delta = tb.subSequence(tbstart, tbend).toString();
return internalReplace(start, end, delta);
} finally {
isInsideReplace = false;
}
}
}
-
+
private SpannableStringBuilder internalReplace(int start, int end, String delta) {
- if (!mLogic.acceptInsert(delta)) {
+ if (!mLogic.acceptInsert(delta)) {
mLogic.cleared();
start = 0;
end = length();
@@ -57,11 +58,11 @@
delta = delta.replace(ORIGINALS[i], REPLACEMENTS[i]);
}
- int length = delta.length();
+ final int length = delta.length();
if (length == 1) {
- char text = delta.charAt(0);
+ final char text = delta.charAt(0);
- //don't allow two dots in the same number
+ // don't allow two dots in the same number
if (text == '.') {
int p = start - 1;
while (p >= 0 && Character.isDigit(charAt(p))) {
@@ -72,37 +73,38 @@
}
}
- char prevChar = start > 0 ? charAt(start-1) : '\0';
+ char prevChar = start > 0 ? charAt(start - 1) : '\0';
- //don't allow 2 successive minuses
+ // don't allow 2 successive minuses
if (text == Logic.MINUS && prevChar == Logic.MINUS) {
return super.replace(start, end, "");
}
- //don't allow multiple successive operators
+ // don't allow multiple successive operators
if (Logic.isOperator(text)) {
- while (Logic.isOperator(prevChar) &&
- (text != Logic.MINUS || prevChar == '+')) {
+ while (Logic.isOperator(prevChar) && (text != Logic.MINUS || prevChar == '+')) {
--start;
- prevChar = start > 0 ? charAt(start-1) : '\0';
+ prevChar = start > 0 ? charAt(start - 1) : '\0';
}
}
- //don't allow leading operator + * /
+ // don't allow leading operator + * /
if (start == 0 && Logic.isOperator(text) && text != Logic.MINUS) {
return super.replace(start, end, "");
}
- }
+ }
+
return super.replace(start, end, delta);
}
public static class Factory extends Editable.Factory {
- private Logic mLogic;
+ private final Logic mLogic;
public Factory(Logic logic) {
mLogic = logic;
}
+ @Override
public Editable newEditable(CharSequence source) {
return new CalculatorEditable(source, mLogic);
}
diff --git a/src/com/android/calculator2/CalculatorViewPager.java b/src/com/android/calculator2/CalculatorViewPager.java
index 880fcc8..25e9575 100644
--- a/src/com/android/calculator2/CalculatorViewPager.java
+++ b/src/com/android/calculator2/CalculatorViewPager.java
@@ -17,24 +17,66 @@
package com.android.calculator2;
import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.Canvas;
+import android.graphics.drawable.Drawable;
import android.support.v4.view.ViewPager;
import android.util.AttributeSet;
+import android.view.View;
+
+import com.android.calculator2.R;
public class CalculatorViewPager extends ViewPager {
- public CalculatorViewPager(Context context) {
- super(context);
- }
+ private Drawable mShadowRight;
+ private int mShadowWidth;
public CalculatorViewPager(Context context, AttributeSet attrs) {
super(context, attrs);
+
+ setPageTransformer(false, mTransformer);
+
+ final Resources res = context.getResources();
+ mShadowRight = res.getDrawable(R.drawable.shadow_right);
+ mShadowWidth = res.getDimensionPixelSize(R.dimen.pager_shadow_width);
}
/**
- * ViewPager inherits ViewGroup's default behavior of delayed clicks
- * on its children, but in order to make the calc buttons more responsive
- * we disable that here.
+ * ViewPager inherits ViewGroup's default behavior of delayed clicks on its
+ * children, but in order to make the calc buttons more responsive we
+ * disable that here.
*/
+ @Override
public boolean shouldDelayChildPressedState() {
return false;
}
+
+ @Override
+ protected boolean drawChild(Canvas canvas, View child, long drawingTime) {
+ final boolean result = super.drawChild(canvas, child, drawingTime);
+ mShadowRight.setBounds(child.getLeft() - mShadowWidth, child.getTop(), child.getLeft(),
+ child.getBottom());
+ mShadowRight.draw(canvas);
+ return result;
+ }
+
+ private final PageTransformer mTransformer = new PageTransformer() {
+ @Override
+ public void transformPage(View v, float position) {
+ final int pageWidth = v.getWidth();
+
+ if (position < -1) {
+ v.setAlpha(0);
+ } else if (position <= 0) {
+ // Pin the left page to the left side.
+ v.setTranslationX(pageWidth * -position);
+ } else if (position <= 1) {
+ // Use the default slide transition when moving to the right
+ // page
+ v.setAlpha(1);
+ v.setTranslationX(0);
+ } else {
+ v.setAlpha(0);
+ }
+ }
+ };
}
diff --git a/src/com/android/calculator2/ColorButton.java b/src/com/android/calculator2/ColorButton.java
deleted file mode 100644
index 7526e85..0000000
--- a/src/com/android/calculator2/ColorButton.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2008 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.
- */
-
-package com.android.calculator2;
-
-import android.content.Context;
-import android.graphics.Paint;
-import android.util.AttributeSet;
-import android.view.View.OnClickListener;
-import android.view.View;
-import android.widget.Button;
-
-/**
- * Button with click-animation effect.
- */
-class ColorButton extends Button implements OnClickListener {
- int CLICK_FEEDBACK_COLOR;
- static final int CLICK_FEEDBACK_INTERVAL = 10;
- static final int CLICK_FEEDBACK_DURATION = 350;
-
- float mTextX;
- float mTextY;
- long mAnimStart;
- OnClickListener mListener;
-
- public ColorButton(Context context, AttributeSet attrs) {
- super(context, attrs);
- Calculator calc = (Calculator) context;
- mListener = calc.mListener;
- setOnClickListener(this);
- }
-
- public void onClick(View view) {
- mListener.onClick(this);
- }
-
- @Override
- public void onSizeChanged(int w, int h, int oldW, int oldH) {
- measureText();
- }
-
- private void measureText() {
- Paint paint = getPaint();
- mTextX = (getWidth() - paint.measureText(getText().toString())) / 2;
- mTextY = (getHeight() - paint.ascent() - paint.descent()) / 2;
- }
-
- @Override
- protected void onTextChanged(CharSequence text, int start, int before, int after) {
- measureText();
- }
-}
diff --git a/src/com/android/calculator2/EventListener.java b/src/com/android/calculator2/EventListener.java
index 1d6f5d5..580ff9b 100644
--- a/src/com/android/calculator2/EventListener.java
+++ b/src/com/android/calculator2/EventListener.java
@@ -21,75 +21,66 @@
import android.view.View;
import android.widget.Button;
-class EventListener implements View.OnKeyListener,
- View.OnClickListener,
- View.OnLongClickListener {
- Logic mHandler;
- ViewPager mPager;
+import com.android.calculator2.R;
- void setHandler(Logic handler, ViewPager pager) {
+class EventListener implements View.OnKeyListener, View.OnClickListener, View.OnLongClickListener {
+ private Logic mHandler;
+ private ViewPager mPager;
+
+ public void setHandler(Logic handler, ViewPager pager) {
mHandler = handler;
mPager = pager;
}
@Override
public void onClick(View view) {
- int id = view.getId();
+ final int id = view.getId();
switch (id) {
- case R.id.del:
- mHandler.onDelete();
- break;
+ case R.id.del:
+ mHandler.onDelete();
+ break;
+ case R.id.clear:
+ mHandler.onClear();
+ break;
+ case R.id.equal:
+ mHandler.onEnter();
+ break;
+ default:
+ if (view instanceof Button) {
+ String text = ((Button) view).getText().toString();
+ if (text.length() >= 2) {
+ // Add paren after sin, cos, ln, etc. from buttons.
+ text += '(';
+ }
- case R.id.clear:
- mHandler.onClear();
- break;
-
- case R.id.equal:
- mHandler.onEnter();
- break;
-
- default:
- if (view instanceof Button) {
- String text = ((Button) view).getText().toString();
- if (text.length() >= 2) {
- // add paren after sin, cos, ln, etc. from buttons
- text += '(';
+ mHandler.append(text);
}
- mHandler.insert(text);
- if (mPager != null && mPager.getCurrentItem() == Calculator.ADVANCED_PANEL) {
- mPager.setCurrentItem(Calculator.BASIC_PANEL);
- }
- }
}
}
@Override
public boolean onLongClick(View view) {
- int id = view.getId();
+ final int id = view.getId();
if (id == R.id.del) {
mHandler.onClear();
return true;
}
+
return false;
}
@Override
public boolean onKey(View view, int keyCode, KeyEvent keyEvent) {
- int action = keyEvent.getAction();
-
- if (keyCode == KeyEvent.KEYCODE_DPAD_LEFT ||
- keyCode == KeyEvent.KEYCODE_DPAD_RIGHT) {
- boolean eat = mHandler.eatHorizontalMove(keyCode == KeyEvent.KEYCODE_DPAD_LEFT);
- return eat;
+ if (keyCode == KeyEvent.KEYCODE_DPAD_LEFT || keyCode == KeyEvent.KEYCODE_DPAD_RIGHT) {
+ return mHandler.eatHorizontalMove(keyCode == KeyEvent.KEYCODE_DPAD_LEFT);
}
- //Work-around for spurious key event from IME, bug #1639445
+ // Work-around for spurious key event from IME, bug #1639445
+ final int action = keyEvent.getAction();
if (action == KeyEvent.ACTION_MULTIPLE && keyCode == KeyEvent.KEYCODE_UNKNOWN) {
- return true; // eat it
+ return true;
}
- //Calculator.log("KEY " + keyCode + "; " + action);
-
if (keyEvent.getUnicodeChar() == '=') {
if (action == KeyEvent.ACTION_UP) {
mHandler.onEnter();
@@ -97,10 +88,8 @@
return true;
}
- if (keyCode != KeyEvent.KEYCODE_DPAD_CENTER &&
- keyCode != KeyEvent.KEYCODE_DPAD_UP &&
- keyCode != KeyEvent.KEYCODE_DPAD_DOWN &&
- keyCode != KeyEvent.KEYCODE_ENTER) {
+ if (keyCode != KeyEvent.KEYCODE_DPAD_CENTER && keyCode != KeyEvent.KEYCODE_DPAD_UP &&
+ keyCode != KeyEvent.KEYCODE_DPAD_DOWN && keyCode != KeyEvent.KEYCODE_ENTER) {
if (keyEvent.isPrintingKey() && action == KeyEvent.ACTION_UP) {
// Tell the handler that text was updated.
mHandler.onTextChanged();
@@ -108,29 +97,26 @@
return false;
}
- /*
- We should act on KeyEvent.ACTION_DOWN, but strangely
- sometimes the DOWN event isn't received, only the UP.
- So the workaround is to act on UP...
- http://b/issue?id=1022478
- */
-
+ // We should act on KeyEvent.ACTION_DOWN, but strangely sometimes the
+ // DOWN event isn't received, only the UP. So the workaround is to act
+ // on UP... http://b/issue?id=1022478
if (action == KeyEvent.ACTION_UP) {
switch (keyCode) {
- case KeyEvent.KEYCODE_ENTER:
- case KeyEvent.KEYCODE_DPAD_CENTER:
- mHandler.onEnter();
- break;
+ case KeyEvent.KEYCODE_ENTER:
+ case KeyEvent.KEYCODE_DPAD_CENTER:
+ mHandler.onEnter();
+ break;
- case KeyEvent.KEYCODE_DPAD_UP:
- mHandler.onUp();
- break;
+ case KeyEvent.KEYCODE_DPAD_UP:
+ mHandler.onUp();
+ break;
- case KeyEvent.KEYCODE_DPAD_DOWN:
- mHandler.onDown();
- break;
+ case KeyEvent.KEYCODE_DPAD_DOWN:
+ mHandler.onDown();
+ break;
}
}
+
return true;
}
}
diff --git a/src/com/android/calculator2/History.java b/src/com/android/calculator2/History.java
index ff2cc65..c205209 100644
--- a/src/com/android/calculator2/History.java
+++ b/src/com/android/calculator2/History.java
@@ -26,27 +26,30 @@
class History {
private static final int VERSION_1 = 1;
private static final int MAX_ENTRIES = 100;
- Vector<HistoryEntry> mEntries = new Vector<HistoryEntry>();
- int mPos;
- BaseAdapter mObserver;
- History() {
+ private final Vector<HistoryEntry> mEntries = new Vector<HistoryEntry>();
+
+ private int mPos;
+ private BaseAdapter mObserver;
+
+ public History() {
clear();
}
- History(int version, DataInput in) throws IOException {
+ public History(int version, DataInput in) throws IOException {
if (version >= VERSION_1) {
int size = in.readInt();
for (int i = 0; i < size; ++i) {
mEntries.add(new HistoryEntry(version, in));
}
+
mPos = in.readInt();
} else {
throw new IOException("invalid version " + version);
}
}
- void setObserver(BaseAdapter observer) {
+ public void setObserver(BaseAdapter observer) {
mObserver = observer;
}
@@ -56,63 +59,75 @@
}
}
- void clear() {
+ public Vector<HistoryEntry> getEntries() {
+ return mEntries;
+ }
+
+ public void clear() {
mEntries.clear();
mEntries.add(new HistoryEntry(""));
mPos = 0;
+
notifyChanged();
}
- void write(DataOutput out) throws IOException {
+ public void write(DataOutput out) throws IOException {
out.writeInt(mEntries.size());
+
for (HistoryEntry entry : mEntries) {
entry.write(out);
}
+
out.writeInt(mPos);
}
- void update(String text) {
+ public void update(String text) {
current().setEdited(text);
}
- boolean moveToPrevious() {
+ public boolean moveToPrevious() {
if (mPos > 0) {
--mPos;
return true;
}
+
return false;
}
- boolean moveToNext() {
+ public boolean moveToNext() {
if (mPos < mEntries.size() - 1) {
++mPos;
return true;
}
+
return false;
}
- void enter(String text) {
+ public void enter(String text) {
current().clearEdited();
+
if (mEntries.size() >= MAX_ENTRIES) {
mEntries.remove(0);
}
+
if (mEntries.size() < 2 ||
- !text.equals(mEntries.elementAt(mEntries.size() - 2).getBase())) {
+ !text.equals(mEntries.elementAt(mEntries.size() - 2).getBase())) {
mEntries.insertElementAt(new HistoryEntry(text), mEntries.size() - 1);
}
+
mPos = mEntries.size() - 1;
notifyChanged();
}
- HistoryEntry current() {
+ public HistoryEntry current() {
return mEntries.elementAt(mPos);
}
- String getText() {
+ public String getText() {
return current().getEdited();
}
- String getBase() {
+ public String getBase() {
return current().getBase();
}
}
diff --git a/src/com/android/calculator2/HistoryAdapter.java b/src/com/android/calculator2/HistoryAdapter.java
index 02ceeee..061e68e 100644
--- a/src/com/android/calculator2/HistoryAdapter.java
+++ b/src/com/android/calculator2/HistoryAdapter.java
@@ -16,39 +16,41 @@
package com.android.calculator2;
-import android.view.LayoutInflater;
-import android.view.ViewGroup;
-import android.view.View;
import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
import android.widget.BaseAdapter;
import android.widget.TextView;
-import java.util.Vector;
+import com.android.calculator2.R;
import org.javia.arity.SyntaxException;
+import java.util.Vector;
+
class HistoryAdapter extends BaseAdapter {
- private Vector<HistoryEntry> mEntries;
- private LayoutInflater mInflater;
- private Logic mEval;
-
- HistoryAdapter(Context context, History history, Logic evaluator) {
- mEntries = history.mEntries;
+ private final Vector<HistoryEntry> mEntries;
+ private final LayoutInflater mInflater;
+ private final Logic mEval;
+
+ public HistoryAdapter(Context context, History history, Logic evaluator) {
+ mEntries = history.getEntries();
mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
mEval = evaluator;
}
- // @Override
+ @Override
public int getCount() {
return mEntries.size() - 1;
}
- // @Override
+ @Override
public Object getItem(int position) {
return mEntries.elementAt(position);
}
- // @Override
+ @Override
public long getItemId(int position) {
return position;
}
@@ -58,24 +60,24 @@
return true;
}
- // @Override
+ @Override
public View getView(int position, View convertView, ViewGroup parent) {
- View view;
+ final View view;
if (convertView == null) {
view = mInflater.inflate(R.layout.history_item, parent, false);
} else {
view = convertView;
}
- TextView expr = (TextView) view.findViewById(R.id.historyExpr);
- TextView result = (TextView) view.findViewById(R.id.historyResult);
+ final TextView expr = (TextView) view.findViewById(R.id.historyExpr);
+ final TextView result = (TextView) view.findViewById(R.id.historyResult);
- HistoryEntry entry = mEntries.elementAt(position);
- String base = entry.getBase();
+ final HistoryEntry entry = mEntries.elementAt(position);
+ final String base = entry.getBase();
expr.setText(entry.getBase());
try {
- String res = mEval.evaluate(base);
+ final String res = mEval.evaluate(base);
result.setText("= " + res);
} catch (SyntaxException e) {
result.setText("");
@@ -84,4 +86,3 @@
return view;
}
}
-
diff --git a/src/com/android/calculator2/Logic.java b/src/com/android/calculator2/Logic.java
index 83db577..839e6f3 100644
--- a/src/com/android/calculator2/Logic.java
+++ b/src/com/android/calculator2/Logic.java
@@ -16,22 +16,23 @@
package com.android.calculator2;
-import com.android.calculator2.CalculatorDisplay.Scroll;
-
+import android.content.Context;
+import android.content.res.Resources;
import android.text.TextUtils;
import android.view.KeyEvent;
import android.widget.EditText;
-import android.content.Context;
-import android.content.res.Resources;
+
+import com.android.calculator2.R;
+import com.android.calculator2.CalculatorDisplay.Scroll;
+
+import org.javia.arity.Symbols;
+import org.javia.arity.SyntaxException;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map.Entry;
import java.util.Set;
-import org.javia.arity.Symbols;
-import org.javia.arity.SyntaxException;
-
class Logic {
private CalculatorDisplay mDisplay;
private Symbols mSymbols = new Symbols();
@@ -59,7 +60,7 @@
private int mDeleteMode = DELETE_MODE_BACKSPACE;
public interface Listener {
- void onDeleteModeChange();
+ void onDeleteModeChange(int mode);
}
private Listener mListener;
@@ -81,7 +82,7 @@
public void setDeleteMode(int mode) {
if (mDeleteMode != mode) {
mDeleteMode = mode;
- mListener.onDeleteModeChange();
+ mListener.onDeleteModeChange(mode);
}
}
@@ -108,6 +109,11 @@
setDeleteMode(DELETE_MODE_BACKSPACE);
}
+ void append(String delta) {
+ mDisplay.append(delta);
+ setDeleteMode(DELETE_MODE_BACKSPACE);
+ }
+
public void onTextChanged() {
setDeleteMode(DELETE_MODE_BACKSPACE);
}
diff --git a/src/com/android/calculator2/PageAdapter.java b/src/com/android/calculator2/PageAdapter.java
new file mode 100644
index 0000000..a8ff566
--- /dev/null
+++ b/src/com/android/calculator2/PageAdapter.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2014 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.
+ */
+
+package com.android.calculator2;
+
+import android.os.Parcelable;
+import android.support.v4.view.PagerAdapter;
+import android.view.View;
+import android.view.ViewGroup;
+
+import java.util.ArrayList;
+
+class PageAdapter extends PagerAdapter {
+ private final ArrayList<View> mPages = new ArrayList<View>();
+
+ public void add(View page) {
+ mPages.add(page);
+
+ notifyDataSetChanged();
+ }
+
+ @Override
+ public int getCount() {
+ return mPages.size();
+ }
+
+ @Override
+ public float getPageWidth(int position) {
+ return 0.90f;
+ }
+
+ @Override
+ public Object instantiateItem(ViewGroup container, int position) {
+ final View page = mPages.get(position);
+ container.addView(page);
+ return page;
+ }
+
+ @Override
+ public void destroyItem(ViewGroup container, int position, Object object) {
+ container.removeView((View) object);
+ }
+
+ @Override
+ public boolean isViewFromObject(View view, Object object) {
+ return view == object;
+ }
+
+ @Override
+ public Parcelable saveState() {
+ return null;
+ }
+
+ @Override
+ public void restoreState(Parcelable state, ClassLoader loader) {
+ }
+}
diff --git a/src/com/android/calculator2/Persist.java b/src/com/android/calculator2/Persist.java
index 208faed..5f23551 100644
--- a/src/com/android/calculator2/Persist.java
+++ b/src/com/android/calculator2/Persist.java
@@ -16,27 +16,29 @@
package com.android.calculator2;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.IOException;
-import java.io.FileNotFoundException;
+import android.content.Context;
+
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
-
-import android.content.Context;
+import java.io.FileNotFoundException;
+import java.io.IOException;
class Persist {
private static final int LAST_VERSION = 2;
private static final String FILE_NAME = "calculator.data";
- private Context mContext;
- History history = new History();
+ private Context mContext;
+ private History mHistory;
private int mDeleteMode;
- Persist(Context context) {
- this.mContext = context;
+ public Persist(Context context) {
+ mContext = context;
+ }
+
+ public History getHistory() {
+ return mHistory;
}
public void setDeleteMode(int mode) {
@@ -49,33 +51,45 @@
public void load() {
try {
- InputStream is = new BufferedInputStream(mContext.openFileInput(FILE_NAME), 8192);
- DataInputStream in = new DataInputStream(is);
- int version = in.readInt();
+ final DataInputStream in = new DataInputStream(
+ new BufferedInputStream(mContext.openFileInput(FILE_NAME), 8192));
+ final int version = in.readInt();
if (version > 1) {
mDeleteMode = in.readInt();
} else if (version > LAST_VERSION) {
throw new IOException("data version " + version + "; expected " + LAST_VERSION);
}
- history = new History(version, in);
+
+ mHistory = new History(version, in);
+
in.close();
} catch (FileNotFoundException e) {
- Calculator.log("" + e);
+ e.printStackTrace();
} catch (IOException e) {
- Calculator.log("" + e);
+ e.printStackTrace();
+ }
+
+ if (mHistory == null) {
+ mHistory = new History();
}
}
public void save() {
+ if (mHistory == null) {
+ return;
+ }
+
try {
- OutputStream os = new BufferedOutputStream(mContext.openFileOutput(FILE_NAME, 0), 8192);
- DataOutputStream out = new DataOutputStream(os);
+ final DataOutputStream out = new DataOutputStream(
+ new BufferedOutputStream(mContext.openFileOutput(FILE_NAME, 0), 8192));
out.writeInt(LAST_VERSION);
out.writeInt(mDeleteMode);
- history.write(out);
+
+ mHistory.write(out);
+
out.close();
} catch (IOException e) {
- Calculator.log("" + e);
+ e.printStackTrace();
}
}
}
