am e18e8f45: Merge "Show correct error when adding widget with no email accts on device."

* commit 'e18e8f45dabc1bbb36f6f4d7541d5cfad4fb691c':
  Show correct error when adding widget with no email accts on device.
This commit is contained in:
Mindy Pereira 2011-11-29 09:38:22 -08:00 committed by Android Git Automerger
commit ba34319cd4
2 changed files with 1 additions and 7 deletions

View File

@ -463,7 +463,7 @@
<!-- Email AppWidget definitions -->
<activity
android:name=".widget.WidgetConfiguration"
android:enabled="false"
android:enabled="true"
android:theme="@android:style/Theme.Holo.Light.DialogWhenLarge"
>
<intent-filter

View File

@ -166,12 +166,6 @@ public class Email extends Application {
MailService.actionReschedule(context);
}
pm.setComponentEnabledSetting(
new ComponentName(context, WidgetConfiguration.class),
enabled ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED :
PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
PackageManager.DONT_KILL_APP);
// Start/stop the various services depending on whether there are any accounts
startOrStopService(enabled, context, new Intent(context, AttachmentDownloadService.class));
NotificationController.getInstance(context).watchForMessages(enabled);