diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000000000000000000000000000000000000..4df206cbf32d98aeda4ea578bf9a00ce0cdd9360 --- /dev/null +++ b/Android.bp @@ -0,0 +1,42 @@ +// +// 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"], + + platform_apis: true, + + overrides: ["Calculator"], + + srcs: ["src/**/*.java"], + + optimize: { + proguard_flags_files: ["proguard.flags"], + }, + + product_specific: true, + + static_libs: [ + "org.lineageos.platform.sdk", + "cr", + "androidx.legacy_legacy-support-v4", + "androidx.gridlayout_gridlayout", + "androidx.recyclerview_recyclerview", + "androidx.webkit_webkit", + ], +} diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 607068252210347e36db7f7e5cb404762cf140cd..0000000000000000000000000000000000000000 --- a/Android.mk +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (C) 2008 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -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) diff --git a/res/layout/pad_advanced_3x5.xml b/res/layout/pad_advanced_3x5.xml index cf38fe6438b32cf7169fc4b01434e2f14dc15de7..dfd283d5938e77835b0015dbcc75e1c8721f3bd2 100644 --- a/res/layout/pad_advanced_3x5.xml +++ b/res/layout/pad_advanced_3x5.xml @@ -24,7 +24,7 @@ app:rowCount="5" app:columnCount="3"> -