commit 38c5d6ae2be2ff7468c1714d44bc8f9156f18b89
author Chiao Cheng <chiaocheng@google.com> Fri Aug 30 22:50:10 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 30 22:50:10 2013 +0000
tree 04f6a85caed840710e3cce4e9b8d1c703d3c4201
parent 656dd4a0d8571b47ecf0ecf3e4c2eeacfd1099b3
parent 1f9f163262efb7efd5d782b6151f20f8cfc1438e

Merge "Automating calls to onUiUnready() in parent fragment." into klp-dev

InCallUI/src/com/android/incallui/AnswerFragment.java

diff --git a/InCallUI/src/com/android/incallui/AnswerFragment.java b/InCallUI/src/com/android/incallui/AnswerFragment.java
index 40462ce..e105289 100644
--- a/InCallUI/src/com/android/incallui/AnswerFragment.java
+++ b/InCallUI/src/com/android/incallui/AnswerFragment.java
@@ -72,12 +72,6 @@
     }
 
     @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        getPresenter().onUiUnready(this);
-    }
-
-    @Override
     public void showAnswerUi(boolean show) {
         getView().setVisibility(show ? View.VISIBLE : View.GONE);
     }

InCallUI/src/com/android/incallui/BaseFragment.java

diff --git a/InCallUI/src/com/android/incallui/BaseFragment.java b/InCallUI/src/com/android/incallui/BaseFragment.java
index a348ce4..ae207f3 100644
--- a/InCallUI/src/com/android/incallui/BaseFragment.java
+++ b/InCallUI/src/com/android/incallui/BaseFragment.java
@@ -18,12 +18,9 @@
 
 import android.app.Fragment;
 import android.os.Bundle;
-import android.view.View;
-
-import com.android.internal.util.Preconditions;
 
 /**
- *
+ * Parent for all fragments that use Presenters and Ui design.
  */
 public abstract class BaseFragment<T extends Presenter<U>, U extends Ui> extends Fragment {
 
@@ -51,4 +48,10 @@
         super.onActivityCreated(savedInstanceState);
         mPresenter.onUiReady(getUi());
     }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        mPresenter.onUiUnready(getUi());
+    }
 }

InCallUI/src/com/android/incallui/CallButtonFragment.java

diff --git a/InCallUI/src/com/android/incallui/CallButtonFragment.java b/InCallUI/src/com/android/incallui/CallButtonFragment.java
index bd19381..1c3e737 100644
--- a/InCallUI/src/com/android/incallui/CallButtonFragment.java
+++ b/InCallUI/src/com/android/incallui/CallButtonFragment.java
@@ -127,12 +127,6 @@
     }
 
     @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        getPresenter().onUiUnready(this);
-    }
-
-    @Override
     public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
     }
 

InCallUI/src/com/android/incallui/CallCardFragment.java

diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java
index d880b97..6009036 100644
--- a/InCallUI/src/com/android/incallui/CallCardFragment.java
+++ b/InCallUI/src/com/android/incallui/CallCardFragment.java
@@ -111,12 +111,6 @@
     }
 
     @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        getPresenter().onUiUnready(this);
-    }
-
-    @Override
     public void setVisible(boolean on) {
         if (on) {
             getView().setVisibility(View.VISIBLE);