Merge "Provide animation when auto-scaling the font-size" into lmp-preview-dev
diff --git a/res/drawable/pad_btn_background.xml b/res/drawable/pad_btn_background.xml
index 1366dfc..2f9f2db 100644
--- a/res/drawable/pad_btn_background.xml
+++ b/res/drawable/pad_btn_background.xml
@@ -15,7 +15,5 @@
limitations under the License.
-->
-<ripple
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:tint="@color/pad_button_tint_color"
- android:pinned="true" />
\ No newline at end of file
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+ android:color="@color/pad_button_tint_color" />
\ No newline at end of file
diff --git a/res/layout/activity_calculator_port.xml b/res/layout/activity_calculator_port.xml
index ddc7c8b..975c4a7 100644
--- a/res/layout/activity_calculator_port.xml
+++ b/res/layout/activity_calculator_port.xml
@@ -27,6 +27,7 @@
android:layout_height="wrap_content" />
<com.android.calculator2.CalculatorPadViewPager
+ android:id="@+id/pad_pager"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/display">
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 7b551cc..e5602b1 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="8095131950334945205">"Sakrekenaar"</string>
<string name="error_nan" msgid="4071578355972369426">"Nie getal nie"</string>
<string name="error_syntax" msgid="6940043994468390738">"Fout"</string>
- <string name="dec_point" msgid="6555721211126788808">"."</string>
+ <string name="dec_point" msgid="6555721211126788808">","</string>
<string name="digit_0" msgid="697966218778843272">"0"</string>
<string name="digit_1" msgid="9009337429640544205">"1"</string>
<string name="digit_2" msgid="7722707864768133877">"2"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index ddcd720..c773a0a 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -18,7 +18,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">"Calculadora"</string>
- <string name="error_nan" msgid="4071578355972369426">"No és número."</string>
+ <string name="error_nan" msgid="4071578355972369426">"No és número"</string>
<string name="error_syntax" msgid="6940043994468390738">"Error"</string>
<string name="dec_point" msgid="6555721211126788808">","</string>
<string name="digit_0" msgid="697966218778843272">"0"</string>
@@ -36,13 +36,13 @@
<string name="fun_log" msgid="6856905045055937519">"log"</string>
<string name="fun_sin" msgid="7136698561875496766">"sin"</string>
<string name="fun_tan" msgid="9116158377794370341">"tan"</string>
- <string name="clr" msgid="3126239559646368205">"esb"</string>
+ <string name="clr" msgid="3126239559646368205">"c"</string>
<string name="del" msgid="6700172918709138470">"sup"</string>
<string name="desc_const_e" msgid="7752508267661034194">"nombre d\'Euler"</string>
<string name="desc_const_pi" msgid="5843835548313660468">"pi"</string>
<string name="desc_dec_point" msgid="6211527612960070934">"punt"</string>
<string name="desc_lparen" msgid="3319203240269597504">"parèntesi esquerre"</string>
- <string name="desc_rparen" msgid="7629704943022422763">"parèntesi dret"</string>
+ <string name="desc_rparen" msgid="7629704943022422763">"parèntesi de tancament"</string>
<string name="desc_fun_cos" msgid="3197307754450718348">"cosinus"</string>
<string name="desc_fun_ln" msgid="4943842219071979148">"logaritme natural"</string>
<string name="desc_fun_log" msgid="6163178034661345125">"logaritme"</string>
@@ -52,7 +52,7 @@
<string name="desc_op_div" msgid="8320455802423478031">"divideix"</string>
<string name="desc_op_fact" msgid="5004950609277631750">"factorial"</string>
<string name="desc_op_mul" msgid="978652245185868311">"vegades"</string>
- <string name="desc_op_pow" msgid="2620877401884059447">"accent circumflex"</string>
+ <string name="desc_op_pow" msgid="2620877401884059447">"potència"</string>
<string name="desc_op_sqrt" msgid="4405610392216554239">"arrel quadrada"</string>
<string name="desc_op_sub" msgid="2563060630032563021">"menys"</string>
<string name="desc_clr" msgid="8357371663749541924">"esborra"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 59d06dc..ca732d4 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -37,7 +37,7 @@
<string name="fun_sin" msgid="7136698561875496766">"sin"</string>
<string name="fun_tan" msgid="9116158377794370341">"tan"</string>
<string name="clr" msgid="3126239559646368205">"CE"</string>
- <string name="del" msgid="6700172918709138470">"C"</string>
+ <string name="del" msgid="6700172918709138470">"←"</string>
<string name="desc_const_e" msgid="7752508267661034194">"Eulerovo číslo"</string>
<string name="desc_const_pi" msgid="5843835548313660468">"pí"</string>
<string name="desc_dec_point" msgid="6211527612960070934">"desetinná čárka"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 521218a..ad8b241 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -18,7 +18,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">"Lommeregner"</string>
- <string name="error_nan" msgid="4071578355972369426">"Er ikke et tal"</string>
+ <string name="error_nan" msgid="4071578355972369426">"Ikke et tal"</string>
<string name="error_syntax" msgid="6940043994468390738">"Fejl"</string>
<string name="dec_point" msgid="6555721211126788808">","</string>
<string name="digit_0" msgid="697966218778843272">"0"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 2a0882d..73d3e08 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -36,8 +36,8 @@
<string name="fun_log" msgid="6856905045055937519">"log"</string>
<string name="fun_sin" msgid="7136698561875496766">"sen"</string>
<string name="fun_tan" msgid="9116158377794370341">"tan"</string>
- <string name="clr" msgid="3126239559646368205">"ce"</string>
- <string name="del" msgid="6700172918709138470">"del"</string>
+ <string name="clr" msgid="3126239559646368205">"C"</string>
+ <string name="del" msgid="6700172918709138470">"CE"</string>
<string name="desc_const_e" msgid="7752508267661034194">"número de Euler"</string>
<string name="desc_const_pi" msgid="5843835548313660468">"pi"</string>
<string name="desc_dec_point" msgid="6211527612960070934">"punto"</string>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 912dc96..049a1f3 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -36,8 +36,8 @@
<string name="fun_log" msgid="6856905045055937519">"log"</string>
<string name="fun_sin" msgid="7136698561875496766">"sin"</string>
<string name="fun_tan" msgid="9116158377794370341">"tan"</string>
- <string name="clr" msgid="3126239559646368205">"tühj."</string>
- <string name="del" msgid="6700172918709138470">"kust."</string>
+ <string name="clr" msgid="3126239559646368205">"tüh"</string>
+ <string name="del" msgid="6700172918709138470">"kus"</string>
<string name="desc_const_e" msgid="7752508267661034194">"Euleri arv"</string>
<string name="desc_const_pi" msgid="5843835548313660468">"pii"</string>
<string name="desc_dec_point" msgid="6211527612960070934">"punkt"</string>
@@ -51,7 +51,7 @@
<string name="desc_op_add" msgid="1174812755738083078">"pluss"</string>
<string name="desc_op_div" msgid="8320455802423478031">"jaga"</string>
<string name="desc_op_fact" msgid="5004950609277631750">"faktoriaal"</string>
- <string name="desc_op_mul" msgid="978652245185868311">"ajad"</string>
+ <string name="desc_op_mul" msgid="978652245185868311">"korruta"</string>
<string name="desc_op_pow" msgid="2620877401884059447">"aste"</string>
<string name="desc_op_sqrt" msgid="4405610392216554239">"ruutjuur"</string>
<string name="desc_op_sub" msgid="2563060630032563021">"miinus"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 977f19d..89f2733 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -46,13 +46,13 @@
<string name="desc_fun_cos" msgid="3197307754450718348">"कोज्या"</string>
<string name="desc_fun_ln" msgid="4943842219071979148">"प्राकृतिक लघुगणक"</string>
<string name="desc_fun_log" msgid="6163178034661345125">"लघुगणक"</string>
- <string name="desc_fun_sin" msgid="4010564022860883142">"ज्या"</string>
+ <string name="desc_fun_sin" msgid="4010564022860883142">"sine"</string>
<string name="desc_fun_tan" msgid="8547330421304946587">"स्पर्शज्या"</string>
- <string name="desc_op_add" msgid="1174812755738083078">"धन"</string>
+ <string name="desc_op_add" msgid="1174812755738083078">"जोड़ का चिह्न"</string>
<string name="desc_op_div" msgid="8320455802423478031">"विभाजन"</string>
<string name="desc_op_fact" msgid="5004950609277631750">"क्रमगुणन"</string>
<string name="desc_op_mul" msgid="978652245185868311">"गुणा"</string>
- <string name="desc_op_pow" msgid="2620877401884059447">"घात"</string>
+ <string name="desc_op_pow" msgid="2620877401884059447">"पावर"</string>
<string name="desc_op_sqrt" msgid="4405610392216554239">"वर्गमूल"</string>
<string name="desc_op_sub" msgid="2563060630032563021">"ऋण"</string>
<string name="desc_clr" msgid="8357371663749541924">"साफ़ करें"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 213b565..5811d78 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="8095131950334945205">"Calcolatrice"</string>
<string name="error_nan" msgid="4071578355972369426">"Non un numero"</string>
<string name="error_syntax" msgid="6940043994468390738">"Errore"</string>
- <string name="dec_point" msgid="6555721211126788808">"."</string>
+ <string name="dec_point" msgid="6555721211126788808">","</string>
<string name="digit_0" msgid="697966218778843272">"0"</string>
<string name="digit_1" msgid="9009337429640544205">"1"</string>
<string name="digit_2" msgid="7722707864768133877">"2"</string>
@@ -36,11 +36,11 @@
<string name="fun_log" msgid="6856905045055937519">"log"</string>
<string name="fun_sin" msgid="7136698561875496766">"sin"</string>
<string name="fun_tan" msgid="9116158377794370341">"tan"</string>
- <string name="clr" msgid="3126239559646368205">"canc"</string>
- <string name="del" msgid="6700172918709138470">"canc"</string>
+ <string name="clr" msgid="3126239559646368205">"c"</string>
+ <string name="del" msgid="6700172918709138470">"ce"</string>
<string name="desc_const_e" msgid="7752508267661034194">"numero di Eulero"</string>
<string name="desc_const_pi" msgid="5843835548313660468">"pi"</string>
- <string name="desc_dec_point" msgid="6211527612960070934">"punto"</string>
+ <string name="desc_dec_point" msgid="6211527612960070934">"virgola"</string>
<string name="desc_lparen" msgid="3319203240269597504">"parentesi aperta"</string>
<string name="desc_rparen" msgid="7629704943022422763">"parentesi chiusa"</string>
<string name="desc_fun_cos" msgid="3197307754450718348">"coseno"</string>
@@ -55,7 +55,7 @@
<string name="desc_op_pow" msgid="2620877401884059447">"potenza"</string>
<string name="desc_op_sqrt" msgid="4405610392216554239">"radice quadrata"</string>
<string name="desc_op_sub" msgid="2563060630032563021">"meno"</string>
- <string name="desc_clr" msgid="8357371663749541924">"cancella"</string>
- <string name="desc_del" msgid="1866733601083210032">"elimina"</string>
+ <string name="desc_clr" msgid="8357371663749541924">"cancella tutto"</string>
+ <string name="desc_del" msgid="1866733601083210032">"cancella"</string>
<string name="desc_eq" msgid="8068773095462472408">"uguale"</string>
</resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 78793fc..17b05cf 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -38,7 +38,7 @@
<string name="fun_tan" msgid="9116158377794370341">"tan"</string>
<string name="clr" msgid="3126239559646368205">"clr"</string>
<string name="del" msgid="6700172918709138470">"del"</string>
- <string name="desc_const_e" msgid="7752508267661034194">"הקבוע e"</string>
+ <string name="desc_const_e" msgid="7752508267661034194">"מספרי אוילר"</string>
<string name="desc_const_pi" msgid="5843835548313660468">"פאי"</string>
<string name="desc_dec_point" msgid="6211527612960070934">"נקודה"</string>
<string name="desc_lparen" msgid="3319203240269597504">"סוגר שמאלי"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index a678c1e..68fb663 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -36,7 +36,7 @@
<string name="fun_log" msgid="6856905045055937519">"log"</string>
<string name="fun_sin" msgid="7136698561875496766">"sin"</string>
<string name="fun_tan" msgid="9116158377794370341">"tan"</string>
- <string name="clr" msgid="3126239559646368205">"C"</string>
+ <string name="clr" msgid="3126239559646368205">"clr"</string>
<string name="del" msgid="6700172918709138470">"del"</string>
<string name="desc_const_e" msgid="7752508267661034194">"오일러의 수"</string>
<string name="desc_const_pi" msgid="5843835548313660468">"원주율(파이)"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index f4b6e3b..cfbf682 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="8095131950334945205">"Kalkulator"</string>
<string name="error_nan" msgid="4071578355972369426">"Ikke et tall"</string>
<string name="error_syntax" msgid="6940043994468390738">"Feil"</string>
- <string name="dec_point" msgid="6555721211126788808">"."</string>
+ <string name="dec_point" msgid="6555721211126788808">","</string>
<string name="digit_0" msgid="697966218778843272">"0"</string>
<string name="digit_1" msgid="9009337429640544205">"1"</string>
<string name="digit_2" msgid="7722707864768133877">"2"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index bd903e9..6fedbf0 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="8095131950334945205">"Kalkulator"</string>
<string name="error_nan" msgid="4071578355972369426">"To nie liczba"</string>
<string name="error_syntax" msgid="6940043994468390738">"Błąd"</string>
- <string name="dec_point" msgid="6555721211126788808">"."</string>
+ <string name="dec_point" msgid="6555721211126788808">","</string>
<string name="digit_0" msgid="697966218778843272">"0"</string>
<string name="digit_1" msgid="9009337429640544205">"1"</string>
<string name="digit_2" msgid="7722707864768133877">"2"</string>
@@ -36,8 +36,8 @@
<string name="fun_log" msgid="6856905045055937519">"log"</string>
<string name="fun_sin" msgid="7136698561875496766">"sin"</string>
<string name="fun_tan" msgid="9116158377794370341">"tg"</string>
- <string name="clr" msgid="3126239559646368205">"wyc"</string>
- <string name="del" msgid="6700172918709138470">"usu"</string>
+ <string name="clr" msgid="3126239559646368205">"clr"</string>
+ <string name="del" msgid="6700172918709138470">"del"</string>
<string name="desc_const_e" msgid="7752508267661034194">"liczba Eulera"</string>
<string name="desc_const_pi" msgid="5843835548313660468">"pi"</string>
<string name="desc_dec_point" msgid="6211527612960070934">"przecinek"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index cb4ba1f..6fa5bf7 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -34,9 +34,9 @@
<string name="fun_cos" msgid="7312559527731358211">"cos"</string>
<string name="fun_ln" msgid="6282013842946532944">"ln"</string>
<string name="fun_log" msgid="6856905045055937519">"log"</string>
- <string name="fun_sin" msgid="7136698561875496766">"sin"</string>
+ <string name="fun_sin" msgid="7136698561875496766">"sen"</string>
<string name="fun_tan" msgid="9116158377794370341">"tan"</string>
- <string name="clr" msgid="3126239559646368205">"ce"</string>
+ <string name="clr" msgid="3126239559646368205">"clr"</string>
<string name="del" msgid="6700172918709138470">"del"</string>
<string name="desc_const_e" msgid="7752508267661034194">"número de Euler"</string>
<string name="desc_const_pi" msgid="5843835548313660468">"pi"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index b1d3eca..2934546 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="8095131950334945205">"Kalkulačka"</string>
<string name="error_nan" msgid="4071578355972369426">"Nie je číslo"</string>
<string name="error_syntax" msgid="6940043994468390738">"Chyba"</string>
- <string name="dec_point" msgid="6555721211126788808">"."</string>
+ <string name="dec_point" msgid="6555721211126788808">","</string>
<string name="digit_0" msgid="697966218778843272">"0"</string>
<string name="digit_1" msgid="9009337429640544205">"1"</string>
<string name="digit_2" msgid="7722707864768133877">"2"</string>
@@ -36,11 +36,11 @@
<string name="fun_log" msgid="6856905045055937519">"log"</string>
<string name="fun_sin" msgid="7136698561875496766">"sin"</string>
<string name="fun_tan" msgid="9116158377794370341">"tan"</string>
- <string name="clr" msgid="3126239559646368205">"clr"</string>
- <string name="del" msgid="6700172918709138470">"del"</string>
+ <string name="clr" msgid="3126239559646368205">"CE"</string>
+ <string name="del" msgid="6700172918709138470">"←"</string>
<string name="desc_const_e" msgid="7752508267661034194">"Eulerovo číslo"</string>
<string name="desc_const_pi" msgid="5843835548313660468">"pí"</string>
- <string name="desc_dec_point" msgid="6211527612960070934">"bod"</string>
+ <string name="desc_dec_point" msgid="6211527612960070934">"desatinná čiarka"</string>
<string name="desc_lparen" msgid="3319203240269597504">"ľavá zátvorka"</string>
<string name="desc_rparen" msgid="7629704943022422763">"pravá zátvorka"</string>
<string name="desc_fun_cos" msgid="3197307754450718348">"kosínus"</string>
@@ -49,13 +49,13 @@
<string name="desc_fun_sin" msgid="4010564022860883142">"sínus"</string>
<string name="desc_fun_tan" msgid="8547330421304946587">"tangens"</string>
<string name="desc_op_add" msgid="1174812755738083078">"plus"</string>
- <string name="desc_op_div" msgid="8320455802423478031">"deliť"</string>
+ <string name="desc_op_div" msgid="8320455802423478031">"deleno"</string>
<string name="desc_op_fact" msgid="5004950609277631750">"faktoriál"</string>
- <string name="desc_op_mul" msgid="978652245185868311">"násobiť"</string>
- <string name="desc_op_pow" msgid="2620877401884059447">"umocniť"</string>
+ <string name="desc_op_mul" msgid="978652245185868311">"krát"</string>
+ <string name="desc_op_pow" msgid="2620877401884059447">"umocnené na"</string>
<string name="desc_op_sqrt" msgid="4405610392216554239">"druhá odmocnina"</string>
<string name="desc_op_sub" msgid="2563060630032563021">"mínus"</string>
<string name="desc_clr" msgid="8357371663749541924">"vymazať"</string>
- <string name="desc_del" msgid="1866733601083210032">"odstrániť"</string>
+ <string name="desc_del" msgid="1866733601083210032">"vymazať"</string>
<string name="desc_eq" msgid="8068773095462472408">"sa rovná"</string>
</resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index c419aad..8289bd2 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -36,7 +36,7 @@
<string name="fun_log" msgid="6856905045055937519">"log"</string>
<string name="fun_sin" msgid="7136698561875496766">"sin"</string>
<string name="fun_tan" msgid="9116158377794370341">"tan"</string>
- <string name="clr" msgid="3126239559646368205">"poč"</string>
+ <string name="clr" msgid="3126239559646368205">"izb"</string>
<string name="del" msgid="6700172918709138470">"izb"</string>
<string name="desc_const_e" msgid="7752508267661034194">"Eulerjevo število"</string>
<string name="desc_const_pi" msgid="5843835548313660468">"pi"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 6c56d19..d33dd8b 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -36,8 +36,8 @@
<string name="fun_log" msgid="6856905045055937519">"log"</string>
<string name="fun_sin" msgid="7136698561875496766">"sin"</string>
<string name="fun_tan" msgid="9116158377794370341">"tg"</string>
- <string name="clr" msgid="3126239559646368205">"clr"</string>
- <string name="del" msgid="6700172918709138470">"del"</string>
+ <string name="clr" msgid="3126239559646368205">"C"</string>
+ <string name="del" msgid="6700172918709138470">"CE"</string>
<string name="desc_const_e" msgid="7752508267661034194">"Ојлеров број"</string>
<string name="desc_const_pi" msgid="5843835548313660468">"пи"</string>
<string name="desc_dec_point" msgid="6211527612960070934">"зарез"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index ee343fb..8c9b39b 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -39,7 +39,7 @@
<string name="clr" msgid="3126239559646368205">"futa"</string>
<string name="del" msgid="6700172918709138470">"futa"</string>
<string name="desc_const_e" msgid="7752508267661034194">"Nambari ya Euler"</string>
- <string name="desc_const_pi" msgid="5843835548313660468">"pai"</string>
+ <string name="desc_const_pi" msgid="5843835548313660468">"pi"</string>
<string name="desc_dec_point" msgid="6211527612960070934">"nukta"</string>
<string name="desc_lparen" msgid="3319203240269597504">"mabano ya kushoto"</string>
<string name="desc_rparen" msgid="7629704943022422763">"mabano ya kulia"</string>
@@ -51,8 +51,8 @@
<string name="desc_op_add" msgid="1174812755738083078">"jumlisha"</string>
<string name="desc_op_div" msgid="8320455802423478031">"gawanya"</string>
<string name="desc_op_fact" msgid="5004950609277631750">"zao mtiririko"</string>
- <string name="desc_op_mul" msgid="978652245185868311">"mara"</string>
- <string name="desc_op_pow" msgid="2620877401884059447">"mara"</string>
+ <string name="desc_op_mul" msgid="978652245185868311">"zidisha"</string>
+ <string name="desc_op_pow" msgid="2620877401884059447">"kipeo"</string>
<string name="desc_op_sqrt" msgid="4405610392216554239">"kipeo cha pili"</string>
<string name="desc_op_sub" msgid="2563060630032563021">"kutoa"</string>
<string name="desc_clr" msgid="8357371663749541924">"futa"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 1f65e31..7ba430b 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -19,7 +19,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_name" msgid="8095131950334945205">"คิดเลข"</string>
<string name="error_nan" msgid="4071578355972369426">"ไม่ใช่ตัวเลข"</string>
- <string name="error_syntax" msgid="6940043994468390738">"ข้อผิดพลาด"</string>
+ <string name="error_syntax" msgid="6940043994468390738">"พบข้อผิดพลาด"</string>
<string name="dec_point" msgid="6555721211126788808">"."</string>
<string name="digit_0" msgid="697966218778843272">"0"</string>
<string name="digit_1" msgid="9009337429640544205">"1"</string>
@@ -37,7 +37,7 @@
<string name="fun_sin" msgid="7136698561875496766">"sin"</string>
<string name="fun_tan" msgid="9116158377794370341">"tan"</string>
<string name="clr" msgid="3126239559646368205">"ล้าง"</string>
- <string name="del" msgid="6700172918709138470">"ลบ"</string>
+ <string name="del" msgid="6700172918709138470">"del"</string>
<string name="desc_const_e" msgid="7752508267661034194">"จำนวนออยเลอร์"</string>
<string name="desc_const_pi" msgid="5843835548313660468">"พาย"</string>
<string name="desc_dec_point" msgid="6211527612960070934">"จุด"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 78f2faf..aaa5659 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -20,7 +20,7 @@
<string name="app_name" msgid="8095131950334945205">"Hesap Makinesi"</string>
<string name="error_nan" msgid="4071578355972369426">"Sayı değil"</string>
<string name="error_syntax" msgid="6940043994468390738">"Hata"</string>
- <string name="dec_point" msgid="6555721211126788808">"."</string>
+ <string name="dec_point" msgid="6555721211126788808">","</string>
<string name="digit_0" msgid="697966218778843272">"0"</string>
<string name="digit_1" msgid="9009337429640544205">"1"</string>
<string name="digit_2" msgid="7722707864768133877">"2"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 0c0dc7a..638bc67 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -18,7 +18,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">"Máy tính"</string>
- <string name="error_nan" msgid="4071578355972369426">"Không phải là một số"</string>
+ <string name="error_nan" msgid="4071578355972369426">"Không phải số"</string>
<string name="error_syntax" msgid="6940043994468390738">"Lỗi"</string>
<string name="dec_point" msgid="6555721211126788808">","</string>
<string name="digit_0" msgid="697966218778843272">"0"</string>
@@ -40,14 +40,14 @@
<string name="del" msgid="6700172918709138470">"del"</string>
<string name="desc_const_e" msgid="7752508267661034194">"Số Euler"</string>
<string name="desc_const_pi" msgid="5843835548313660468">"pi"</string>
- <string name="desc_dec_point" msgid="6211527612960070934">"dấu chấm"</string>
+ <string name="desc_dec_point" msgid="6211527612960070934">"chấm"</string>
<string name="desc_lparen" msgid="3319203240269597504">"dấu ngoặc trái"</string>
<string name="desc_rparen" msgid="7629704943022422763">"dấu ngoặc phải"</string>
<string name="desc_fun_cos" msgid="3197307754450718348">"cosin"</string>
<string name="desc_fun_ln" msgid="4943842219071979148">"logarit tự nhiên"</string>
<string name="desc_fun_log" msgid="6163178034661345125">"logarit"</string>
<string name="desc_fun_sin" msgid="4010564022860883142">"sin"</string>
- <string name="desc_fun_tan" msgid="8547330421304946587">"tiếp tuyến"</string>
+ <string name="desc_fun_tan" msgid="8547330421304946587">"tang"</string>
<string name="desc_op_add" msgid="1174812755738083078">"cộng"</string>
<string name="desc_op_div" msgid="8320455802423478031">"chia"</string>
<string name="desc_op_fact" msgid="5004950609277631750">"giai thừa"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index ad70dab..262c98d 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -40,21 +40,21 @@
<string name="del" msgid="6700172918709138470">"DEL"</string>
<string name="desc_const_e" msgid="7752508267661034194">"尤拉數"</string>
<string name="desc_const_pi" msgid="5843835548313660468">"圓周率"</string>
- <string name="desc_dec_point" msgid="6211527612960070934">"小數點符號"</string>
+ <string name="desc_dec_point" msgid="6211527612960070934">"點"</string>
<string name="desc_lparen" msgid="3319203240269597504">"左括弧"</string>
<string name="desc_rparen" msgid="7629704943022422763">"右括弧"</string>
- <string name="desc_fun_cos" msgid="3197307754450718348">"Cosine"</string>
+ <string name="desc_fun_cos" msgid="3197307754450718348">"餘弦"</string>
<string name="desc_fun_ln" msgid="4943842219071979148">"自然對數"</string>
<string name="desc_fun_log" msgid="6163178034661345125">"對數"</string>
- <string name="desc_fun_sin" msgid="4010564022860883142">"Sine"</string>
- <string name="desc_fun_tan" msgid="8547330421304946587">"Tangent"</string>
- <string name="desc_op_add" msgid="1174812755738083078">"加號"</string>
- <string name="desc_op_div" msgid="8320455802423478031">"除號"</string>
+ <string name="desc_fun_sin" msgid="4010564022860883142">"正弦"</string>
+ <string name="desc_fun_tan" msgid="8547330421304946587">"正切"</string>
+ <string name="desc_op_add" msgid="1174812755738083078">"加"</string>
+ <string name="desc_op_div" msgid="8320455802423478031">"除"</string>
<string name="desc_op_fact" msgid="5004950609277631750">"階乘"</string>
- <string name="desc_op_mul" msgid="978652245185868311">"乘號"</string>
+ <string name="desc_op_mul" msgid="978652245185868311">"乘"</string>
<string name="desc_op_pow" msgid="2620877401884059447">"指數"</string>
- <string name="desc_op_sqrt" msgid="4405610392216554239">"平方根號"</string>
- <string name="desc_op_sub" msgid="2563060630032563021">"減號"</string>
+ <string name="desc_op_sqrt" msgid="4405610392216554239">"平方根"</string>
+ <string name="desc_op_sub" msgid="2563060630032563021">"減"</string>
<string name="desc_clr" msgid="8357371663749541924">"清除"</string>
<string name="desc_del" msgid="1866733601083210032">"刪除"</string>
<string name="desc_eq" msgid="8068773095462472408">"等於"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 6265dc5..14b01c8 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -31,23 +31,23 @@
<string name="digit_7" msgid="2386463125354638611">"7"</string>
<string name="digit_8" msgid="6298159258090202166">"8"</string>
<string name="digit_9" msgid="1221342734731110246">"9"</string>
- <string name="fun_cos" msgid="7312559527731358211">"i-cos"</string>
- <string name="fun_ln" msgid="6282013842946532944">"i-In"</string>
- <string name="fun_log" msgid="6856905045055937519">"i-log"</string>
- <string name="fun_sin" msgid="7136698561875496766">"i-sin"</string>
- <string name="fun_tan" msgid="9116158377794370341">"i-tan"</string>
- <string name="clr" msgid="3126239559646368205">"i-clr"</string>
- <string name="del" msgid="6700172918709138470">"i-del"</string>
+ <string name="fun_cos" msgid="7312559527731358211">"cos"</string>
+ <string name="fun_ln" msgid="6282013842946532944">"In"</string>
+ <string name="fun_log" msgid="6856905045055937519">"log"</string>
+ <string name="fun_sin" msgid="7136698561875496766">"sin"</string>
+ <string name="fun_tan" msgid="9116158377794370341">"tan"</string>
+ <string name="clr" msgid="3126239559646368205">"clr"</string>
+ <string name="del" msgid="6700172918709138470">"sula"</string>
<string name="desc_const_e" msgid="7752508267661034194">"Inombolo ye-Euler"</string>
- <string name="desc_const_pi" msgid="5843835548313660468">"i-pi"</string>
+ <string name="desc_const_pi" msgid="5843835548313660468">"pi"</string>
<string name="desc_dec_point" msgid="6211527612960070934">"iphoyinti"</string>
<string name="desc_lparen" msgid="3319203240269597504">"abakaki abakwesokunxele"</string>
<string name="desc_rparen" msgid="7629704943022422763">"abakaki abakwesokudla"</string>
- <string name="desc_fun_cos" msgid="3197307754450718348">"i-cosine"</string>
- <string name="desc_fun_ln" msgid="4943842219071979148">"i-logarithm yemvelo"</string>
- <string name="desc_fun_log" msgid="6163178034661345125">"i-logarithm"</string>
- <string name="desc_fun_sin" msgid="4010564022860883142">"i-sine"</string>
- <string name="desc_fun_tan" msgid="8547330421304946587">"i-tangent"</string>
+ <string name="desc_fun_cos" msgid="3197307754450718348">"cosine"</string>
+ <string name="desc_fun_ln" msgid="4943842219071979148">"logarithm yemvelo"</string>
+ <string name="desc_fun_log" msgid="6163178034661345125">"logarithm"</string>
+ <string name="desc_fun_sin" msgid="4010564022860883142">"sine"</string>
+ <string name="desc_fun_tan" msgid="8547330421304946587">"tangent"</string>
<string name="desc_op_add" msgid="1174812755738083078">"hlanganisa"</string>
<string name="desc_op_div" msgid="8320455802423478031">"hlukanisa"</string>
<string name="desc_op_fact" msgid="5004950609277631750">"ngokwesimo"</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index f561b98..a4f6dcf 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -17,13 +17,13 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android">
- <style name="CalculatorTheme" parent="@android:style/Theme.Quantum.Light.NoActionBar">
+ <style name="CalculatorTheme" parent="@android:style/Theme.Material.Light.NoActionBar">
<item name="android:navigationBarColor">@android:color/black</item>
<item name="android:statusBarColor">@color/calculator_accent_color</item>
<item name="android:windowContentOverlay">@null</item>
</style>
- <style name="DisplayEditTextStyle" parent="@android:style/Widget.Quantum.Light.EditText">
+ <style name="DisplayEditTextStyle" parent="@android:style/Widget.Material.Light.EditText">
<item name="android:background">@android:color/transparent</item>
<item name="android:cursorVisible">false</item>
<item name="android:fontFamily">sans-serif-light</item>
@@ -37,7 +37,7 @@
<item name="android:background">@drawable/display_shadow</item>
</style>
- <style name="PadButtonStyle" parent="@android:style/Widget.Quantum.Light.Button.Borderless">
+ <style name="PadButtonStyle" parent="@android:style/Widget.Material.Light.Button.Borderless">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:background">@drawable/pad_btn_background</item>
diff --git a/src/com/android/calculator2/CalculatorActivity.java b/src/com/android/calculator2/CalculatorActivity.java
index 1600e3d..cace369 100644
--- a/src/com/android/calculator2/CalculatorActivity.java
+++ b/src/com/android/calculator2/CalculatorActivity.java
@@ -25,11 +25,13 @@
import android.animation.ValueAnimator.AnimatorUpdateListener;
import android.app.Activity;
import android.os.Bundle;
+import android.support.v4.view.ViewPager;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.view.KeyEvent;
import android.view.View;
+import android.view.ViewAnimationUtils;
import android.view.View.OnLongClickListener;
import android.view.animation.AccelerateDecelerateInterpolator;
import android.widget.Button;
@@ -70,6 +72,8 @@
private CalculatorEditText mFormulaEditText;
private CalculatorEditText mResultEditText;
+ private ViewPager mPadViewPager;
+
private View mRevealView;
private View mDeleteButton;
private View mClearButton;
@@ -87,6 +91,8 @@
mFormulaEditText = (CalculatorEditText) findViewById(R.id.formula);
mResultEditText = (CalculatorEditText) findViewById(R.id.result);
+ mPadViewPager = (ViewPager) findViewById(R.id.pad_pager);
+
mRevealView = findViewById(R.id.reveal);
mDeleteButton = findViewById(R.id.del);
mClearButton = findViewById(R.id.clr);
@@ -140,6 +146,18 @@
}
@Override
+ public void onBackPressed() {
+ if (mPadViewPager == null || mPadViewPager.getCurrentItem() == 0) {
+ // If the user is currently looking at the first pad (or the pad is not paged),
+ // allow the system to handle the Back button.
+ super.onBackPressed();
+ } else {
+ // Otherwise, select the previous pad.
+ mPadViewPager.setCurrentItem(mPadViewPager.getCurrentItem() - 1);
+ }
+ }
+
+ @Override
public void onUserInteraction() {
super.onUserInteraction();
@@ -248,8 +266,9 @@
final double y_2 = Math.pow(mRevealView.getTop() - revealCenterY, 2);
final float revealRadius = (float) Math.max(Math.sqrt(x1_2 + y_2), Math.sqrt(x2_2 + y_2));
- final Animator clearAnimator = mRevealView.createRevealAnimator(
- revealCenterX, revealCenterY, 0.0f, revealRadius);
+ final Animator clearAnimator =
+ ViewAnimationUtils.createCircularReveal(mRevealView,
+ revealCenterX, revealCenterY, 0.0f, revealRadius);
clearAnimator.setDuration(
getResources().getInteger(android.R.integer.config_longAnimTime));
clearAnimator.addListener(new AnimatorListenerAdapter() {
