commit 20f22d992de849374c5400346fed4e1d42060714
author Shibin George <shibing@codeaurora.org> Mon Sep 03 20:10:09 2018 +0530
committer Shibin George <shibing@codeaurora.org> Tue Sep 04 20:43:03 2018 +0530
tree 6a2246304db9f11eed65d51a3db3224c346f66c6
parent 1194b218d6f0942215df5fec711d62e39aeaea69

Launcher3Go should override Launcher3QuickStep

Now that Launcher3QuickStep is the default launcher,
Launcher3Go should override Launcher3QuickStep as well
else Go targets will have both Launcher3Go and
Launcher3QuickStep apks installed in system image.

Also, Launcher3QuickStepGo should override Launcher3QuickStep.

BUG: 113564404

Test: With this, on Go targets where Launcher3Go is
      included in PRODUCT_PACKAGES, only one apk i.e. Launcher3Go
      will be present in /system/priv-app.

Change-Id: I84d2e3c23c5acdced70d028e9518e04834577049

Android.mk

diff --git a/Android.mk b/Android.mk
index a63ab05..bc51ccd 100644
--- a/Android.mk
+++ b/Android.mk
@@ -119,7 +119,7 @@
 LOCAL_MIN_SDK_VERSION := 21
 LOCAL_PACKAGE_NAME := Launcher3Go
 LOCAL_PRIVILEGED_MODULE := true
-LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3
+LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3 Launcher3QuickStep
 
 LOCAL_FULL_LIBS_MANIFEST_FILES := \
     $(LOCAL_PATH)/AndroidManifest.xml \
@@ -225,7 +225,7 @@
 LOCAL_MIN_SDK_VERSION := 26
 LOCAL_PACKAGE_NAME := Launcher3QuickStepGo
 LOCAL_PRIVILEGED_MODULE := true
-LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3
+LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3 Launcher3QuickStep
 
 LOCAL_FULL_LIBS_MANIFEST_FILES := \
     $(LOCAL_PATH)/go/AndroidManifest.xml \