commit cb30f6efccacd0d344bc78a538e55f754d4094d6
author android-build-team Robot <android-build-team-robot@google.com> Sun Oct 08 07:22:28 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sun Oct 08 07:22:28 2017 +0000
tree 145c536ea725899b93872655b38d71c9bd483e39
parent c054fb1eb3f8cc9871ca05a94643b64ee706fded
parent f00ecc9c29f9beb35b996678ad854c1ebffeb356

Snap for 4383937 from f00ecc9c29f9beb35b996678ad854c1ebffeb356 to oc-mr1-release

Change-Id: I7b6dc854f5c3758a86ba04b59f8f9acd1be05e7b

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7110229..716e611 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -68,6 +68,7 @@
         <activity-alias
             android:name=".LauncherActivity"
             android:targetActivity=".files.LauncherActivity"
+            android:enabled="@bool/is_launcher_enabled"
             android:label="@string/launcher_label"
             android:icon="@drawable/launcher_icon" >
             <intent-filter>

res/values/config.xml

diff --git a/res/values/config.xml b/res/values/config.xml
index 61e5aed..978cc5f 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -54,4 +54,7 @@
     <!-- Indicates if internal storage is shown as default or not. -->
     <bool name="config_default_show_device_root">false</bool>
 
+    <!-- This option allows us to hide the Files app icon from launcher on Android Go device.
+    Android Go device will have Files Go app for file management. -->
+    <bool name="is_launcher_enabled">true</bool>
 </resources>