From 0fef1f14b39daea9c5dadd852ee98c93d7807d3e Mon Sep 17 00:00:00 2001
From: Makoto Onuki <omakoto@google.com>
Date: Tue, 16 Feb 2010 14:04:25 -0800
Subject: [PATCH] Remove hardcoded package name.

Removed the hardcoded package name in account_preferences.xml.  Now we launch
the PreferenceScreen with only the action.  Added an intent-filter to the
preference screen to catch it.

Bug 2447903
---
 AndroidManifest.xml             | 4 ++++
 res/xml/account_preferences.xml | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1828a03d1..24e12c826 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -123,6 +123,10 @@
             android:name=".activity.setup.AccountSettings"
             android:label="@string/account_settings_action"
             >
+            <intent-filter>
+                <action android:name="com.android.email.activity.setup.ACCOUNT_MANAGER_ENTRY" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
         </activity>
         <activity
             android:name=".activity.setup.AccountSecurity"
diff --git a/res/xml/account_preferences.xml b/res/xml/account_preferences.xml
index 67d8ff6ad..9be25fdec 100644
--- a/res/xml/account_preferences.xml
+++ b/res/xml/account_preferences.xml
@@ -27,8 +27,7 @@
         android:summary="@string/account_settings_exchange_summary">
         <intent
             android:action="com.android.email.activity.setup.ACCOUNT_MANAGER_ENTRY"
-            android:targetPackage="com.android.email"
-            android:targetClass="com.android.email.activity.setup.AccountSettings" />
+            />
     </PreferenceScreen>
 
 </PreferenceScreen>