commit 11139b490b90ba09ae07dd5ca98fd942ca855124
author Steve McKay <smckay@google.com> Thu Jun 22 10:21:15 2017 -0700
committer Steve McKay <smckay@google.com> Thu Jun 22 14:14:22 2017 -0700
tree 102179660f72fe9bd62a42a5e444cac36010f1d2
parent 793cef95a9a9425c7464fa207825204fd29f8f54

Use LauncherActivity name from Nougat.

So launcher doesn't disappear on upgrade.

Bug: 62836700
Test: Build install test with different names.
Change-Id: I53e93e6d84f6c289d10b46f5a32b74f56453169c
(cherry picked from commit e2b5ffee1b2863a19ec8f9eb2c48bd81a2dcf7a4)

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ef3871c..9aa9a79 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -58,7 +58,7 @@
 
         <!--  Preserve original launcher activity from Nougat. -->
         <activity-alias
-            android:name=".Launcher"
+            android:name=".LauncherActivity"
             android:targetActivity=".files.LauncherActivity"
             android:label="@string/launcher_label"
             android:icon="@drawable/launcher_icon" >