summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2017-10-08 07:22:28 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2017-10-08 07:22:28 +0000
commitcb30f6efccacd0d344bc78a538e55f754d4094d6 (patch)
tree145c536ea725899b93872655b38d71c9bd483e39
parentc054fb1eb3f8cc9871ca05a94643b64ee706fded (diff)
parentf00ecc9c29f9beb35b996678ad854c1ebffeb356 (diff)
downloadDocumentsUI-cb30f6efccacd0d344bc78a538e55f754d4094d6.tar.gz
Snap for 4383937 from f00ecc9c29f9beb35b996678ad854c1ebffeb356 to oc-mr1-releaseandroid-wear-8.1.0_r1android-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r4android-vts-8.1_r3android-vts-8.1_r14android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10android-security-8.1.0_r93android-security-8.1.0_r92android-security-8.1.0_r91android-security-8.1.0_r90android-security-8.1.0_r89android-security-8.1.0_r88android-security-8.1.0_r87android-security-8.1.0_r86android-security-8.1.0_r85android-security-8.1.0_r84android-security-8.1.0_r83android-security-8.1.0_r82android-cts-8.1_r9android-cts-8.1_r8android-cts-8.1_r7android-cts-8.1_r6android-cts-8.1_r5android-cts-8.1_r4android-cts-8.1_r3android-cts-8.1_r25android-cts-8.1_r24android-cts-8.1_r23android-cts-8.1_r22android-cts-8.1_r21android-cts-8.1_r20android-cts-8.1_r2android-cts-8.1_r19android-cts-8.1_r18android-cts-8.1_r17android-cts-8.1_r16android-cts-8.1_r15android-cts-8.1_r14android-cts-8.1_r13android-cts-8.1_r12android-cts-8.1_r11android-cts-8.1_r10android-cts-8.1_r1android-8.1.0_r81android-8.1.0_r80android-8.1.0_r79android-8.1.0_r78android-8.1.0_r77android-8.1.0_r76android-8.1.0_r75android-8.1.0_r74android-8.1.0_r73android-8.1.0_r72android-8.1.0_r71android-8.1.0_r70android-8.1.0_r69android-8.1.0_r68android-8.1.0_r66android-8.1.0_r6android-8.1.0_r5android-8.1.0_r4android-8.1.0_r3android-8.1.0_r23android-8.1.0_r19android-8.1.0_r16android-8.1.0_r15android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1security-oc-mr1-releaseoreo-mr1-wear-releaseoreo-mr1-vts-releaseoreo-mr1-security-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-cuttlefish-testingoreo-mr1-cts-releaseoreo-m4-s1-release
Change-Id: I7b6dc854f5c3758a86ba04b59f8f9acd1be05e7b
-rw-r--r--AndroidManifest.xml1
-rw-r--r--res/values/config.xml3
2 files changed, 4 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7110229a0..716e611a7 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>
diff --git a/res/values/config.xml b/res/values/config.xml
index 61e5aeddb..978cc5fcc 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>