Commit 7054338b authored by Fahim's avatar Fahim
Browse files

merge conflict fix

parents a9897394 d49e5bdf
//
// Copyright (C) 2020 The LineageOS 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.
//
android_app {
name: "ExactCalculator",
resource_dirs: ["res"],
sdk_version: "current",
overrides: ["Calculator"],
srcs: ["src/**/*.java"],
optimize: {
proguard_flags_files: ["proguard.flags"],
},
product_specific: true,
static_libs: [
"cr",
"androidx.legacy_legacy-support-v4",
"androidx.gridlayout_gridlayout",
"androidx.recyclerview_recyclerview",
"androidx.webkit_webkit",
],
}
#
# 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.
#
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_USE_AAPT2 := true
LOCAL_MODULE_TAGS := optional
LOCAL_SDK_VERSION := current
LOCAL_PACKAGE_NAME := ExactCalculator
LOCAL_OVERRIDES_PACKAGES := Calculator
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
LOCAL_STATIC_JAVA_LIBRARIES := cr
LOCAL_STATIC_ANDROID_LIBRARIES += androidx.legacy_legacy-support-v4
LOCAL_STATIC_ANDROID_LIBRARIES += androidx.gridlayout_gridlayout
LOCAL_STATIC_ANDROID_LIBRARIES += androidx.recyclerview_recyclerview
LOCAL_STATIC_ANDROID_LIBRARIES += androidx.webkit_webkit
include $(BUILD_PACKAGE)
......@@ -24,7 +24,7 @@
app:rowCount="5"
app:columnCount="3">
<Button
<com.android.calculator2.HapticButton
android:id="@+id/toggle_inv"
style="@style/PadButtonStyle.Advanced.Text"
android:background="@drawable/pad_button_inverse_background"
......@@ -33,7 +33,7 @@
app:layout_row="0"
app:layout_column="0" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/toggle_mode"
style="@style/PadButtonStyle.Advanced.Text"
android:contentDescription="@string/desc_switch_deg"
......@@ -41,7 +41,7 @@
app:layout_row="0"
app:layout_column="1" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/op_pct"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_op_pct"
......@@ -49,7 +49,7 @@
app:layout_row="0"
app:layout_column="2" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/fun_sin"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_fun_sin"
......@@ -57,7 +57,7 @@
app:layout_row="1"
app:layout_column="0" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/fun_arcsin"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_fun_arcsin"
......@@ -67,7 +67,7 @@
app:layout_row="1"
app:layout_column="0" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/fun_cos"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_fun_cos"
......@@ -75,7 +75,7 @@
app:layout_row="1"
app:layout_column="1" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/fun_arccos"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_fun_arccos"
......@@ -85,7 +85,7 @@
app:layout_row="1"
app:layout_column="1" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/fun_tan"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_fun_tan"
......@@ -93,7 +93,7 @@
app:layout_row="1"
app:layout_column="2" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/fun_arctan"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_fun_arctan"
......@@ -103,7 +103,7 @@
app:layout_row="1"
app:layout_column="2" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/fun_ln"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_fun_ln"
......@@ -111,7 +111,7 @@
app:layout_row="2"
app:layout_column="0" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/fun_exp"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_fun_exp"
......@@ -121,7 +121,7 @@
app:layout_row="2"
app:layout_column="0" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/fun_log"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_fun_log"
......@@ -129,7 +129,7 @@
app:layout_row="2"
app:layout_column="1" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/fun_10pow"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_fun_10pow"
......@@ -139,7 +139,7 @@
app:layout_row="2"
app:layout_column="1" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/op_fact"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_op_fact"
......@@ -147,7 +147,7 @@
app:layout_row="2"
app:layout_column="2" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/const_pi"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_const_pi"
......@@ -155,7 +155,7 @@
app:layout_row="3"
app:layout_column="0" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/const_e"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_const_e"
......@@ -163,7 +163,7 @@
app:layout_row="3"
app:layout_column="1" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/op_pow"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_op_pow"
......@@ -171,7 +171,7 @@
app:layout_row="3"
app:layout_column="2" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/lparen"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_lparen"
......@@ -179,7 +179,7 @@
app:layout_row="4"
app:layout_column="0" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/rparen"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_rparen"
......@@ -187,7 +187,7 @@
app:layout_row="4"
app:layout_column="1" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/op_sqrt"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_op_sqrt"
......@@ -195,7 +195,7 @@
app:layout_row="4"
app:layout_column="2" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/op_sqr"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_op_sqr"
......
......@@ -24,7 +24,7 @@
app:rowCount="4"
app:columnCount="4">
<Button
<com.android.calculator2.HapticButton
android:id="@+id/toggle_inv"
style="@style/PadButtonStyle.Advanced.Text"
android:background="@drawable/pad_button_inverse_background"
......@@ -33,7 +33,7 @@
app:layout_row="0"
app:layout_column="0" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/toggle_mode"
style="@style/PadButtonStyle.Advanced.Text"
android:contentDescription="@string/desc_switch_deg"
......@@ -41,7 +41,7 @@
app:layout_row="0"
app:layout_column="1" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/op_pct"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_op_pct"
......@@ -49,7 +49,7 @@
app:layout_row="0"
app:layout_column="2" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/fun_sin"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_fun_sin"
......@@ -57,7 +57,7 @@
app:layout_row="1"
app:layout_column="0" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/fun_arcsin"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_fun_arcsin"
......@@ -67,7 +67,7 @@
app:layout_row="1"
app:layout_column="0" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/fun_cos"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_fun_cos"
......@@ -75,7 +75,7 @@
app:layout_row="1"
app:layout_column="1" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/fun_arccos"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_fun_arccos"
......@@ -85,7 +85,7 @@
app:layout_row="1"
app:layout_column="1" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/fun_tan"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_fun_tan"
......@@ -93,7 +93,7 @@
app:layout_row="1"
app:layout_column="2" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/fun_arctan"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_fun_arctan"
......@@ -103,7 +103,7 @@
app:layout_row="1"
app:layout_column="2" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/const_pi"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_const_pi"
......@@ -111,7 +111,7 @@
app:layout_row="1"
app:layout_column="3" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/fun_ln"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_fun_ln"
......@@ -119,7 +119,7 @@
app:layout_row="2"
app:layout_column="0" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/fun_exp"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_fun_exp"
......@@ -129,7 +129,7 @@
app:layout_row="2"
app:layout_column="0" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/fun_log"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_fun_log"
......@@ -137,7 +137,7 @@
app:layout_row="2"
app:layout_column="1" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/fun_10pow"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_fun_10pow"
......@@ -147,7 +147,7 @@
app:layout_row="2"
app:layout_column="1" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/op_fact"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_op_fact"
......@@ -155,7 +155,7 @@
app:layout_row="2"
app:layout_column="2" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/const_e"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_const_e"
......@@ -163,7 +163,7 @@
app:layout_row="2"
app:layout_column="3" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/lparen"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_lparen"
......@@ -171,7 +171,7 @@
app:layout_row="3"
app:layout_column="0" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/rparen"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_rparen"
......@@ -179,7 +179,7 @@
app:layout_row="3"
app:layout_column="1" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/op_sqrt"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_op_sqrt"
......@@ -187,7 +187,7 @@
app:layout_row="3"
app:layout_column="2" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/op_sqr"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_op_sqr"
......@@ -197,7 +197,7 @@
app:layout_row="3"
app:layout_column="2" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/op_pow"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_op_pow"
......
......@@ -24,7 +24,7 @@
app:rowCount="3"
app:columnCount="5">
<Button
<com.android.calculator2.HapticButton
android:id="@+id/toggle_inv"
style="@style/PadButtonStyle.Advanced.Text"
android:background="@drawable/pad_button_inverse_background"
......@@ -33,7 +33,7 @@
app:layout_row="0"
app:layout_column="0" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/toggle_mode"
style="@style/PadButtonStyle.Advanced.Text"
android:contentDescription="@string/desc_switch_deg"
......@@ -41,7 +41,7 @@
app:layout_row="0"
app:layout_column="1" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/fun_sin"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_fun_sin"
......@@ -49,7 +49,7 @@
app:layout_row="0"
app:layout_column="2" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/fun_arcsin"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_fun_arcsin"
......@@ -59,7 +59,7 @@
app:layout_row="0"
app:layout_column="2" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/fun_cos"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_fun_cos"
......@@ -67,7 +67,7 @@
app:layout_row="0"
app:layout_column="3" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/fun_arccos"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_fun_arccos"
......@@ -77,7 +77,7 @@
app:layout_row="0"
app:layout_column="3" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/fun_tan"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_fun_tan"
......@@ -85,7 +85,7 @@
app:layout_row="0"
app:layout_column="4" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/fun_arctan"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_fun_arctan"
......@@ -95,7 +95,7 @@
app:layout_row="0"
app:layout_column="4" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/op_pct"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_op_pct"
......@@ -103,7 +103,7 @@
app:layout_row="1"
app:layout_column="0" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/fun_ln"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_fun_ln"
......@@ -111,7 +111,7 @@
app:layout_row="1"
app:layout_column="1" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/fun_exp"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_fun_exp"
......@@ -121,7 +121,7 @@
app:layout_row="1"
app:layout_column="1" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/fun_log"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_fun_log"
......@@ -129,7 +129,7 @@
app:layout_row="1"
app:layout_column="2" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/fun_10pow"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_fun_10pow"
......@@ -139,7 +139,7 @@
app:layout_row="1"
app:layout_column="2" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/op_fact"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_op_fact"
......@@ -147,7 +147,7 @@
app:layout_row="1"
app:layout_column="3" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/op_pow"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_op_pow"
......@@ -155,7 +155,7 @@
app:layout_row="1"
app:layout_column="4" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/const_pi"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_const_pi"
......@@ -163,7 +163,7 @@
app:layout_row="2"
app:layout_column="0" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/const_e"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_const_e"
......@@ -171,7 +171,7 @@
app:layout_row="2"
app:layout_column="1" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/lparen"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_lparen"
......@@ -179,7 +179,7 @@
app:layout_row="2"
app:layout_column="2" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/rparen"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_rparen"
......@@ -187,7 +187,7 @@
app:layout_row="2"
app:layout_column="3" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/op_sqrt"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_op_sqrt"
......@@ -195,7 +195,7 @@
app:layout_row="2"
app:layout_column="4" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/op_sqr"
style="@style/PadButtonStyle.Advanced"
android:contentDescription="@string/desc_op_sqr"
......
......@@ -24,102 +24,88 @@
app:rowCount="4"
app:columnCount="3">
<Button
<com.android.calculator2.HapticButton
android:id="@+id/digit_7"
style="@style/PadButtonStyle.Numeric"
android:text="@string/digit_7"
app:layout_row="0"
app:layout_column="0" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/digit_8"
style="@style/PadButtonStyle.Numeric"
android:text="@string/digit_8"
app:layout_row="0"
app:layout_column="1" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/digit_9"
style="@style/PadButtonStyle.Numeric"
android:text="@string/digit_9"
app:layout_row="0"
app:layout_column="2" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/digit_4"
style="@style/PadButtonStyle.Numeric"
android:text="@string/digit_4"
app:layout_row="1"
app:layout_column="0" />
<Button
<com.android.calculator2.HapticButton
android:id="@+id/digit_5"
style="@style/PadButtonStyle.Numeric"