commit 9bcc69131db19842c2712304fb5699418dae415a
author Joe Onorato <joeo@google.com> Mon Jan 10 12:55:57 2011 -0800
committer Joe Onorato <joeo@google.com> Mon Jan 10 13:35:44 2011 -0800
tree 82bc236c42b9985306a24b474b8ef5819fb5dc47
parent 7edb5131810cf193d9f55517ed839c3b6c41159e

Partially revert "Conditionally remove Dock settings shortcut and Power control widget."

This reverts commit 580c80f853747741ae74fbb6f670315077586208.

So it turns out we won't have the ability to control the enabled flag from
Configuration changes because the dependency is actually in the package manager.
I'm reverting this change and going to do another one that just turns them
off for all configurations, because honeycomb is just for tablets.

Change-Id: I16b7b1e2d59a3a917448ce0361e3ce0fdd062a86

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2618182..ce70f87 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -452,8 +452,8 @@
         <activity android:name="Settings$DockSettingsActivity"
                 android:theme="@android:style/Theme.Holo"
                 android:label="@string/dock_settings_title"
-                android:clearTaskOnLaunch="true"
-                android:enabled="@bool/has_dock_settings">
+                android:enabled="@bool/has_dock_settings"
+                android:clearTaskOnLaunch="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="com.android.settings.DOCK_SETTINGS" />
@@ -984,8 +984,7 @@
         <activity android:name="AppWidgetPickActivity"
                 android:label="@string/widget_picker_title"
                 android:theme="@*android:style/Theme.Dialog.Alert"
-                android:finishOnCloseSystemDialogs="true"
-                android:enabled="@bool/has_powercontrol_widget">
+                android:finishOnCloseSystemDialogs="true">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_PICK" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -1062,8 +1061,9 @@
             android:theme="@android:style/Theme.Holo.DialogWhenLarge"/>
 
         <receiver android:name=".widget.SettingsAppWidgetProvider"
-                android:label="@string/gadget_title" android:exported="false"
-                android:enabled="@bool/has_powercontrol_widget">
+                android:label="@string/gadget_title"
+                android:exported="false"
+                android:enabled="false">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
                 <action android:name="android.net.wifi.WIFI_STATE_CHANGED" />