summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Steve McKay <smckay@google.com> 2016-01-27 19:24:25 +0000
committer Steve McKay <smckay@google.com> 2016-01-27 19:24:25 +0000
commit8fa9ffcdc0dcdc4c7b67b2df60fa3f46ff3066d4 (patch)
treea615ce7c40fa29e7b4e92edd8673fb5fdfbfd9db
parentd0a0fc2cd1fbb629f329cf10e0413a674a8e54b6 (diff)
Revert "Eliminate the "productivity_device" setting."
This reverts commit d0a0fc2cd1fbb629f329cf10e0413a674a8e54b6. Missed a use. Prema-revert. Change-Id: I6bce595646e2e2bf1e506388a2da9e1cd8f61a09
-rw-r--r--packages/DocumentsUI/AndroidManifest.xml3
-rw-r--r--packages/DocumentsUI/res/values/config.xml1
2 files changed, 3 insertions, 1 deletions
diff --git a/packages/DocumentsUI/AndroidManifest.xml b/packages/DocumentsUI/AndroidManifest.xml
index 9e66f660ac5f..6beef4415f99 100644
--- a/packages/DocumentsUI/AndroidManifest.xml
+++ b/packages/DocumentsUI/AndroidManifest.xml
@@ -54,7 +54,8 @@
android:name=".LauncherActivity"
android:theme="@android:style/Theme.NoDisplay"
android:icon="@drawable/ic_files_app"
- android:label="@string/files_label">
+ android:label="@string/files_label"
+ android:enabled="@bool/productivity_device">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
diff --git a/packages/DocumentsUI/res/values/config.xml b/packages/DocumentsUI/res/values/config.xml
index e8d8c8ebfda1..ff28e158238a 100644
--- a/packages/DocumentsUI/res/values/config.xml
+++ b/packages/DocumentsUI/res/values/config.xml
@@ -18,6 +18,7 @@
<!-- Allow Advanced Devices default value to be customised -->
<bool name="config_defaultAdvancedDevices">false</bool>
+ <bool name="productivity_device">true</bool>
<!-- Intentionally unset. Vendors should set this in an overlay. -->
<string name="trusted_quick_viewer_package"></string>
</resources>