commit 580c80f853747741ae74fbb6f670315077586208
author Amith Yamasani <yamasani@google.com> Fri Jan 07 12:52:21 2011 -0800
committer Amith Yamasani <yamasani@google.com> Sun Jan 09 12:03:45 2011 -0800
tree 5143ae95a6084d40985d37b4cb13801caeeae7cd
parent ce9f77bb558434b9daa40304d3eb8a7201865ac8

Conditionally remove Dock settings shortcut and Power control widget.

Bug: 3258028
Bug: 3248740

Change-Id: Id37787cc9562cde13048e8dfba957599219d94b5

AndroidManifest.xml

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