commit cb687e7d20c2633d65f22a961e7080ea5692e554
author Andrew Lee <anwlee@google.com> Fri Apr 17 21:50:27 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 17 21:50:28 2015 +0000
tree 2be7f81afe596dd206fc88ba523795e4d9b329db
parent 5dd8fd1d2c3055c6b14e9d21e9999fe91e39beca
parent 9bcd0f1e66d4a8aa9e2e6b2b6d2c3efd6ffddb75

Merge "Make createPresenter() and getUi() public."

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 d163637..07cbfd5 100644
--- a/InCallUI/src/com/android/incallui/AnswerFragment.java
+++ b/InCallUI/src/com/android/incallui/AnswerFragment.java
@@ -83,7 +83,7 @@
     }
 
     @Override
-    AnswerPresenter.AnswerUi getUi() {
+    public AnswerPresenter.AnswerUi getUi() {
         return this;
     }
 

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 037c245..58d991a 100644
--- a/InCallUI/src/com/android/incallui/BaseFragment.java
+++ b/InCallUI/src/com/android/incallui/BaseFragment.java
@@ -29,9 +29,9 @@
 
     private T mPresenter;
 
-    abstract T createPresenter();
+    public abstract T createPresenter();
 
-    abstract U getUi();
+    public abstract U getUi();
 
     protected BaseFragment() {
         mPresenter = createPresenter();

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 b2c812b..ebba1b1 100644
--- a/InCallUI/src/com/android/incallui/CallButtonFragment.java
+++ b/InCallUI/src/com/android/incallui/CallButtonFragment.java
@@ -112,13 +112,13 @@
     private MaterialPalette mCurrentThemeColors;
 
     @Override
-    CallButtonPresenter createPresenter() {
+    public CallButtonPresenter createPresenter() {
         // TODO: find a cleaner way to include audio mode provider than having a singleton instance.
         return new CallButtonPresenter();
     }
 
     @Override
-    CallButtonPresenter.CallButtonUi getUi() {
+    public CallButtonPresenter.CallButtonUi getUi() {
         return this;
     }
 

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 5e1c26a..9359fd5 100644
--- a/InCallUI/src/com/android/incallui/CallCardFragment.java
+++ b/InCallUI/src/com/android/incallui/CallCardFragment.java
@@ -120,12 +120,12 @@
     private MaterialPalette mCurrentThemeColors;
 
     @Override
-    CallCardPresenter.CallCardUi getUi() {
+    public CallCardPresenter.CallCardUi getUi() {
         return this;
     }
 
     @Override
-    CallCardPresenter createPresenter() {
+    public CallCardPresenter createPresenter() {
         return new CallCardPresenter();
     }
 

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

diff --git a/InCallUI/src/com/android/incallui/ConferenceManagerFragment.java b/InCallUI/src/com/android/incallui/ConferenceManagerFragment.java
index 6b232c9..f5f52fc 100644
--- a/InCallUI/src/com/android/incallui/ConferenceManagerFragment.java
+++ b/InCallUI/src/com/android/incallui/ConferenceManagerFragment.java
@@ -47,12 +47,12 @@
     private boolean mIsRecreating;
 
     @Override
-    ConferenceManagerPresenter createPresenter() {
+    public ConferenceManagerPresenter createPresenter() {
         return new ConferenceManagerPresenter();
     }
 
     @Override
-    ConferenceManagerPresenter.ConferenceManagerUi getUi() {
+    public ConferenceManagerPresenter.ConferenceManagerUi getUi() {
         return this;
     }
 

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

diff --git a/InCallUI/src/com/android/incallui/DialpadFragment.java b/InCallUI/src/com/android/incallui/DialpadFragment.java
index f185c54..737c862 100644
--- a/InCallUI/src/com/android/incallui/DialpadFragment.java
+++ b/InCallUI/src/com/android/incallui/DialpadFragment.java
@@ -409,12 +409,12 @@
     // TODO(klp) Adds hardware keyboard listener
 
     @Override
-    DialpadPresenter createPresenter() {
+    public DialpadPresenter createPresenter() {
         return new DialpadPresenter();
     }
 
     @Override
-    DialpadPresenter.DialpadUi getUi() {
+    public DialpadPresenter.DialpadUi getUi() {
         return this;
     }
 

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

diff --git a/InCallUI/src/com/android/incallui/VideoCallFragment.java b/InCallUI/src/com/android/incallui/VideoCallFragment.java
index 6077017..c285ff3 100644
--- a/InCallUI/src/com/android/incallui/VideoCallFragment.java
+++ b/InCallUI/src/com/android/incallui/VideoCallFragment.java
@@ -511,7 +511,7 @@
      * @return The user interface for the presenter, which is this fragment.
      */
     @Override
-    VideoCallPresenter.VideoCallUi getUi() {
+    public VideoCallPresenter.VideoCallUi getUi() {
         return this;
     }