From 0386c50e4946277a55502a9428e1469acc8b37a8 Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Tue, 20 Nov 2012 01:12:48 +0100
Subject: [PATCH] Strip package name from activity/receiver/service
 descriptions

---
 AndroidManifest.xml | 76 ++++++++++++++++++++++-----------------------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 67654233c..806146eaa 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -65,7 +65,7 @@
                    android:value=".activity.Search" />
 
         <activity
-            android:name="com.fsck.k9.activity.Accounts"
+            android:name=".activity.Accounts"
             android:configChanges="locale"
             android:launchMode="singleTop"
             android:uiOptions="splitActionBarWhenNarrow"
@@ -84,7 +84,7 @@
         </activity>
 
         <activity
-            android:name="com.fsck.k9.activity.setup.Prefs"
+            android:name=".activity.setup.Prefs"
             android:label="@string/prefs_title"
             android:configChanges="locale"
             android:taskAffinity="com.fsck.k9.activity.setup.Prefs"
@@ -92,61 +92,61 @@
             >
         </activity>
         <activity
-            android:name="com.fsck.k9.activity.setup.WelcomeMessage"
+            android:name=".activity.setup.WelcomeMessage"
             android:label="@string/welcome_message_title"
             android:configChanges="locale"
             >
         </activity>
         <activity
-            android:name="com.fsck.k9.activity.setup.FontSizeSettings"
+            android:name=".activity.setup.FontSizeSettings"
             android:label="@string/font_size_settings_title"
             android:configChanges="locale"
             >
         </activity>
         <activity
-            android:name="com.fsck.k9.activity.setup.AccountSetupBasics"
+            android:name=".activity.setup.AccountSetupBasics"
             android:label="@string/account_setup_basics_title"
             android:configChanges="locale"
             >
         </activity>
         <activity
-            android:name="com.fsck.k9.activity.setup.AccountSetupAccountType"
+            android:name=".activity.setup.AccountSetupAccountType"
             android:label="@string/account_setup_account_type_title"
             android:configChanges="locale"
             >
         </activity>
         <activity
-            android:name="com.fsck.k9.activity.setup.AccountSetupIncoming"
+            android:name=".activity.setup.AccountSetupIncoming"
             android:label="@string/account_setup_incoming_title"
             android:configChanges="locale"
             >
         </activity>
         <activity
-            android:name="com.fsck.k9.activity.setup.AccountSetupComposition"
+            android:name=".activity.setup.AccountSetupComposition"
             android:label="@string/account_settings_composition_title"
             android:configChanges="locale"
         >
         </activity>
         <activity
-            android:name="com.fsck.k9.activity.setup.AccountSetupOutgoing"
+            android:name=".activity.setup.AccountSetupOutgoing"
             android:label="@string/account_setup_outgoing_title"
             android:configChanges="locale"
             >
         </activity>
         <activity
-            android:name="com.fsck.k9.activity.setup.AccountSetupOptions"
+            android:name=".activity.setup.AccountSetupOptions"
             android:label="@string/account_setup_options_title"
             android:configChanges="locale"
             >
         </activity>
         <activity
-            android:name="com.fsck.k9.activity.setup.AccountSetupNames"
+            android:name=".activity.setup.AccountSetupNames"
             android:label="@string/account_setup_names_title"
             android:configChanges="locale"
             >
         </activity>
         <activity
-            android:name="com.fsck.k9.activity.ChooseFolder"
+            android:name=".activity.ChooseFolder"
             android:theme="@style/Theme.K9Dialog"
             android:label="@string/choose_folder_title"
             android:configChanges="locale"
@@ -154,20 +154,20 @@
             >
         </activity>
         <activity
-            android:name="com.fsck.k9.activity.ChooseIdentity"
+            android:name=".activity.ChooseIdentity"
             android:theme="@style/Theme.K9Dialog"
             android:label="@string/choose_identity_title"
             android:configChanges="locale"
             >
         </activity>
         <activity
-            android:name="com.fsck.k9.activity.ManageIdentities"
+            android:name=".activity.ManageIdentities"
             android:label="@string/manage_identities_title"
             android:configChanges="locale"
             >
         </activity>
         <activity
-            android:name="com.fsck.k9.activity.EditIdentity"
+            android:name=".activity.EditIdentity"
             android:label="@string/edit_identity_title"
             android:configChanges="locale"
             >
@@ -175,27 +175,27 @@
         <!-- XXX Note: this activity is hacked to ignore config changes,
              since it doesn't currently handle them correctly in code. -->
         <activity
-            android:name="com.fsck.k9.activity.setup.AccountSetupCheckSettings"
+            android:name=".activity.setup.AccountSetupCheckSettings"
             android:label="@string/account_setup_check_settings_title"
             android:configChanges="keyboardHidden|orientation|locale"
             >
         </activity>
         <activity
-            android:name="com.fsck.k9.activity.setup.AccountSettings"
+            android:name=".activity.setup.AccountSettings"
             android:label="@string/account_settings_title_fmt"
             android:configChanges="locale"
             >
         </activity>
 
         <activity
-            android:name="com.fsck.k9.activity.setup.FolderSettings"
+            android:name=".activity.setup.FolderSettings"
             android:theme="@android:style/Theme.Dialog"
             android:label="@string/folder_settings_title"
             android:configChanges="locale"
             >
         </activity>
         <activity
-            android:name="com.fsck.k9.activity.FolderList"
+            android:name=".activity.FolderList"
             android:configChanges="locale"
             android:uiOptions="splitActionBarWhenNarrow"
             >
@@ -205,7 +205,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name="com.fsck.k9.activity.MessageList"
+            android:name=".activity.MessageList"
             android:configChanges="locale"
             android:uiOptions="splitActionBarWhenNarrow"
             >
@@ -215,7 +215,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name="com.fsck.k9.activity.MessageView"
+            android:name=".activity.MessageView"
             android:configChanges="locale"
             android:uiOptions="splitActionBarWhenNarrow"
             >
@@ -229,7 +229,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name="com.fsck.k9.activity.MessageCompose"
+            android:name=".activity.MessageCompose"
             android:label="@string/app_name"
             android:enabled="false"
             android:configChanges="locale"
@@ -257,7 +257,7 @@
             </intent-filter>
         </activity>
         <!-- Search Activity - searchable -->
-        <activity android:name="com.fsck.k9.activity.Search"
+        <activity android:name=".activity.Search"
                   android:label="@string/search_action"
                   android:configChanges="locale"
                   android:uiOptions="splitActionBarWhenNarrow"
@@ -270,7 +270,7 @@
                        android:resource="@xml/searchable" />
         </activity>
         <activity
-            android:name="com.fsck.k9.activity.LauncherShortcuts"
+            android:name=".activity.LauncherShortcuts"
             android:label="@string/shortcuts_title"
             android:configChanges="locale"
             >
@@ -280,14 +280,14 @@
             </intent-filter>
         </activity>
         <activity
-            android:name="com.fsck.k9.activity.AccessibleEmailContentActivity"
+            android:name=".activity.AccessibleEmailContentActivity"
             >
         </activity>
-        <activity android:name="com.fsck.k9.activity.EmailAddressList"
+        <activity android:name=".activity.EmailAddressList"
             android:configChanges="locale"
             >
         </activity>
-        <receiver android:name="com.fsck.k9.service.BootReceiver"
+        <receiver android:name=".service.BootReceiver"
               android:enabled="true"
               >
             <intent-filter>
@@ -312,7 +312,7 @@
                 <action android:name="com.fsck.k9.service.BroadcastReceiver.scheduleIntent"/>
             </intent-filter>
         </receiver>
-        <receiver android:name="com.fsck.k9.service.RemoteControlReceiver"
+        <receiver android:name=".service.RemoteControlReceiver"
                android:enabled="true"
                android:permission="com.fsck.k9.permission.REMOTE_CONTROL"
                >
@@ -325,14 +325,14 @@
 
              </intent-filter>
          </receiver>
-        <receiver android:name="com.fsck.k9.service.CoreReceiver"
+        <receiver android:name=".service.CoreReceiver"
               android:enabled="true"
               >
               <intent-filter>
                 <action android:name="com.fsck.k9.service.CoreReceiver.wakeLockRelease"/>
             </intent-filter>
         </receiver>
-        <receiver android:name="com.fsck.k9.service.StorageReceiver"
+        <receiver android:name=".service.StorageReceiver"
               android:enabled="true"
               >
             <intent-filter>
@@ -356,40 +356,40 @@ otherwise it would make K-9 start at the wrong time
             </intent-filter>
         </receiver>
         <service
-            android:name="com.fsck.k9.service.MailService"
+            android:name=".service.MailService"
             android:enabled="true"
             >
         </service>
         <service
-             android:name="com.fsck.k9.service.PushService"
+             android:name=".service.PushService"
              android:enabled="true"
              >
          </service>
          <service
-             android:name="com.fsck.k9.service.PollService"
+             android:name=".service.PollService"
              android:enabled="true"
             >
          </service>
          <service
-              android:name="com.fsck.k9.service.RemoteControlService"
+              android:name=".service.RemoteControlService"
               android:enabled="true"
               android:permission="com.fsck.k9.permission.REMOTE_CONTROL"
              >
           </service>
          <service
-             android:name="com.fsck.k9.service.SleepService"
+             android:name=".service.SleepService"
              android:enabled="true"
              >
          </service>
         <provider
-            android:name="com.fsck.k9.provider.AttachmentProvider"
+            android:name=".provider.AttachmentProvider"
             android:authorities="com.fsck.k9.attachmentprovider"
             android:multiprocess="true"
             android:grantUriPermissions="true"
             android:readPermission="com.fsck.k9.permission.READ_ATTACHMENT"
             />
         <provider
-            android:name="com.fsck.k9.provider.MessageProvider"
+            android:name=".provider.MessageProvider"
             android:authorities="com.fsck.k9.messageprovider"
             android:multiprocess="true"
             android:grantUriPermissions="true"
@@ -397,7 +397,7 @@ otherwise it would make K-9 start at the wrong time
             android:writePermission="com.fsck.k9.permission.DELETE_MESSAGES"
             />
         <provider
-            android:name="com.fsck.k9.provider.EmailProvider"
+            android:name=".provider.EmailProvider"
             android:authorities="org.k9mail.provider.email"
             android:exported="false"
             />