mirror of https://github.com/moparisthebest/k-9
This is a working semi-deforked application. i.e. most of it is still in the com.android.email namespace, but choice bits are in com.fsck.k9 so that it won't try to overwrite the builtin client.
Changes: corrected the package (or something equally simple for K9.java build.xml has an additional stanza that copies the R.java file from fsck to android namespace, and changes the package inside the file. AndroidManifest.xml has the package set to fsck, and all the activities are now explicity named.
This commit is contained in:
Bradley Young
parent
b5ab3c0dfc
commit
14e6b87ee7
|
|
@ -1,9 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="com.fsck.k9"
|
||||
android:versionCode="22"
|
||||
android:versionName="0.22"
|
||||
>
|
||||
android:versionName="0.22" package="com.fsck.k9">
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
<uses-permission android:name="android.permission.READ_CONTACTS"/>
|
||||
<uses-permission android:name="android.permission.READ_OWNER_DATA"/>
|
||||
|
|
@ -16,9 +14,8 @@
|
|||
android:label="@string/read_attachment_label"
|
||||
android:description="@string/read_attachment_desc"/>
|
||||
<uses-permission android:name="com.android.email.permission.READ_ATTACHMENT"/>
|
||||
<application android:icon="@drawable/icon" android:label="@string/app_name"
|
||||
android:name="k9">
|
||||
<activity android:name=".activity.Welcome">
|
||||
<application android:icon="@drawable/icon" android:label="@string/app_name" android:name="K9">
|
||||
<activity android:name="com.android.email.activity.Welcome">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
<category android:name="android.intent.category.DEFAULT" />
|
||||
|
|
@ -27,70 +24,70 @@
|
|||
</activity>
|
||||
|
||||
<activity
|
||||
android:name=".activity.setup.AccountSetupBasics"
|
||||
android:name="com.android.email.activity.setup.AccountSetupBasics"
|
||||
android:label="@string/account_setup_basics_title"
|
||||
>
|
||||
</activity>
|
||||
<activity
|
||||
android:name=".activity.setup.AccountSetupAccountType"
|
||||
android:name="com.android.email.activity.setup.AccountSetupAccountType"
|
||||
android:label="@string/account_setup_account_type_title"
|
||||
>
|
||||
</activity>
|
||||
<activity
|
||||
android:name=".activity.setup.AccountSetupIncoming"
|
||||
android:name="com.android.email.activity.setup.AccountSetupIncoming"
|
||||
android:label="@string/account_setup_incoming_title"
|
||||
>
|
||||
</activity>
|
||||
<activity
|
||||
android:name=".activity.setup.AccountSetupComposition"
|
||||
android:name="com.android.email.activity.setup.AccountSetupComposition"
|
||||
android:label="@string/account_settings_composition_title"
|
||||
>
|
||||
</activity>
|
||||
<activity
|
||||
android:name=".activity.setup.AccountSetupOutgoing"
|
||||
android:name="com.android.email.activity.setup.AccountSetupOutgoing"
|
||||
android:label="@string/account_setup_outgoing_title"
|
||||
>
|
||||
</activity>
|
||||
<activity
|
||||
android:name=".activity.setup.AccountSetupOptions"
|
||||
android:name="com.android.email.activity.setup.AccountSetupOptions"
|
||||
android:label="@string/account_setup_options_title"
|
||||
>
|
||||
</activity>
|
||||
<activity
|
||||
android:name=".activity.setup.AccountSetupNames"
|
||||
android:name="com.android.email.activity.setup.AccountSetupNames"
|
||||
android:label="@string/account_setup_names_title"
|
||||
>
|
||||
</activity>
|
||||
<!-- XXX Note: this activity is hacked to ignore config changes,
|
||||
since it doesn't currently handle them correctly in code. -->
|
||||
<activity
|
||||
android:name=".activity.setup.AccountSetupCheckSettings"
|
||||
android:name="com.android.email.activity.setup.AccountSetupCheckSettings"
|
||||
android:label="@string/account_setup_check_settings_title"
|
||||
android:configChanges="keyboardHidden|orientation"
|
||||
>
|
||||
</activity>
|
||||
<activity
|
||||
android:name=".activity.setup.AccountSettings"
|
||||
android:name="com.android.email.activity.setup.AccountSettings"
|
||||
android:label="@string/account_settings_title_fmt"
|
||||
>
|
||||
</activity>
|
||||
|
||||
<activity
|
||||
android:name=".activity.Debug"
|
||||
android:name="com.android.email.activity.Debug"
|
||||
android:label="@string/debug_title">
|
||||
</activity>
|
||||
<activity
|
||||
android:name=".activity.Accounts"
|
||||
android:name="com.android.email.activity.Accounts"
|
||||
android:label="@string/accounts_title">
|
||||
</activity>
|
||||
<activity
|
||||
android:name=".activity.FolderMessageList">
|
||||
android:name="com.android.email.activity.FolderMessageList">
|
||||
</activity>
|
||||
<activity
|
||||
android:name=".activity.MessageView">
|
||||
android:name="com.android.email.activity.MessageView">
|
||||
</activity>
|
||||
<activity
|
||||
android:name=".activity.MessageCompose"
|
||||
android:name="com.android.email.activity.MessageCompose"
|
||||
android:label="@string/app_name"
|
||||
android:enabled="false"
|
||||
>
|
||||
|
|
@ -111,7 +108,7 @@
|
|||
<category android:name="android.intent.category.BROWSABLE" />
|
||||
</intent-filter>
|
||||
</activity>
|
||||
<receiver android:name=".service.BootReceiver"
|
||||
<receiver android:name="com.android.email.service.BootReceiver"
|
||||
android:enabled="false"
|
||||
>
|
||||
<intent-filter>
|
||||
|
|
@ -125,12 +122,12 @@
|
|||
</intent-filter>
|
||||
</receiver>
|
||||
<service
|
||||
android:name=".service.MailService"
|
||||
android:name="com.android.email.service.MailService"
|
||||
android:enabled="false"
|
||||
>
|
||||
</service>
|
||||
<provider
|
||||
android:name=".provider.AttachmentProvider"
|
||||
android:name="com.android.email.provider.AttachmentProvider"
|
||||
android:authorities="com.android.email.attachmentprovider"
|
||||
android:multiprocess="true"
|
||||
android:grantUriPermissions="true"
|
||||
|
|
|
|||
13
build.xml
13
build.xml
|
|
@ -7,7 +7,7 @@
|
|||
<property name="android-tools" value="${sdk-folder}/tools" />
|
||||
|
||||
<!-- Application Package Name -->
|
||||
<property name="application-package" value="com.android.email.activity" />
|
||||
<property name="application-package" value="com.fsck.k9" />
|
||||
|
||||
<!-- The intermediates directory -->
|
||||
<!-- Eclipse uses "bin" for its own output, so we do the same. -->
|
||||
|
|
@ -126,9 +126,14 @@
|
|||
<arg value="AndroidManifest.xml" />
|
||||
<arg value="-S" />
|
||||
<arg value="${resource-dir}" />
|
||||
<arg value="-I" />
|
||||
<arg value="${android-jar}" />
|
||||
</exec>
|
||||
<arg value="-I" />
|
||||
<arg value="${android-jar}" />
|
||||
</exec>
|
||||
<copy overwrite="true" file="src/com/fsck/k9/R.java" tofile="src/com/android/email/R.java">
|
||||
<filterset begintoken="package " endtoken=";">
|
||||
<filter token="com.fsck.k9" value="package com.android.email;"/>
|
||||
</filterset>
|
||||
</copy>
|
||||
</target>
|
||||
|
||||
<!-- Generate java classes from .aidl files. -->
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
package com.fsck;
|
||||
package com.fsck.k9;
|
||||
|
||||
import com.android.email.Email;
|
||||
|
||||
public class K9 extends Email {
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue