diff options
| author | 2016-01-27 18:48:01 +0000 | |
|---|---|---|
| committer | 2016-01-27 18:48:01 +0000 | |
| commit | 3ca3a3db5e6539818d8b4c1a633e45c0b78df96c (patch) | |
| tree | 04350f7619633728a2287fa789d910507ee4dc6c | |
| parent | 369a94a4130577718de3fbd7aabece9277233bb1 (diff) | |
| parent | d0a0fc2cd1fbb629f329cf10e0413a674a8e54b6 (diff) | |
Merge "Eliminate the "productivity_device" setting."
| -rw-r--r-- | packages/DocumentsUI/AndroidManifest.xml | 3 | ||||
| -rw-r--r-- | packages/DocumentsUI/res/values/config.xml | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/packages/DocumentsUI/AndroidManifest.xml b/packages/DocumentsUI/AndroidManifest.xml index c3452d585a6e..fa9ff0153c87 100644 --- a/packages/DocumentsUI/AndroidManifest.xml +++ b/packages/DocumentsUI/AndroidManifest.xml @@ -54,8 +54,7 @@ android:name=".LauncherActivity" android:theme="@android:style/Theme.NoDisplay" android:icon="@drawable/ic_files_app" - android:label="@string/files_label" - android:enabled="@bool/productivity_device"> + android:label="@string/files_label"> <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 ff28e158238a..e8d8c8ebfda1 100644 --- a/packages/DocumentsUI/res/values/config.xml +++ b/packages/DocumentsUI/res/values/config.xml @@ -18,7 +18,6 @@ <!-- 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> |