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

This reverts commit 580c80f853.

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
This commit is contained in:
Joe Onorato
2011-01-10 12:55:57 -08:00
parent 7edb513181
commit 9bcc69131d
3 changed files with 6 additions and 28 deletions

View File

@@ -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" />

View File

@@ -1,20 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2010 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<resources>
<!-- Whether or not the Power Control widget is enabled -->
<bool name="has_powercontrol_widget">false</bool>
</resources>

View File

@@ -20,6 +20,4 @@
<bool name="has_intrusive_led">false</bool>
<!-- Whether or not the dock settings are to be displayed for this device when docked -->
<bool name="has_dock_settings">false</bool>
<!-- Whether or not the Power Control widget is enabled -->
<bool name="has_powercontrol_widget">true</bool>
</resources>