Merge "Vendor: Omni: Allow custom keys" into android-8.1
diff --git a/config/common.mk b/config/common.mk
index 462d3bb..1a53295 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -25,6 +25,11 @@
ro.build.selinux=1 \
persist.sys.disable_rescue=true
+# enable ADB authentication if not on eng build
+ifneq ($(TARGET_BUILD_VARIANT),eng)
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.adb.secure=1
+endif
+
# Backup Tool
PRODUCT_COPY_FILES += \
vendor/omni/prebuilt/bin/backuptool.sh:system/bin/backuptool.sh \
diff --git a/overlay/common/packages/apps/ExactCalculator/res/mipmap-anydpi/ic_launcher_calculator.xml b/overlay/common/packages/apps/ExactCalculator/res/mipmap-anydpi/ic_launcher_calculator.xml
new file mode 100644
index 0000000..c690539
--- /dev/null
+++ b/overlay/common/packages/apps/ExactCalculator/res/mipmap-anydpi/ic_launcher_calculator.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 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.
+-->
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+ <background android:drawable="@mipmap/ic_background"/>
+ <foreground android:drawable="@mipmap/ic_foreground"/>
+</adaptive-icon>
diff --git a/overlay/common/packages/apps/ExactCalculator/res/mipmap-hdpi/ic_background.png b/overlay/common/packages/apps/ExactCalculator/res/mipmap-hdpi/ic_background.png
new file mode 100644
index 0000000..221938e
--- /dev/null
+++ b/overlay/common/packages/apps/ExactCalculator/res/mipmap-hdpi/ic_background.png
Binary files differ
diff --git a/overlay/common/packages/apps/ExactCalculator/res/mipmap-hdpi/ic_foreground.png b/overlay/common/packages/apps/ExactCalculator/res/mipmap-hdpi/ic_foreground.png
new file mode 100644
index 0000000..2cc92f4
--- /dev/null
+++ b/overlay/common/packages/apps/ExactCalculator/res/mipmap-hdpi/ic_foreground.png
Binary files differ
diff --git a/overlay/common/packages/apps/ExactCalculator/res/mipmap-mdpi/ic_background.png b/overlay/common/packages/apps/ExactCalculator/res/mipmap-mdpi/ic_background.png
new file mode 100644
index 0000000..38581a3
--- /dev/null
+++ b/overlay/common/packages/apps/ExactCalculator/res/mipmap-mdpi/ic_background.png
Binary files differ
diff --git a/overlay/common/packages/apps/ExactCalculator/res/mipmap-mdpi/ic_foreground.png b/overlay/common/packages/apps/ExactCalculator/res/mipmap-mdpi/ic_foreground.png
new file mode 100644
index 0000000..efd125a
--- /dev/null
+++ b/overlay/common/packages/apps/ExactCalculator/res/mipmap-mdpi/ic_foreground.png
Binary files differ
diff --git a/overlay/common/packages/apps/ExactCalculator/res/mipmap-xhdpi/ic_background.png b/overlay/common/packages/apps/ExactCalculator/res/mipmap-xhdpi/ic_background.png
new file mode 100644
index 0000000..90cddc5
--- /dev/null
+++ b/overlay/common/packages/apps/ExactCalculator/res/mipmap-xhdpi/ic_background.png
Binary files differ
diff --git a/overlay/common/packages/apps/ExactCalculator/res/mipmap-xhdpi/ic_foreground.png b/overlay/common/packages/apps/ExactCalculator/res/mipmap-xhdpi/ic_foreground.png
new file mode 100644
index 0000000..88e9f04
--- /dev/null
+++ b/overlay/common/packages/apps/ExactCalculator/res/mipmap-xhdpi/ic_foreground.png
Binary files differ
diff --git a/overlay/common/packages/apps/ExactCalculator/res/mipmap-xxhdpi/ic_background.png b/overlay/common/packages/apps/ExactCalculator/res/mipmap-xxhdpi/ic_background.png
new file mode 100644
index 0000000..41e58e1
--- /dev/null
+++ b/overlay/common/packages/apps/ExactCalculator/res/mipmap-xxhdpi/ic_background.png
Binary files differ
diff --git a/overlay/common/packages/apps/ExactCalculator/res/mipmap-xxhdpi/ic_foreground.png b/overlay/common/packages/apps/ExactCalculator/res/mipmap-xxhdpi/ic_foreground.png
new file mode 100644
index 0000000..efd52b2
--- /dev/null
+++ b/overlay/common/packages/apps/ExactCalculator/res/mipmap-xxhdpi/ic_foreground.png
Binary files differ
diff --git a/overlay/common/packages/apps/ExactCalculator/res/mipmap-xxxhdpi/ic_background.png b/overlay/common/packages/apps/ExactCalculator/res/mipmap-xxxhdpi/ic_background.png
new file mode 100644
index 0000000..7e19824
--- /dev/null
+++ b/overlay/common/packages/apps/ExactCalculator/res/mipmap-xxxhdpi/ic_background.png
Binary files differ
diff --git a/overlay/common/packages/apps/ExactCalculator/res/mipmap-xxxhdpi/ic_foreground.png b/overlay/common/packages/apps/ExactCalculator/res/mipmap-xxxhdpi/ic_foreground.png
new file mode 100644
index 0000000..055f69b
--- /dev/null
+++ b/overlay/common/packages/apps/ExactCalculator/res/mipmap-xxxhdpi/ic_foreground.png
Binary files differ
