From ff70bf4e22b9559d859ba8da63cfc8dde1e3fa73 Mon Sep 17 00:00:00 2001 From: Frank Du Date: Sat, 13 Dec 2014 16:05:41 -0800 Subject: [PATCH] Remove K9FragmentActivity Because it's same with K9Activity now, no need to keep it. Test Plan: ./gradlew installDebug, and test the MessageList activity --- .../fsck/k9/activity/K9ActivityCommon.java | 1 - .../fsck/k9/activity/K9FragmentActivity.java | 32 ------------------- src/com/fsck/k9/activity/MessageList.java | 2 +- 3 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 src/com/fsck/k9/activity/K9FragmentActivity.java diff --git a/src/com/fsck/k9/activity/K9ActivityCommon.java b/src/com/fsck/k9/activity/K9ActivityCommon.java index 3699ae1ce..bc04a3189 100644 --- a/src/com/fsck/k9/activity/K9ActivityCommon.java +++ b/src/com/fsck/k9/activity/K9ActivityCommon.java @@ -21,7 +21,6 @@ import com.fsck.k9.activity.misc.SwipeGestureDetector.OnSwipeGestureListener; * * @see K9Activity * @see K9ListActivity - * @see K9FragmentActivity */ public class K9ActivityCommon { /** diff --git a/src/com/fsck/k9/activity/K9FragmentActivity.java b/src/com/fsck/k9/activity/K9FragmentActivity.java deleted file mode 100644 index e6d3f3780..000000000 --- a/src/com/fsck/k9/activity/K9FragmentActivity.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.fsck.k9.activity; - -import android.app.Activity; -import android.os.Bundle; -import android.view.MotionEvent; - -import com.fsck.k9.activity.K9ActivityCommon.K9ActivityMagic; -import com.fsck.k9.activity.misc.SwipeGestureDetector.OnSwipeGestureListener; - - -public class K9FragmentActivity extends Activity implements K9ActivityMagic { - - private K9ActivityCommon mBase; - - - @Override - public void onCreate(Bundle savedInstanceState) { - mBase = K9ActivityCommon.newInstance(this); - super.onCreate(savedInstanceState); - } - - @Override - public boolean dispatchTouchEvent(MotionEvent event) { - mBase.preDispatchTouchEvent(event); - return super.dispatchTouchEvent(event); - } - - @Override - public void setupGestureDetector(OnSwipeGestureListener listener) { - mBase.setupGestureDetector(listener); - } -} diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java index 25306140f..7f079db3e 100644 --- a/src/com/fsck/k9/activity/MessageList.java +++ b/src/com/fsck/k9/activity/MessageList.java @@ -64,7 +64,7 @@ import de.cketti.library.changelog.ChangeLog; * shows a list of messages. * From this Activity the user can perform all standard message operations. */ -public class MessageList extends K9FragmentActivity implements MessageListFragmentListener, +public class MessageList extends K9Activity implements MessageListFragmentListener, MessageViewFragmentListener, OnBackStackChangedListener, OnSwipeGestureListener, OnSwitchCompleteListener {