summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Lee <anwlee@google.com>2015-04-16 18:04:25 -0700
committerAndrew Lee <anwlee@google.com>2015-04-16 18:05:54 -0700
commit9bcd0f1e66d4a8aa9e2e6b2b6d2c3efd6ffddb75 (patch)
treeb24c7ca16bc9e633503c75d9d948e5c73e393a0f
parent4835bf85d6908e55630d58d889f654acbfe011bb (diff)
Make createPresenter() and getUi() public.
... and update the visibility of their overriden instances. This allows us to create fragments with the BaseFragment/Presenter fragment which do not live in the incallui root directory. Bug: 20300758 Change-Id: I7f9b1c630538a04ca773ba155e5fb8efd6cf6af7
-rw-r--r--InCallUI/src/com/android/incallui/AnswerFragment.java2
-rw-r--r--InCallUI/src/com/android/incallui/BaseFragment.java4
-rw-r--r--InCallUI/src/com/android/incallui/CallButtonFragment.java4
-rw-r--r--InCallUI/src/com/android/incallui/CallCardFragment.java4
-rw-r--r--InCallUI/src/com/android/incallui/ConferenceManagerFragment.java4
-rw-r--r--InCallUI/src/com/android/incallui/DialpadFragment.java4
-rw-r--r--InCallUI/src/com/android/incallui/VideoCallFragment.java2
7 files changed, 12 insertions, 12 deletions
diff --git a/InCallUI/src/com/android/incallui/AnswerFragment.java b/InCallUI/src/com/android/incallui/AnswerFragment.java
index d1636371c..07cbfd573 100644
--- a/InCallUI/src/com/android/incallui/AnswerFragment.java
+++ b/InCallUI/src/com/android/incallui/AnswerFragment.java
@@ -83,7 +83,7 @@ public class AnswerFragment extends BaseFragment<AnswerPresenter, AnswerPresente
}
@Override
- AnswerPresenter.AnswerUi getUi() {
+ public AnswerPresenter.AnswerUi getUi() {
return this;
}
diff --git a/InCallUI/src/com/android/incallui/BaseFragment.java b/InCallUI/src/com/android/incallui/BaseFragment.java
index 037c2455f..58d991acd 100644
--- a/InCallUI/src/com/android/incallui/BaseFragment.java
+++ b/InCallUI/src/com/android/incallui/BaseFragment.java
@@ -29,9 +29,9 @@ public abstract class BaseFragment<T extends Presenter<U>, U extends Ui> extends
private T mPresenter;
- abstract T createPresenter();
+ public abstract T createPresenter();
- abstract U getUi();
+ public abstract U getUi();
protected BaseFragment() {
mPresenter = createPresenter();
diff --git a/InCallUI/src/com/android/incallui/CallButtonFragment.java b/InCallUI/src/com/android/incallui/CallButtonFragment.java
index b2c812b7b..ebba1b1bc 100644
--- a/InCallUI/src/com/android/incallui/CallButtonFragment.java
+++ b/InCallUI/src/com/android/incallui/CallButtonFragment.java
@@ -112,13 +112,13 @@ public class CallButtonFragment
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;
}
diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java
index 5e1c26a30..9359fd5c0 100644
--- a/InCallUI/src/com/android/incallui/CallCardFragment.java
+++ b/InCallUI/src/com/android/incallui/CallCardFragment.java
@@ -120,12 +120,12 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
private MaterialPalette mCurrentThemeColors;
@Override
- CallCardPresenter.CallCardUi getUi() {
+ public CallCardPresenter.CallCardUi getUi() {
return this;
}
@Override
- CallCardPresenter createPresenter() {
+ public CallCardPresenter createPresenter() {
return new CallCardPresenter();
}
diff --git a/InCallUI/src/com/android/incallui/ConferenceManagerFragment.java b/InCallUI/src/com/android/incallui/ConferenceManagerFragment.java
index 6b232c934..f5f52fcb6 100644
--- a/InCallUI/src/com/android/incallui/ConferenceManagerFragment.java
+++ b/InCallUI/src/com/android/incallui/ConferenceManagerFragment.java
@@ -47,12 +47,12 @@ public class ConferenceManagerFragment
private boolean mIsRecreating;
@Override
- ConferenceManagerPresenter createPresenter() {
+ public ConferenceManagerPresenter createPresenter() {
return new ConferenceManagerPresenter();
}
@Override
- ConferenceManagerPresenter.ConferenceManagerUi getUi() {
+ public ConferenceManagerPresenter.ConferenceManagerUi getUi() {
return this;
}
diff --git a/InCallUI/src/com/android/incallui/DialpadFragment.java b/InCallUI/src/com/android/incallui/DialpadFragment.java
index f185c54bc..737c86255 100644
--- a/InCallUI/src/com/android/incallui/DialpadFragment.java
+++ b/InCallUI/src/com/android/incallui/DialpadFragment.java
@@ -409,12 +409,12 @@ public class DialpadFragment extends BaseFragment<DialpadPresenter, DialpadPrese
// 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;
}
diff --git a/InCallUI/src/com/android/incallui/VideoCallFragment.java b/InCallUI/src/com/android/incallui/VideoCallFragment.java
index 6077017f5..c285ff3fe 100644
--- a/InCallUI/src/com/android/incallui/VideoCallFragment.java
+++ b/InCallUI/src/com/android/incallui/VideoCallFragment.java
@@ -511,7 +511,7 @@ public class VideoCallFragment extends BaseFragment<VideoCallPresenter,
* @return The user interface for the presenter, which is this fragment.
*/
@Override
- VideoCallPresenter.VideoCallUi getUi() {
+ public VideoCallPresenter.VideoCallUi getUi() {
return this;
}