Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e76c4899 authored by cketti's avatar cketti
Browse files

Merge pull request #795 from k9mail/GH-619_android_wear_support 

Add Android Wear support

Closes #619
parents d84ce23e 532aa76f

k9mail/build.gradle

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ dependencies { 
    testCompile('junit:junit:4.10') {

        exclude group: 'org.hamcrest', module: 'hamcrest-core'

    }

    testCompile 'org.mockito:mockito-all:1.10.19'

}



android {

k9mail/src/main/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ 
            android:enabled="true"/>



        <service

            android:name=".service.NotificationActionService"

            android:name=".notification.NotificationActionService"

            android:enabled="true"/>



        <service

k9mail/src/main/java/com/fsck/k9/K9.java

+0 −25
Original line number Diff line number Diff line
@@ -312,31 +312,6 @@ public class K9 extends Application { 


    public static final int BOOT_RECEIVER_WAKE_LOCK_TIMEOUT = 60000;



    /**

     * Time the LED is on/off when blinking on new email notification

     */

    public static final int NOTIFICATION_LED_ON_TIME = 500;

    public static final int NOTIFICATION_LED_OFF_TIME = 2000;



    public static final boolean NOTIFICATION_LED_WHILE_SYNCING = false;

    public static final int NOTIFICATION_LED_FAST_ON_TIME = 100;

    public static final int NOTIFICATION_LED_FAST_OFF_TIME = 100;





    public static final int NOTIFICATION_LED_BLINK_SLOW = 0;

    public static final int NOTIFICATION_LED_BLINK_FAST = 1;







    public static final int NOTIFICATION_LED_FAILURE_COLOR = 0xffff0000;



    // Must not conflict with an account number

    public static final int FETCHING_EMAIL_NOTIFICATION      = -5000;

    public static final int SEND_FAILED_NOTIFICATION      = -1500;

    public static final int CERTIFICATE_EXCEPTION_NOTIFICATION_INCOMING = -2000;

    public static final int CERTIFICATE_EXCEPTION_NOTIFICATION_OUTGOING = -2500;

    public static final int CONNECTIVITY_ID = -3;





    public static class Intents {

k9mail/src/main/java/com/fsck/k9/activity/FolderList.java

+1 −1
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ public class FolderList extends K9ListActivity { 


        onRefresh(!REFRESH_REMOTE);



        MessagingController.getInstance(getApplication()).notifyAccountCancel(this, mAccount);

        MessagingController.getInstance(getApplication()).cancelNotificationsForAccount(mAccount);

        mAdapter.mListener.onResume(this);

    }

k9mail/src/main/java/com/fsck/k9/activity/MessageCompose.java

+9 −0
Original line number Diff line number Diff line
@@ -434,6 +434,15 @@ public class MessageCompose extends K9Activity implements OnClickListener, 
        return i;

    }



    public static Intent getActionReplyIntent(Context context, MessageReference messageReference) {

        Intent intent = new Intent(context, MessageCompose.class);

        intent.setAction(ACTION_REPLY);

        intent.putExtra(EXTRA_MESSAGE_REFERENCE, messageReference);

        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);



        return intent;

    }



    /**

     * Compose a new message as a reply to the given message. If replyAll is true the function

     * is reply all instead of simply reply.