From 30003e582f03f98d656fe4f0b5feb40f9b2361ba Mon Sep 17 00:00:00 2001
From: Mindy Pereira <mindyp@google.com>
Date: Mon, 28 Nov 2011 16:28:13 -0800
Subject: [PATCH] Show correct error when adding widget with no email accts on
 device.

If the WidgetConfiguration service is disabled until the user adds an account,
adding the widget just fails badly as there is no service registered
to handed an APPWIDGET_CONFIGURE intent.
Fixes b/5613821 App isn't installed toast message when creating widget for Email without any account

Change-Id: I98003eadf71fb944d3c0902f7e132ca7c5b67571
---
 AndroidManifest.xml              | 2 +-
 src/com/android/email/Email.java | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ff7118ef7..36755a698 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -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
diff --git a/src/com/android/email/Email.java b/src/com/android/email/Email.java
index 1ef55cf2a..c1b1f454d 100644
--- a/src/com/android/email/Email.java
+++ b/src/com/android/email/Email.java
@@ -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);