Merge Android Pie into masterandroid-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-release

Bug: 112104996
Change-Id: I7f86f50ff9a100921c2a1afe34b12b8cc1304e9f

39 files changed, 257 insertions, 77 deletions

diff --git a/Android.mk b/Android.mk
index ab9ff51..e4796b9 100644
--- a/Android.mk
+++ b/Android.mk
@@ -31,8 +31,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
 LOCAL_STATIC_JAVA_LIBRARIES := cr
-LOCAL_STATIC_ANDROID_LIBRARIES += android-support-v4
-LOCAL_STATIC_ANDROID_LIBRARIES += android-support-v7-gridlayout
-LOCAL_STATIC_ANDROID_LIBRARIES += android-support-v7-recyclerview
+LOCAL_STATIC_ANDROID_LIBRARIES += androidx.legacy_legacy-support-v4
+LOCAL_STATIC_ANDROID_LIBRARIES += androidx.gridlayout_gridlayout
+LOCAL_STATIC_ANDROID_LIBRARIES += androidx.recyclerview_recyclerview
 
 include $(BUILD_PACKAGE)
diff --git a/res/layout/fragment_history.xml b/res/layout/fragment_history.xml
index e5fe50e..c3c5b62 100644
--- a/res/layout/fragment_history.xml
+++ b/res/layout/fragment_history.xml
@@ -35,7 +35,7 @@
         android:theme="@android:style/ThemeOverlay.Material.Dark.ActionBar"
         android:title="@string/title_history" />
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/history_recycler_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/res/layout/pad_advanced_3x5.xml b/res/layout/pad_advanced_3x5.xml
index ece7003..cf38fe6 100644
--- a/res/layout/pad_advanced_3x5.xml
+++ b/res/layout/pad_advanced_3x5.xml
@@ -15,7 +15,7 @@
   limitations under the License.
   -->
 
-<android.support.v7.widget.GridLayout
+<androidx.gridlayout.widget.GridLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/pad_advanced"
@@ -205,4 +205,4 @@
         app:layout_row="4"
         app:layout_column="2" />
 
-</android.support.v7.widget.GridLayout>
+</androidx.gridlayout.widget.GridLayout>
diff --git a/res/layout/pad_advanced_4x4.xml b/res/layout/pad_advanced_4x4.xml
index 70a520e..dd5a792 100644
--- a/res/layout/pad_advanced_4x4.xml
+++ b/res/layout/pad_advanced_4x4.xml
@@ -15,7 +15,7 @@
   limitations under the License.
   -->
 
-<android.support.v7.widget.GridLayout
+<androidx.gridlayout.widget.GridLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/pad_advanced"
@@ -205,4 +205,4 @@
         app:layout_row="3"
         app:layout_column="3" />
 
-</android.support.v7.widget.GridLayout>
+</androidx.gridlayout.widget.GridLayout>
diff --git a/res/layout/pad_advanced_5x3.xml b/res/layout/pad_advanced_5x3.xml
index 95a0fc1..21ed723 100644
--- a/res/layout/pad_advanced_5x3.xml
+++ b/res/layout/pad_advanced_5x3.xml
@@ -15,7 +15,7 @@
   limitations under the License.
   -->
 
-<android.support.v7.widget.GridLayout
+<androidx.gridlayout.widget.GridLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/pad_advanced"
@@ -205,4 +205,4 @@
         app:layout_row="2"
         app:layout_column="4" />
 
-</android.support.v7.widget.GridLayout>
+</androidx.gridlayout.widget.GridLayout>
diff --git a/res/layout/pad_numeric.xml b/res/layout/pad_numeric.xml
index 2f301e8..5810984 100644
--- a/res/layout/pad_numeric.xml
+++ b/res/layout/pad_numeric.xml
@@ -15,7 +15,7 @@
   limitations under the License.
   -->
 
-<android.support.v7.widget.GridLayout
+<androidx.gridlayout.widget.GridLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/pad_numeric"
@@ -109,4 +109,4 @@
         app:layout_row="3"
         app:layout_column="2" />
 
-</android.support.v7.widget.GridLayout>
+</androidx.gridlayout.widget.GridLayout>
diff --git a/res/layout/pad_operator_one_col.xml b/res/layout/pad_operator_one_col.xml
index 3a6473a..3484972 100644
--- a/res/layout/pad_operator_one_col.xml
+++ b/res/layout/pad_operator_one_col.xml
@@ -15,7 +15,7 @@
   limitations under the License.
   -->
 
-<android.support.v7.widget.GridLayout
+<androidx.gridlayout.widget.GridLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/pad_operator"
@@ -74,4 +74,4 @@
         app:layout_row="4"
         app:layout_column="0" />
 
-</android.support.v7.widget.GridLayout>
+</androidx.gridlayout.widget.GridLayout>
diff --git a/res/layout/pad_operator_two_col.xml b/res/layout/pad_operator_two_col.xml
index e056ba5..b819162 100644
--- a/res/layout/pad_operator_two_col.xml
+++ b/res/layout/pad_operator_two_col.xml
@@ -15,7 +15,7 @@
   limitations under the License.
   -->
 
-<android.support.v7.widget.GridLayout
+<androidx.gridlayout.widget.GridLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/pad_operator"
@@ -81,4 +81,4 @@
         app:layout_row="3"
         app:layout_column="1" />
 
-</android.support.v7.widget.GridLayout>
+</androidx.gridlayout.widget.GridLayout>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 35cb6ff..c055afd 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -75,7 +75,7 @@
     <string name="approximate" msgid="7117143366610670836">"(±1 в последната цифра)"</string>
     <string name="menu_leading" msgid="2338520833272667740">"Отг. с първите цифри"</string>
     <string name="menu_fraction" msgid="1247477377840252234">"Отг. като дроб"</string>
-    <string name="menu_licenses" msgid="1890541368064108592">"Лицензи за отв. код"</string>
+    <string name="menu_licenses" msgid="1890541368064108592">"Лицензи за отворен код"</string>
     <string name="menu_history" msgid="9006222701220105452">"История"</string>
     <string name="menu_clear_history" msgid="2336526604226069572">"Изчистване"</string>
     <string name="title_history" msgid="7820912156315181539">"История"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 7cd4318..1387b25 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -75,7 +75,7 @@
     <string name="approximate" msgid="7117143366610670836">"(±১ শেষের ডিজিটের মধ্যে)"</string>
     <string name="menu_leading" msgid="2338520833272667740">"লিডিং সংখ্যায় উত্তর"</string>
     <string name="menu_fraction" msgid="1247477377840252234">"ভগ্নাংশ হিসাবে উত্তর"</string>
-    <string name="menu_licenses" msgid="1890541368064108592">"মুক্ত উৎস লাইসেন্সগুলি"</string>
+    <string name="menu_licenses" msgid="1890541368064108592">"ওপেন সোর্স লাইসেন্স"</string>
     <string name="menu_history" msgid="9006222701220105452">"ইতিহাস"</string>
     <string name="menu_clear_history" msgid="2336526604226069572">"সাফ করুন"</string>
     <string name="title_history" msgid="7820912156315181539">"ইতিহাস"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index b251cbd..ce407fb 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -75,7 +75,7 @@
     <string name="approximate" msgid="7117143366610670836">"(±1 für die letzte Zahl)"</string>
     <string name="menu_leading" msgid="2338520833272667740">"Ergebnis mit führenden Ziffern"</string>
     <string name="menu_fraction" msgid="1247477377840252234">"Ergebnis als Bruch"</string>
-    <string name="menu_licenses" msgid="1890541368064108592">"Open-Source-Lizenzen"</string>
+    <string name="menu_licenses" msgid="1890541368064108592">"Open Source-Lizenzen"</string>
     <string name="menu_history" msgid="9006222701220105452">"Verlauf"</string>
     <string name="menu_clear_history" msgid="2336526604226069572">"Löschen"</string>
     <string name="title_history" msgid="7820912156315181539">"Verlauf"</string>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
new file mode 100644
index 0000000..5f5aab3
--- /dev/null
+++ b/res/values-en-rCA/strings.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  Copyright (C) 2015 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="1756503303878374382">"Calculator"</string>
+    <string name="dec_point" msgid="8920102493070918054">"."</string>
+    <string name="mode_deg" msgid="1146123354434332479">"deg"</string>
+    <string name="mode_rad" msgid="1434228830085760996">"rad"</string>
+    <string name="clr" msgid="6730945431543327337">"clr"</string>
+    <string name="cleared" msgid="3952521190281880880">"cleared"</string>
+    <string name="del" msgid="5878069000864178910">"del"</string>
+    <string name="desc_const_e" msgid="1889187337970539507">"Euler\'s number"</string>
+    <string name="desc_const_pi" msgid="5430918714009441655">"pi"</string>
+    <string name="desc_dec_point" msgid="5725254504360445023">"point"</string>
+    <string name="desc_lparen" msgid="8688758170211924916">"left parenthesis"</string>
+    <string name="desc_rparen" msgid="7920608385146151731">"right parenthesis"</string>
+    <string name="desc_fun_cos" msgid="3787913784504974731">"cosine"</string>
+    <string name="desc_fun_ln" msgid="2505119732546227166">"natural logarithm"</string>
+    <string name="desc_fun_log" msgid="4202230639814060062">"logarithm"</string>
+    <string name="desc_fun_sin" msgid="7425661271929838876">"sine"</string>
+    <string name="desc_fun_tan" msgid="3545496562069310036">"tangent"</string>
+    <string name="desc_fun_arccos" msgid="7583077865497939123">"inverse cosine"</string>
+    <string name="desc_fun_arcsin" msgid="8592309261123302915">"inverse sine"</string>
+    <string name="desc_fun_arctan" msgid="6891388393360447455">"inverse tangent"</string>
+    <string name="desc_fun_10pow" msgid="3972646467174520812">"ten to the power of"</string>
+    <string name="desc_fun_exp" msgid="657106837530588390">"exponential function"</string>
+    <string name="desc_op_sqr" msgid="693577095029219627">"squared"</string>
+    <string name="desc_op_add" msgid="5539599782598050813">"plus"</string>
+    <string name="desc_op_div" msgid="3032399266115257498">"divide"</string>
+    <string name="desc_op_fact" msgid="6142780103294179702">"factorial"</string>
+    <string name="desc_op_mul" msgid="6882122010553947015">"multiply"</string>
+    <string name="desc_op_pct" msgid="2466179646911499434">"percent"</string>
+    <string name="desc_op_pow" msgid="6010144442344099030">"power"</string>
+    <string name="desc_op_sqrt" msgid="6882241473601721767">"square root"</string>
+    <string name="desc_op_sub" msgid="2744940875059679129">"minus"</string>
+    <string name="desc_mode_deg" msgid="4129831241246511710">"degree mode"</string>
+    <string name="desc_mode_rad" msgid="730135521908627673">"radian mode"</string>
+    <string name="desc_switch_deg" msgid="6675211986921592374">"switch to degrees"</string>
+    <string name="desc_switch_rad" msgid="2845875847488919914">"switch to radians"</string>
+    <string name="desc_eq" msgid="3349320880874699285">"equals"</string>
+    <string name="desc_clr" msgid="737502124268890797">"clear"</string>
+    <string name="desc_del" msgid="7879515781929311432">"Delete"</string>
+    <string name="desc_inv_off" msgid="3672218250519616068">"show inverse functions"</string>
+    <string name="desc_inv_on" msgid="2515675590767677178">"hide inverse functions"</string>
+    <string name="desc_formula" msgid="8056588859637585007">"No formula"</string>
+    <string name="desc_result" msgid="1794073190203126821">"No result"</string>
+    <string name="desc_num_pad" msgid="515720457459745571">"Numbers and basic operations"</string>
+    <string name="desc_adv_pad" msgid="3794276256462677914">"Advanced operations"</string>
+    <string name="error_nan" msgid="5674077944929888710">"Not a number"</string>
+    <string name="error_syntax" msgid="4786987111228645602">"Bad expression"</string>
+    <string name="error_aborted" msgid="3402238176316342537">"Aborted"</string>
+    <string name="error_overflow" msgid="7800547394563434764">"Infinite?"</string>
+    <string name="error_zero_divide" msgid="458040988686661801">"Can\'t divide by 0"</string>
+    <string name="text_copied_toast" msgid="2104264466812485425">"Text copied"</string>
+    <string name="cancelled" msgid="2207323593183640994">"Computation cancelled."</string>
+    <string name="timeout" msgid="5461892570729418573">"Value may be infinite or undefined."</string>
+    <string name="ok_remove_timeout" msgid="8344529153919268011">"Use longer timeouts"</string>
+    <string name="dismiss" msgid="7872443888515066216">"Dismiss"</string>
+    <string name="exact" msgid="2597237880041789948">"(exact)"</string>
+    <string name="approximate" msgid="7117143366610670836">"(±1 in last digit)"</string>
+    <string name="menu_leading" msgid="2338520833272667740">"Answer with leading digits"</string>
+    <string name="menu_fraction" msgid="1247477377840252234">"Answer as fraction"</string>
+    <string name="menu_licenses" msgid="1890541368064108592">"Open-source licences"</string>
+    <string name="menu_history" msgid="9006222701220105452">"History"</string>
+    <string name="menu_clear_history" msgid="2336526604226069572">"Clear"</string>
+    <string name="title_history" msgid="7820912156315181539">"History"</string>
+    <string name="desc_navigate_up" msgid="6208699569165589623">"Navigate up"</string>
+    <string name="dialog_timeout" msgid="9069768442342329065">"Timeout"</string>
+    <string name="dialog_clear" msgid="7137395395908350702">"Clear history and memory?"</string>
+    <string name="title_current_expression" msgid="2442754548537900591">"Current Expression"</string>
+    <string name="no_history" msgid="4331262030447527188">"No history"</string>
+</resources>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
new file mode 100644
index 0000000..2f1b4a8
--- /dev/null
+++ b/res/values-en-rXC/strings.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  Copyright (C) 2015 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="1756503303878374382">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‎‏‏‎‎‎‎‎‎‏‎‏‏‎‏‎‎‏‏‏‎‎‏‎‏‏‎‏‎‎‏‎‎‏‏‏‏‎‎‎‎‏‏‏‎‎‏‏‏‏‏‎‏‏‏‎‎Calculator‎‏‎‎‏‎"</string>
+    <string name="dec_point" msgid="8920102493070918054">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‎‏‎‏‎‎‏‎‎‎‏‏‏‏‏‎‏‎‎‏‏‏‎‏‎‏‏‏‎‎‏‎‎‎‏‏‎‎‎‎‎‎‏‏‎‏‎‎‏‏‎‎.‎‏‎‎‏‎"</string>
+    <string name="mode_deg" msgid="1146123354434332479">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‎‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‏‏‎‎‏‎‎‎‏‏‏‏‎‎‏‎‏‎‎‎‏‏‏‎‏‎‏‏‎‎‏‏‎‎‏‏‏‎‎‏‏‏‏‏‏‎deg‎‏‎‎‏‎"</string>
+    <string name="mode_rad" msgid="1434228830085760996">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‏‏‏‎‎‏‏‏‎‏‏‎‎‏‏‏‏‎‎‎‎‏‎‏‏‎‏‎‎‏‏‏‏‏‏‎‎‎‏‎‏‏‎‎‎‏‏‏‏‏‏‎‎‏‎‎‎rad‎‏‎‎‏‎"</string>
+    <string name="clr" msgid="6730945431543327337">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‏‎‏‏‎‏‎‎‏‎‎‎‏‏‏‏‏‎‎‏‏‎‏‎‏‎‎‏‏‏‎‎‏‏‎‏‎‏‏‎‏‏‎‏‎‏‎‏‎‎‏‏‎‏‎‎‏‎clr‎‏‎‎‏‎"</string>
+    <string name="cleared" msgid="3952521190281880880">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‎‏‏‎‏‏‎‏‏‎‏‏‎‏‎‎‎‏‎‏‏‎‏‎‎‎‏‎‏‎‎‏‏‎‎‏‎‎‏‏‏‏‏‎‏‎‎‏‎‏‎‎‏‎‏‎‎‏‏‎‎‎‎‎cleared‎‏‎‎‏‎"</string>
+    <string name="del" msgid="5878069000864178910">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‏‎‎‏‏‎‎‎‏‏‎‎‎‏‎‎‏‏‏‎‎‏‏‏‎‏‎‎‏‏‎‏‏‏‏‏‎‏‎‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎del‎‏‎‎‏‎"</string>
+    <string name="desc_const_e" msgid="1889187337970539507">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‎‏‏‎‏‏‏‏‎‏‏‏‏‎‏‏‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‎‎‏‏‎‎‏‎‏‏‎‏‏‏‏‏‏‎‎‏‏‎Euler\'s number‎‏‎‎‏‎"</string>
+    <string name="desc_const_pi" msgid="5430918714009441655">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‎‏‏‏‏‎‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‏‎‎‎‎‏‎‎‎‏‏‎‏‏‏‎‏‎‏‎‏‎‏‏‏‎‏‏‏‎pi‎‏‎‎‏‎"</string>
+    <string name="desc_dec_point" msgid="5725254504360445023">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‏‏‎‏‎‎‎‎‏‏‎‎‎‎‏‎‏‎‎‎‏‏‎‏‎‏‎‏‎‏‎‎‎‏‏‏‎‎‎‎‎‎‎‏‎‎‎‏‎‏‏‏‏‏‎point‎‏‎‎‏‎"</string>
+    <string name="desc_lparen" msgid="8688758170211924916">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‏‎‎‏‎‏‎‏‎‏‏‏‎‎‎‎‏‎‏‎‏‎‏‎‎‏‎‏‏‎‎‎‎‎‏‎‎‏‏‏‎‏‏‏‎‏‏‎‏‎‎‎left parenthesis‎‏‎‎‏‎"</string>
+    <string name="desc_rparen" msgid="7920608385146151731">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‎‏‎‏‏‏‎‏‎‎‏‏‏‎‏‎‏‏‏‎‎‎‏‏‏‎‎‎‏‏‎‎‏‏‏‎‏‏‏‏‎‎‎‏‏‎‎‏‏‎‎‏‏‎right parenthesis‎‏‎‎‏‎"</string>
+    <string name="desc_fun_cos" msgid="3787913784504974731">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‎‏‏‎‏‎‎‏‎‎‏‎‎‎‏‎‏‎‏‏‏‏‏‏‎‎‎‎‏‎‎‏‎‎‎‏‏‎‏‎‎‏‏‏‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‎‏‏‎cosine‎‏‎‎‏‎"</string>
+    <string name="desc_fun_ln" msgid="2505119732546227166">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‎‏‎‎‎‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‎‎‏‎‎‎‏‏‏‏‏‏‏‎‎‎‎‏‎‎‎‏‏‏‏‎‏‎‏‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎natural logarithm‎‏‎‎‏‎"</string>
+    <string name="desc_fun_log" msgid="4202230639814060062">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‎‏‎‎‎‏‎‏‎‏‎‎‏‎‏‎‎‎‎‎‎‎‏‎‏‎‎‏‏‎‎‏‏‎‎‎‎‏‎‎‏‎‏‎‎‎‎‎‎‏‏‏‏‎‎logarithm‎‏‎‎‏‎"</string>
+    <string name="desc_fun_sin" msgid="7425661271929838876">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‎‎‏‏‎‏‎‎‏‏‏‏‏‏‏‎‎‏‎‏‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‎‏‏‏‎‏‎‎‎‏‏‏‎‎‎sine‎‏‎‎‏‎"</string>
+    <string name="desc_fun_tan" msgid="3545496562069310036">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‎‏‏‎‎‎‏‎‎‏‏‎‏‎‎‎‎‏‎‎‎‏‎‎‏‎‏‎‏‏‎‏‎‎‏‏‏‏‎‏‎‎‎‎‎‏‎‏‎‎‎‏‎‏‎‎‏‎‏‎‏‎‎‎tangent‎‏‎‎‏‎"</string>
+    <string name="desc_fun_arccos" msgid="7583077865497939123">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‏‏‏‏‎‎‏‎‎‎‎‎‎‏‎‎‏‎‎‏‎‎‎‏‎‎‏‏‎‏‎‎‏‎‎‎‎‏‏‏‎‎‏‏‎‎‏‎‏‏‎‎‏‏‎inverse cosine‎‏‎‎‏‎"</string>
+    <string name="desc_fun_arcsin" msgid="8592309261123302915">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‏‏‏‎‎‎‎‎‎‎‏‏‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‏‏‎‎‎‏‏‎‏‏‎‏‏‎‏‏‎‎‎‎‎‎‎‏‏‎inverse sine‎‏‎‎‏‎"</string>
+    <string name="desc_fun_arctan" msgid="6891388393360447455">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‏‎‎‎‎‏‎‎‏‏‏‎‏‏‎‏‎‎‏‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎inverse tangent‎‏‎‎‏‎"</string>
+    <string name="desc_fun_10pow" msgid="3972646467174520812">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‎‏‏‎‏‏‏‎‎‏‎‎‎‎‏‏‎‏‎‏‏‎‎‏‏‏‎‏‎‎‏‏‏‏‏‎‏‏‎‎‎‏‎‎‏‎‏‏‏‎‏‎‏‏‏‏‏‏‎‏‏‎‎‎ten to the power of‎‏‎‎‏‎"</string>
+    <string name="desc_fun_exp" msgid="657106837530588390">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‎‎‏‎‎‏‎‎‎‏‏‏‏‎‏‎‎‎‎‎‏‏‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‏‏‏‎‏‏‎‏‏‎‏‎‎‏‏‏‎‎‏‏‎‎exponential function‎‏‎‎‏‎"</string>
+    <string name="desc_op_sqr" msgid="693577095029219627">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‎‎‏‎‎‏‏‎‏‎‎‎‎‎‎‎‎‏‎‏‎‎‏‎‏‏‎‎‎‏‎‏‏‏‎‏‎‏‏‎‎‏‎‎‎‎‎‏‏‎‎‎‎‏‎‎‏‎‏‎‏‏‎squared‎‏‎‎‏‎"</string>
+    <string name="desc_op_add" msgid="5539599782598050813">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‏‏‏‎‎‎‎‎‏‎‎‏‏‏‎‎‏‎‏‎‎‏‏‎‏‏‏‏‎‏‏‏‏‎‎‏‎‏‏‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎plus‎‏‎‎‏‎"</string>
+    <string name="desc_op_div" msgid="3032399266115257498">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‎‏‎‏‎‏‎‎‎‎‏‎‏‎‏‎‎‏‏‏‏‏‏‎‎‎‏‎‎‎‎‏‏‏‏‎‎‎‏‏‏‏‏‎‏‎‎‏‎‎‎‎‏‎‎‏‎‎‏‏‎‏‎‎divide‎‏‎‎‏‎"</string>
+    <string name="desc_op_fact" msgid="6142780103294179702">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‏‏‏‎‏‎‏‎‏‎‎‎‏‏‎‎‎‏‎‏‏‏‏‏‏‎‏‏‎‎‏‎‏‏‏‎‏‏‎‎factorial‎‏‎‎‏‎"</string>
+    <string name="desc_op_mul" msgid="6882122010553947015">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‎‎‎‎‎‏‎‎‎‏‏‎‏‎‏‏‎‎‎‎‎‎‏‎‏‏‎‏‎‏‏‏‏‏‏‎‏‏‏‎‎‎‏‎‎‏‏‏‎‎‎‎‏‏‏‎multiply‎‏‎‎‏‎"</string>
+    <string name="desc_op_pct" msgid="2466179646911499434">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‎‏‎‎‎‏‎‎‎‏‏‏‎‎‏‏‎‏‎‎‎‎‏‎‏‎‏‎‎‏‎‏‎‎‎‏‏‏‎‎‏‏‏‎‏‎‏‎‏‎‎‏‏‎‎‏‎‏‎‏‎‏‎‎percent‎‏‎‎‏‎"</string>
+    <string name="desc_op_pow" msgid="6010144442344099030">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‎‏‏‎‏‎‎‎‎‏‎‏‎‎‏‎‏‎‎‎‎‏‏‎‏‏‏‏‎‏‏‎‏‎‏‏‎‏‎‏‎‏‎‎‏‏‎‎‏‏‎‏‎‏‏‎‎power‎‏‎‎‏‎"</string>
+    <string name="desc_op_sqrt" msgid="6882241473601721767">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‎‎‎‎‎‏‎‏‎‏‎‎‎‏‎‎‎‏‎‏‎‎‎‎‎‎‏‎‏‎‎‎‏‏‏‏‏‎‏‏‏‎‏‎‏‎‏‏‎‏‎‎‏‏‏‎square root‎‏‎‎‏‎"</string>
+    <string name="desc_op_sub" msgid="2744940875059679129">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‎‏‎‎‏‏‎‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‏‎‏‎‏‏‏‎‏‏‎‏‏‎‎‎‎‏‏‏‎‎‏‏‏‏‏‎‎‏‏‎‎‏‎minus‎‏‎‎‏‎"</string>
+    <string name="desc_mode_deg" msgid="4129831241246511710">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‎‏‏‏‎‎‏‎‏‎‏‎‎‎‎‎‎‎‏‏‎‏‏‏‎‏‎‎‎‏‎‎‎‎‏‎‏‎‎‏‏‎‎‏‏‏‏‎‎‎‏‎‎‏‎‎‏‎‏‏‏‏‎‎degree mode‎‏‎‎‏‎"</string>
+    <string name="desc_mode_rad" msgid="730135521908627673">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‎‎‏‎‏‎‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‎‏‏‎‎‎‏‏‏‎‎‎‎‏‎‏‎‏‎‎‎‎‏‎‎‎‎‏‏‎‎‎‏‏‎‏‏‎‎‏‎radian mode‎‏‎‎‏‎"</string>
+    <string name="desc_switch_deg" msgid="6675211986921592374">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‏‎‎‎‏‏‎‎‎‏‏‏‎‏‏‏‏‎‏‏‏‏‎‏‏‏‎‎‎‎‏‏‏‎‎‏‎‎‎‎‎‏‎‏‏‎‎‎‏‏‎‏‏‎‎switch to degrees‎‏‎‎‏‎"</string>
+    <string name="desc_switch_rad" msgid="2845875847488919914">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‎‏‎‎‏‏‏‎‏‏‏‏‏‏‎‏‎‎‏‎‏‎‏‎‎‎‎‎‎‎‏‎‏‎‏‎‏‎‎‎‏‏‏‎‎‎‎‏‏‎‏‏‎‎‏‎‏‏‎‏‎‏‎‎switch to radians‎‏‎‎‏‎"</string>
+    <string name="desc_eq" msgid="3349320880874699285">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‎‏‎‏‏‏‎‎‏‏‏‏‎‏‏‎‎‏‎‏‏‎‏‏‎‎‏‏‎‎‎‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‏‏‎‏‏‏‎‏‎‎‎‎‏‎‏‎‏‎equals‎‏‎‎‏‎"</string>
+    <string name="desc_clr" msgid="737502124268890797">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‎‎‏‎‏‎‎‎‏‏‏‏‎‎‎‎‏‎‎‎‏‎‎‏‎‎‎‏‏‎‎‏‎‎‏‎‏‎‎‎‏‎‎‏‎‎‏‎‏‎‏‎‏‎‏‎‏‎‏‏‎‏‎clear‎‏‎‎‏‎"</string>
+    <string name="desc_del" msgid="7879515781929311432">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‏‎‏‏‎‎‏‏‎‏‎‏‎‎‏‏‏‎‏‏‎‏‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‏‎‎‏‏‎‎‏‎‎‎‎delete‎‏‎‎‏‎"</string>
+    <string name="desc_inv_off" msgid="3672218250519616068">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‎‏‏‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‏‎‏‏‏‎‎‎‎‏‎‏‎‏‏‏‎‎‏‏‏‏‏‏‎‏‏‎‏‏‎‎‏‏‎‏‎‎‏‎‎‎‏‎‎‎show inverse functions‎‏‎‎‏‎"</string>
+    <string name="desc_inv_on" msgid="2515675590767677178">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‎‏‎‎‎‏‎‏‏‏‎‏‎‎‏‎‏‏‏‏‎‎‏‏‎‎‏‏‏‏‏‎‎‎‎‎‏‎‏‏‏‎‏‎‏‎‎‎‎‎‎‏‏‏‎‏‏‏‏‏‎‏‎‎hide inverse functions‎‏‎‎‏‎"</string>
+    <string name="desc_formula" msgid="8056588859637585007">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‎‎‏‏‏‎‏‏‎‎‎‎‎‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‎‎‎‏‎‎‎‏‎‏‎‏‎‏‎‎‎‏‏‎‏‏‏‏‎No formula‎‏‎‎‏‎"</string>
+    <string name="desc_result" msgid="1794073190203126821">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‏‏‏‎‎‏‎‏‏‏‎‏‎‏‎‎‎‎‎‎‏‏‏‏‏‎‏‎‎‎‏‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‎‎‎‎‏‎‎‏‎‏‎No result‎‏‎‎‏‎"</string>
+    <string name="desc_num_pad" msgid="515720457459745571">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‎‏‎‏‎‎‎‎‎‏‏‎‏‎‏‎‎‎‎‎‏‏‎‎‎‎‎‏‏‏‎‎‏‎‎‏‎‏‎‎‏‎‎‎‎‏‏‎‎‏‎‎‎‏‏‎Numbers and basic operations‎‏‎‎‏‎"</string>
+    <string name="desc_adv_pad" msgid="3794276256462677914">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‎‏‏‎‏‎‎‏‎‏‎‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‏‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‎‎‎‏‎‎‏‏‏‏‎‎‏‏‎‏‎‎Advanced operations‎‏‎‎‏‎"</string>
+    <string name="error_nan" msgid="5674077944929888710">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‏‎‏‏‏‏‏‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‎‎‏‏‏‏‎‏‏‎‏‏‎‎‏‎‏‎‏‎‎‏‏‏‎‎‎‏‏‎‎Not a number‎‏‎‎‏‎"</string>
+    <string name="error_syntax" msgid="4786987111228645602">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‏‎‏‏‏‎‏‏‎‎‏‎‏‏‎‏‏‎‏‎‏‎‎‏‎‎‎‏‎‏‎‎‏‎‏‎‎‎‎‎‏‎‎‎‎‎‏‏‏‎‎‎‏‎‎Bad expression‎‏‎‎‏‎"</string>
+    <string name="error_aborted" msgid="3402238176316342537">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‎‏‎‏‏‏‏‎‎‏‏‎‏‏‏‎‎‏‎‏‏‎‏‏‎‎‏‏‎‎‎‎‏‏‏‎‏‎‎‏‎‎‏‏‎‏‏‏‏‎‎‎‎‎‏‎‎‎‎‏‎‎‏‎Aborted‎‏‎‎‏‎"</string>
+    <string name="error_overflow" msgid="7800547394563434764">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‎‎‎‎‏‎‎‎‏‏‏‎‎‏‎‎‎‎‏‏‎‏‎‏‏‏‎‏‎‏‎‎‎‏‏‎‏‎‏‏‎‏‎‎‏‎‎‎‎‏‏‎‎‎Infinite?‎‏‎‎‏‎"</string>
+    <string name="error_zero_divide" msgid="458040988686661801">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‎‏‏‎‏‏‎‏‎‎‏‎‎‏‏‏‎‏‏‎‏‎‎‎‏‏‎‏‏‏‎‎‏‏‏‏‎‎‏‎‏‏‏‎‎‎‏‎‏‎‏‎‎‏‎Can\'t divide by 0‎‏‎‎‏‎"</string>
+    <string name="text_copied_toast" msgid="2104264466812485425">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‎‏‏‎‎‏‏‏‏‎‏‏‎‎‏‎‏‏‎‎‎‏‎‎‎‏‏‏‎‎‏‏‏‎‏‎‏‎‏‏‎‏‏‏‏‏‏‎‎‏‏‎‎‎‏‎Text copied‎‏‎‎‏‎"</string>
+    <string name="cancelled" msgid="2207323593183640994">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‎‎‏‏‏‏‎‏‎‎‎‎‎‎‏‏‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‏‎‎Computation cancelled.‎‏‎‎‏‎"</string>
+    <string name="timeout" msgid="5461892570729418573">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‎‏‏‎‎‏‎‎‎‏‎‏‎‎‏‎‏‏‎‏‎‏‏‎‎‏‏‏‏‏‎‏‎‏‏‎‎‎‎‎‎‏‏‏‏‎‏‎‎‏‏‎‏‎Value may be infinite or undefined.‎‏‎‎‏‎"</string>
+    <string name="ok_remove_timeout" msgid="8344529153919268011">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‎‏‏‎‏‏‎‏‏‏‎‎‏‎‎‎‎‏‏‎‏‏‏‏‎‎‏‎‏‎‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‎‏‎‏‎‏‏‎Use longer timeouts‎‏‎‎‏‎"</string>
+    <string name="dismiss" msgid="7872443888515066216">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‏‎‎‎‎‎‎‏‎‎‎‏‎‏‎‎‎‎‎‎‎‎‏‏‎‏‏‎‎‎‏‎‎‏‎‎‎‏‎‏‎‏‎‏‎‎‏‎‏‏‎‏‎‎‎‎Dismiss‎‏‎‎‏‎"</string>
+    <string name="exact" msgid="2597237880041789948">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‎‏‎‎‏‎‎‎‎‎‎‏‎‏‏‎‎‏‏‏‏‏‎‎‎‎‏‎‏‏‏‎‏‎‏‎‏‎‏‎‎‎‏‎‏‎‎‎‏‎‏‏‎‎‏‏‏‏‏‏‏‎‎‎(exact)‎‏‎‎‏‎"</string>
+    <string name="approximate" msgid="7117143366610670836">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‎‎‏‎‏‎‎‏‎‏‏‎‎‎‎‏‎‏‏‏‏‎‎‎‎‎‏‏‎‎‏‎‏‏‎‏‏‎‏‎‏‎‏‎‎‏‏‏‏‎‏‎‎‎(±1 in last digit)‎‏‎‎‏‎"</string>
+    <string name="menu_leading" msgid="2338520833272667740">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‎‏‎‎‎‎‎‎‏‏‏‎‏‎‎‎‎‎‏‏‎‎‎‎‏‎‎‏‏‏‎‏‏‎‎‏‏‏‏‎‎‎‏‎‎‎‏‎‏‎‏‏‏‏‎‎‏‎‏‏‏‎‎‎Answer with leading digits‎‏‎‎‏‎"</string>
+    <string name="menu_fraction" msgid="1247477377840252234">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‎‏‎‎‏‏‏‏‏‏‏‎‏‏‏‎‎‎‎‏‎‎‎‎‏‏‎‏‎‎‏‏‏‎‎‎‎‎‎‏‎‎‎‎‎‏‎‏‎‏‎‎‏‎‏‎‎Answer as fraction‎‏‎‎‏‎"</string>
+    <string name="menu_licenses" msgid="1890541368064108592">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‎‏‏‏‏‎‎‏‎‎‎‏‏‎‏‎‏‎‏‏‎‏‏‏‎‎‏‎‏‎‎‏‎‏‎‎‏‎‎‎‏‏‎‏‎‎‎‎‎‏‏‎‎‎‎‎Open source licenses‎‏‎‎‏‎"</string>
+    <string name="menu_history" msgid="9006222701220105452">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‎‏‎‎‎‏‏‎‏‎‏‎‎‏‎‎‏‎‎‎‏‎‎‎‏‏‎‎‏‏‏‎‏‏‎‎‎History‎‏‎‎‏‎"</string>
+    <string name="menu_clear_history" msgid="2336526604226069572">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‎‏‎‎‎‎‎‎‏‏‎‏‏‎‏‎‎‎‎‎‎‏‎‏‎‎‏‎‎‎‏‎‎‏‎‏‏‎‏‎‎‏‎‎‏‎‏‎‎‎‎‎‏‎‎‎‏‎‎‎‏‎‎‎Clear‎‏‎‎‏‎"</string>
+    <string name="title_history" msgid="7820912156315181539">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‏‎‎‎‏‎‎‏‎‏‏‏‎‏‏‎‎‎‏‎‏‎‏‏‎‏‎‏‎‎‎‎‏‎‏‏‎‎‏‏‎‏‏‎‎‎‎‏‏‏‏‎‎‎‏‏‎History‎‏‎‎‏‎"</string>
+    <string name="desc_navigate_up" msgid="6208699569165589623">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‏‎‏‎‎‏‏‎‏‏‏‎‏‏‎‏‎‏‏‏‎‎‏‏‏‏‎‎‎‏‎‎‏‏‏‏‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‏‎Navigate up‎‏‎‎‏‎"</string>
+    <string name="dialog_timeout" msgid="9069768442342329065">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‏‏‎‎‏‎‎‏‎‏‎‎‏‎‏‏‎‎‎‎‎‏‏‏‎‎‎‏‏‎‏‏‏‎‎‏‏‎‎‏‎‏‎‏‏‏‎‏‎‎‏‎Timeout‎‏‎‎‏‎"</string>
+    <string name="dialog_clear" msgid="7137395395908350702">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‎‎‏‏‎‏‎‎‎‏‏‏‏‏‎‏‎‎‏‏‎‎‎‎‎‎‏‎‏‎‏‎‏‎‎‎‎‎‎‎‏‏‎‎‏‎‏‏‏‎‏‏‏‎‎Clear history and memory?‎‏‎‎‏‎"</string>
+    <string name="title_current_expression" msgid="2442754548537900591">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‎‏‎‎‎‎‏‏‏‏‎‎‏‏‎‎‏‏‎‏‎‎‎‎‏‎‏‎‎‎‏‏‏‎‏‎‎‏‏‎‎‎‏‎‎‏‎‎‎‏‏‏‏‏‎‎‎‏‎‏‏‏‏‎Current Expression‎‏‎‎‏‎"</string>
+    <string name="no_history" msgid="4331262030447527188">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‎‏‏‏‏‎‎‎‎‎‏‏‎‏‏‏‎‏‏‏‎‏‏‏‏‎‏‏‏‏‎‎‏‏‎‎‎‎‏‏‏‏‏‎‏‏‎‎‏‎‎‎‏‎‏‎‎‎‏‎‏‎‎‎No History‎‏‎‎‏‎"</string>
+</resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 7701b11..61bafb7 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -21,9 +21,9 @@
     <string name="dec_point" msgid="8920102493070918054">"."</string>
     <string name="mode_deg" msgid="1146123354434332479">"º"</string>
     <string name="mode_rad" msgid="1434228830085760996">"rad"</string>
-    <string name="clr" msgid="6730945431543327337">"be"</string>
+    <string name="clr" msgid="6730945431543327337">"BT"</string>
     <string name="cleared" msgid="3952521190281880880">"borrados"</string>
-    <string name="del" msgid="5878069000864178910">"c"</string>
+    <string name="del" msgid="5878069000864178910">"BC"</string>
     <string name="desc_const_e" msgid="1889187337970539507">"número de Euler"</string>
     <string name="desc_const_pi" msgid="5430918714009441655">"pi"</string>
     <string name="desc_dec_point" msgid="5725254504360445023">"punto"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 2f479ef..1ffe00c 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -75,7 +75,7 @@
     <string name="approximate" msgid="7117143366610670836">"(±1 viimases numbris)"</string>
     <string name="menu_leading" msgid="2338520833272667740">"Vasta esimeste numbritega"</string>
     <string name="menu_fraction" msgid="1247477377840252234">"Vasta murdarvuga"</string>
-    <string name="menu_licenses" msgid="1890541368064108592">"Avat. lähtek. lits."</string>
+    <string name="menu_licenses" msgid="1890541368064108592">"Avatud lähtekoodi litsentsid"</string>
     <string name="menu_history" msgid="9006222701220105452">"Ajalugu"</string>
     <string name="menu_clear_history" msgid="2336526604226069572">"Kustuta"</string>
     <string name="title_history" msgid="7820912156315181539">"Ajalugu"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index a1674eb..8a4fb5d 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -75,7 +75,7 @@
     <string name="approximate" msgid="7117143366610670836">"(છેલ્લા અંકમાં ±1)"</string>
     <string name="menu_leading" msgid="2338520833272667740">"આગળ વાળા અંકો સાથે જવાબ"</string>
     <string name="menu_fraction" msgid="1247477377840252234">"અપૂર્ણાંક તરીકે જવાબ"</string>
-    <string name="menu_licenses" msgid="1890541368064108592">"ખુલ્લા સ્ત્રોત લાઇસન્સીસ"</string>
+    <string name="menu_licenses" msgid="1890541368064108592">"ઓપન સૉર્સ લાઇસન્સ"</string>
     <string name="menu_history" msgid="9006222701220105452">"ઇતિહાસ"</string>
     <string name="menu_clear_history" msgid="2336526604226069572">"સાફ કરો"</string>
     <string name="title_history" msgid="7820912156315181539">"ઇતિહાસ"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 765b379..905996a 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -81,7 +81,7 @@
     <string name="title_history" msgid="7820912156315181539">"इतिहास"</string>
     <string name="desc_navigate_up" msgid="6208699569165589623">"ऊपर नेविगेट करें"</string>
     <string name="dialog_timeout" msgid="9069768442342329065">"समयबाह्य"</string>
-    <string name="dialog_clear" msgid="7137395395908350702">"इतिहास और मेमोरी साफ़ करना है?"</string>
+    <string name="dialog_clear" msgid="7137395395908350702">"इतिहास और मेमोरी मिटाना चाहते हैं?"</string>
     <string name="title_current_expression" msgid="2442754548537900591">"वर्तमान अभिव्यक्ति"</string>
     <string name="no_history" msgid="4331262030447527188">"कोई इतिहास नहीं"</string>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 4a11525..cad8732 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -75,7 +75,7 @@
     <string name="approximate" msgid="7117143366610670836">"(±1 dalam digit terakhir)"</string>
     <string name="menu_leading" msgid="2338520833272667740">"Jawab dengan digit depan"</string>
     <string name="menu_fraction" msgid="1247477377840252234">"Jawab sebagai pecahan"</string>
-    <string name="menu_licenses" msgid="1890541368064108592">"Lisensi sumber terbuka"</string>
+    <string name="menu_licenses" msgid="1890541368064108592">"Lisensi open source"</string>
     <string name="menu_history" msgid="9006222701220105452">"Histori"</string>
     <string name="menu_clear_history" msgid="2336526604226069572">"Hapus"</string>
     <string name="title_history" msgid="7820912156315181539">"Histori"</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index cdea789..40ba9db 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -75,7 +75,7 @@
     <string name="approximate" msgid="7117143366610670836">"(±1 ក្នុងខ្ទង់ចុងក្រោយ)"</string>
     <string name="menu_leading" msgid="2338520833272667740">"ចម្លើយជាមួយខ្ទង់នាំមុខ"</string>
     <string name="menu_fraction" msgid="1247477377840252234">"ចម្លើយជាប្រភាគ"</string>
-    <string name="menu_licenses" msgid="1890541368064108592">"អាជ្ញាប័ណ្ណប្រភពកូដចំហ"</string>
+    <string name="menu_licenses" msgid="1890541368064108592">"អាជ្ញាបណ្ណកូដចំហ"</string>
     <string name="menu_history" msgid="9006222701220105452">"ប្រវត្តិ"</string>
     <string name="menu_clear_history" msgid="2336526604226069572">"សម្អាត"</string>
     <string name="title_history" msgid="7820912156315181539">"ប្រវត្តិ"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 276e487..2f079f3 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -75,7 +75,7 @@
     <string name="approximate" msgid="7117143366610670836">"(±1 ಕೊನೆಯ ಅಂಕಿಯಲ್ಲಿ)"</string>
     <string name="menu_leading" msgid="2338520833272667740">"ಮೊದಲ ಅಂಕೆ ಜೊತೆ ಉತ್ತರಿಸಿ"</string>
     <string name="menu_fraction" msgid="1247477377840252234">"ಭಾಗದಂತೆ ಉತ್ತರಿಸಿ"</string>
-    <string name="menu_licenses" msgid="1890541368064108592">"ಮುಕ್ತ ಮೂಲ ಪರವಾನಗಿಗಳು"</string>
+    <string name="menu_licenses" msgid="1890541368064108592">"ಓಪನ್ ಸೋರ್ಸ್ ಪರವಾನಗಿಗಳು"</string>
     <string name="menu_history" msgid="9006222701220105452">"ಇತಿಹಾಸ"</string>
     <string name="menu_clear_history" msgid="2336526604226069572">"ತೆರವುಗೊಳಿಸಿ"</string>
     <string name="title_history" msgid="7820912156315181539">"ಇತಿಹಾಸ"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index bdf842e..1902bf6 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -81,7 +81,7 @@
     <string name="title_history" msgid="7820912156315181539">"Таржымал"</string>
     <string name="desc_navigate_up" msgid="6208699569165589623">"Жогору чабыттоо"</string>
     <string name="dialog_timeout" msgid="9069768442342329065">"Таймаут"</string>
-    <string name="dialog_clear" msgid="7137395395908350702">"Таржымал менен эстутум тазалансынбы?"</string>
+    <string name="dialog_clear" msgid="7137395395908350702">"Буга чейин эсептелген нерселер тазалансынбы?"</string>
     <string name="title_current_expression" msgid="2442754548537900591">"Учурдагы туюнтма"</string>
     <string name="no_history" msgid="4331262030447527188">"Таржымал жок"</string>
 </resources>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 2d2fff2..65fa3b8 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -81,7 +81,7 @@
     <string name="title_history" msgid="7820912156315181539">"Историја"</string>
     <string name="desc_navigate_up" msgid="6208699569165589623">"Одете нагоре"</string>
     <string name="dialog_timeout" msgid="9069768442342329065">"Времето истече"</string>
-    <string name="dialog_clear" msgid="7137395395908350702">"Исчистете историја и меморија?"</string>
+    <string name="dialog_clear" msgid="7137395395908350702">"Да се исчисти историја и меморија?"</string>
     <string name="title_current_expression" msgid="2442754548537900591">"Тековен израз"</string>
     <string name="no_history" msgid="4331262030447527188">"Нема историја"</string>
 </resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index aa1122c..766bc48 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -75,7 +75,7 @@
     <string name="approximate" msgid="7117143366610670836">"(±1 no último dígito)"</string>
     <string name="menu_leading" msgid="2338520833272667740">"Resposta c/ dígitos iniciais"</string>
     <string name="menu_fraction" msgid="1247477377840252234">"Responder como fração"</string>
-    <string name="menu_licenses" msgid="1890541368064108592">"Lic. cód. aberto"</string>
+    <string name="menu_licenses" msgid="1890541368064108592">"Licenças de código aberto"</string>
     <string name="menu_history" msgid="9006222701220105452">"Histórico"</string>
     <string name="menu_clear_history" msgid="2336526604226069572">"Limpar"</string>
     <string name="title_history" msgid="7820912156315181539">"Histórico"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index aa1122c..766bc48 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -75,7 +75,7 @@
     <string name="approximate" msgid="7117143366610670836">"(±1 no último dígito)"</string>
     <string name="menu_leading" msgid="2338520833272667740">"Resposta c/ dígitos iniciais"</string>
     <string name="menu_fraction" msgid="1247477377840252234">"Responder como fração"</string>
-    <string name="menu_licenses" msgid="1890541368064108592">"Lic. cód. aberto"</string>
+    <string name="menu_licenses" msgid="1890541368064108592">"Licenças de código aberto"</string>
     <string name="menu_history" msgid="9006222701220105452">"Histórico"</string>
     <string name="menu_clear_history" msgid="2336526604226069572">"Limpar"</string>
     <string name="title_history" msgid="7820912156315181539">"Histórico"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 52e81bb..b6c0e68 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -59,7 +59,7 @@
     <string name="desc_inv_on" msgid="2515675590767677178">"ซ่อนฟังก์ชันผกผัน"</string>
     <string name="desc_formula" msgid="8056588859637585007">"ไม่มีสูตร"</string>
     <string name="desc_result" msgid="1794073190203126821">"ไม่พบผลลัพธ์"</string>
-    <string name="desc_num_pad" msgid="515720457459745571">"แป้นตัวเลขและการคำนวนขั้นต้น"</string>
+    <string name="desc_num_pad" msgid="515720457459745571">"แป้นตัวเลขและการคำนวณขั้นต้น"</string>
     <string name="desc_adv_pad" msgid="3794276256462677914">"การใช้งานขั้นสูง"</string>
     <string name="error_nan" msgid="5674077944929888710">"ไม่ใช่ตัวเลข"</string>
     <string name="error_syntax" msgid="4786987111228645602">"นิพจน์ไม่ถูกต้อง"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 1f9c900..862ef11 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -75,7 +75,7 @@
     <string name="approximate" msgid="7117143366610670836">"(±1 sa huling digit)"</string>
     <string name="menu_leading" msgid="2338520833272667740">"Sagutin gamit ang leading digits"</string>
     <string name="menu_fraction" msgid="1247477377840252234">"Sagutin bilang fraction"</string>
-    <string name="menu_licenses" msgid="1890541368064108592">"Mga lisensya ng open source"</string>
+    <string name="menu_licenses" msgid="1890541368064108592">"Mga lisensyang open source"</string>
     <string name="menu_history" msgid="9006222701220105452">"History"</string>
     <string name="menu_clear_history" msgid="2336526604226069572">"I-clear"</string>
     <string name="title_history" msgid="7820912156315181539">"History"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 44fc753..65949ce 100755
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -75,7 +75,7 @@
     <string name="approximate" msgid="7117143366610670836">"(±1 в останній цифрі)"</string>
     <string name="menu_leading" msgid="2338520833272667740">"Показати перші цифри"</string>
     <string name="menu_fraction" msgid="1247477377840252234">"Показати дріб"</string>
-    <string name="menu_licenses" msgid="1890541368064108592">"Ліценз. відкр. коду"</string>
+    <string name="menu_licenses" msgid="1890541368064108592">"Ліцензії відкритого коду"</string>
     <string name="menu_history" msgid="9006222701220105452">"Історія"</string>
     <string name="menu_clear_history" msgid="2336526604226069572">"Очистити"</string>
     <string name="title_history" msgid="7820912156315181539">"Історія"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 599093f..183770c 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -83,5 +83,5 @@
     <string name="dialog_timeout" msgid="9069768442342329065">"Tanaffus"</string>
     <string name="dialog_clear" msgid="7137395395908350702">"Hisob-kitob tarixi va xotiradagi qiymatlar tozalab tashlansinmi?"</string>
     <string name="title_current_expression" msgid="2442754548537900591">"Joriy amal"</string>
-    <string name="no_history" msgid="4331262030447527188">"Hech narsa yo‘q"</string>
+    <string name="no_history" msgid="4331262030447527188">"Hech narsa topilmadi"</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 7eb064d..51d2c71 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -76,12 +76,12 @@
     <string name="menu_leading" msgid="2338520833272667740">"在結果中顯示前導數"</string>
     <string name="menu_fraction" msgid="1247477377840252234">"以分數顯示結果"</string>
     <string name="menu_licenses" msgid="1890541368064108592">"開放原始碼授權"</string>
-    <string name="menu_history" msgid="9006222701220105452">"紀錄"</string>
+    <string name="menu_history" msgid="9006222701220105452">"記錄"</string>
     <string name="menu_clear_history" msgid="2336526604226069572">"清除"</string>
-    <string name="title_history" msgid="7820912156315181539">"紀錄"</string>
+    <string name="title_history" msgid="7820912156315181539">"記錄"</string>
     <string name="desc_navigate_up" msgid="6208699569165589623">"向上瀏覽"</string>
     <string name="dialog_timeout" msgid="9069768442342329065">"逾時"</string>
-    <string name="dialog_clear" msgid="7137395395908350702">"要清除歷史紀錄和儲存內容嗎？"</string>
+    <string name="dialog_clear" msgid="7137395395908350702">"要清除歷史記錄和儲存內容嗎？"</string>
     <string name="title_current_expression" msgid="2442754548537900591">"目前的運算式"</string>
-    <string name="no_history" msgid="4331262030447527188">"沒有任何紀錄"</string>
+    <string name="no_history" msgid="4331262030447527188">"沒有任何記錄"</string>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 5f4a9f6..3cf2e38 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -68,7 +68,7 @@
         <item name="android:textAllCaps">false</item>
         <item name="android:textColor">@color/pad_button_text_color</item>
 
-        <!-- Attributes from android.support.v7.gridlayout -->
+        <!-- Attributes from androidx.appcompat.gridlayout -->
         <item name="layout_gravity">fill</item>
         <item name="layout_rowWeight">1</item>
         <item name="layout_columnWeight">1</item>
diff --git a/src/com/android/calculator2/AlertDialogFragment.java b/src/com/android/calculator2/AlertDialogFragment.java
index fdb7427..3939a73 100644
--- a/src/com/android/calculator2/AlertDialogFragment.java
+++ b/src/com/android/calculator2/AlertDialogFragment.java
@@ -23,8 +23,8 @@ import android.app.DialogFragment;
 import android.app.FragmentManager;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
 import android.view.LayoutInflater;
 import android.widget.TextView;
 
diff --git a/src/com/android/calculator2/Calculator.java b/src/com/android/calculator2/Calculator.java
index b3d79eb..81ab1f6 100644
--- a/src/com/android/calculator2/Calculator.java
+++ b/src/com/android/calculator2/Calculator.java
@@ -44,10 +44,10 @@ import android.graphics.Color;
 import android.graphics.Rect;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.StringRes;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.view.ViewPager;
+import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
+import androidx.core.content.ContextCompat;
+import androidx.viewpager.widget.ViewPager;
 import android.text.Editable;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
@@ -535,9 +535,6 @@ public class Calculator extends Activity
     }
 
     public boolean isResultLayout() {
-        if (mCurrentState == CalculatorState.ANIMATE) {
-            throw new AssertionError("impossible state");
-        }
         // Note that ERROR has INPUT, not RESULT layout.
         return mCurrentState == CalculatorState.INIT_FOR_RESULT
                 || mCurrentState == CalculatorState.RESULT;
@@ -1339,7 +1336,14 @@ public class Calculator extends Activity
      */
     private boolean prepareForHistory() {
         if (mCurrentState == CalculatorState.ANIMATE) {
-            throw new AssertionError("onUserInteraction should have ended animation");
+            // End the current animation and signal that preparation has failed.
+            // onUserInteraction is unreliable and onAnimationEnd() is asynchronous, so we
+            // aren't guaranteed to be out of the ANIMATE state by the time prepareForHistory is
+            // called.
+            if (mCurrentAnimator != null) {
+                mCurrentAnimator.end();
+            }
+            return false;
         } else if (mCurrentState == CalculatorState.EVALUATE) {
             // Cancel current evaluation
             cancelIfEvaluating(true /* quiet */ );
@@ -1366,12 +1370,15 @@ public class Calculator extends Activity
     }
 
     private void showHistoryFragment() {
-        final FragmentManager manager = getFragmentManager();
-        if (manager == null || manager.isDestroyed()) {
+        if (getHistoryFragment() != null) {
+            // If the fragment already exists, do nothing.
             return;
         }
 
-        if (getHistoryFragment() != null || !prepareForHistory()) {
+        final FragmentManager manager = getFragmentManager();
+        if (manager == null || manager.isDestroyed() || !prepareForHistory()) {
+            // If the history fragment can not be shown, close the draglayout.
+            mDragLayout.setClosed();
             return;
         }
 
diff --git a/src/com/android/calculator2/CalculatorPadViewPager.java b/src/com/android/calculator2/CalculatorPadViewPager.java
index 9197342..0f430b0 100644
--- a/src/com/android/calculator2/CalculatorPadViewPager.java
+++ b/src/com/android/calculator2/CalculatorPadViewPager.java
@@ -18,8 +18,8 @@ package com.android.calculator2;
 
 import android.content.Context;
 import android.graphics.Color;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.GestureDetector;
diff --git a/src/com/android/calculator2/CalculatorResult.java b/src/com/android/calculator2/CalculatorResult.java
index d2ba9a8..8fa698b 100644
--- a/src/com/android/calculator2/CalculatorResult.java
+++ b/src/com/android/calculator2/CalculatorResult.java
@@ -23,9 +23,9 @@ import android.content.ClipboardManager;
 import android.content.Context;
 import android.graphics.Rect;
 import android.os.Build;
-import android.support.annotation.IntDef;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.os.BuildCompat;
+import androidx.annotation.IntDef;
+import androidx.core.content.ContextCompat;
+import androidx.core.os.BuildCompat;
 import android.text.Layout;
 import android.text.Spannable;
 import android.text.SpannableString;
diff --git a/src/com/android/calculator2/DragController.java b/src/com/android/calculator2/DragController.java
index 1716cc9..5b9b1c6 100644
--- a/src/com/android/calculator2/DragController.java
+++ b/src/com/android/calculator2/DragController.java
@@ -17,7 +17,7 @@
 package com.android.calculator2;
 
 import android.animation.ArgbEvaluator;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.widget.TextView;
 
diff --git a/src/com/android/calculator2/DragLayout.java b/src/com/android/calculator2/DragLayout.java
index 3264b73..74b0a8e 100644
--- a/src/com/android/calculator2/DragLayout.java
+++ b/src/com/android/calculator2/DragLayout.java
@@ -24,8 +24,8 @@ import android.graphics.PointF;
 import android.graphics.Rect;
 import android.os.Bundle;
 import android.os.Parcelable;
-import android.support.v4.view.ViewCompat;
-import android.support.v4.widget.ViewDragHelper;
+import androidx.core.view.ViewCompat;
+import androidx.customview.widget.ViewDragHelper;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
@@ -209,14 +209,11 @@ public class DragLayout extends ViewGroup {
         return mIsOpen;
     }
 
-    private void setClosed() {
-        if (mIsOpen) {
-            mIsOpen = false;
-            mHistoryFrame.setVisibility(View.INVISIBLE);
-
-            if (mCloseCallback != null) {
-                mCloseCallback.onClose();
-            }
+    public void setClosed() {
+        mIsOpen = false;
+        mHistoryFrame.setVisibility(View.INVISIBLE);
+        if (mCloseCallback != null) {
+            mCloseCallback.onClose();
         }
     }
 
@@ -350,7 +347,9 @@ public class DragLayout extends ViewGroup {
                 settleToOpen = releasedChild.getTop() > -(mVerticalRange / 2);
             }
 
-            if (mDragHelper.settleCapturedViewAt(0, settleToOpen ? 0 : -mVerticalRange)) {
+            // If the view is not visible, then settle it closed, not open.
+            if (mDragHelper.settleCapturedViewAt(0, settleToOpen && mIsOpen ? 0
+                    : -mVerticalRange)) {
                 ViewCompat.postInvalidateOnAnimation(DragLayout.this);
             }
         }
diff --git a/src/com/android/calculator2/Evaluator.java b/src/com/android/calculator2/Evaluator.java
index 655aa70..eee9fa8 100644
--- a/src/com/android/calculator2/Evaluator.java
+++ b/src/com/android/calculator2/Evaluator.java
@@ -22,9 +22,9 @@ import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Handler;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
-import android.support.annotation.StringRes;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
+import androidx.annotation.VisibleForTesting;
 import android.text.Spannable;
 import android.util.Log;
 
diff --git a/src/com/android/calculator2/HistoryAdapter.java b/src/com/android/calculator2/HistoryAdapter.java
index 629abe9..be50050 100644
--- a/src/com/android/calculator2/HistoryAdapter.java
+++ b/src/com/android/calculator2/HistoryAdapter.java
@@ -16,7 +16,7 @@
 
 package com.android.calculator2;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/src/com/android/calculator2/HistoryFragment.java b/src/com/android/calculator2/HistoryFragment.java
index c37241c..eb2a325 100644
--- a/src/com/android/calculator2/HistoryFragment.java
+++ b/src/com/android/calculator2/HistoryFragment.java
@@ -19,8 +19,8 @@ package com.android.calculator2;
 import android.animation.Animator;
 import android.app.Fragment;
 import android.os.Bundle;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.RecyclerView;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
@@ -29,7 +29,7 @@ import android.widget.Toolbar;
 
 import java.util.ArrayList;
 
-import static android.support.v7.widget.RecyclerView.SCROLL_STATE_DRAGGING;
+import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_DRAGGING;
 
 public class HistoryFragment extends Fragment implements DragLayout.DragCallback {