summaryrefslogtreecommitdiffstats
path: root/java/com/android/incallui/InCallActivity.java
diff options
context:
space:
mode:
authorlinyuh <linyuh@google.com>2017-11-15 16:18:51 -0800
committerzachh <zachh@google.com>2017-11-18 07:31:10 +0000
commit69a25063b2b62b3ae8acc4cb2044259e37522626 (patch)
tree1179fed1004868140fd75b05a6524cd58c606c16 /java/com/android/incallui/InCallActivity.java
parent9d197d0149cd6eb660e398a5f4a06a0387db7a18 (diff)
downloadandroid_packages_apps_Dialer-69a25063b2b62b3ae8acc4cb2044259e37522626.tar.gz
android_packages_apps_Dialer-69a25063b2b62b3ae8acc4cb2044259e37522626.tar.bz2
android_packages_apps_Dialer-69a25063b2b62b3ae8acc4cb2044259e37522626.zip
Move the following methods from InCallActivityCommon to InCallActivity:
1. enableInCallOrientationEventListener(boolean) 2. isDialpadVisible() 3. getDialpadFragment() This is part of the effort to delete InCallActivityCommon. Bug: 69272096 Test: None PiperOrigin-RevId: 175898158 Change-Id: Ib0f58dbe35d528a475268a86b2af4119e7cfa381
Diffstat (limited to 'java/com/android/incallui/InCallActivity.java')
-rw-r--r--java/com/android/incallui/InCallActivity.java28
1 files changed, 25 insertions, 3 deletions
diff --git a/java/com/android/incallui/InCallActivity.java b/java/com/android/incallui/InCallActivity.java
index f9311f8d3..a55770c41 100644
--- a/java/com/android/incallui/InCallActivity.java
+++ b/java/com/android/incallui/InCallActivity.java
@@ -81,6 +81,7 @@ public class InCallActivity extends TransactionSafeFragmentActivity
public static final int PENDING_INTENT_REQUEST_CODE_BUBBLE = 2;
private static final String TAG_ANSWER_SCREEN = "tag_answer_screen";
+ private static final String TAG_DIALPAD_FRAGMENT = "tag_dialpad_fragment";
private static final String TAG_INTERNATIONAL_CALL_ON_WIFI = "tag_international_call_on_wifi";
private static final String TAG_IN_CALL_SCREEN = "tag_in_call_screen";
private static final String TAG_VIDEO_CALL_SCREEN = "tag_video_call_screen";
@@ -92,6 +93,7 @@ public class InCallActivity extends TransactionSafeFragmentActivity
private static final String CONFIG_ANSWER_AND_RELEASE_ENABLED = "answer_and_release_enabled";
private final InCallActivityCommon common;
+ private InCallOrientationEventListener inCallOrientationEventListener;
private boolean didShowAnswerScreen;
private boolean didShowInCallScreen;
private boolean didShowVideoCallScreen;
@@ -144,6 +146,7 @@ public class InCallActivity extends TransactionSafeFragmentActivity
}
common.onCreate(icicle);
+ inCallOrientationEventListener = new InCallOrientationEventListener(this);
getWindow()
.getDecorView()
@@ -346,7 +349,21 @@ public class InCallActivity extends TransactionSafeFragmentActivity
}
public boolean isDialpadVisible() {
- return common.isDialpadVisible();
+ DialpadFragment dialpadFragment = getDialpadFragment();
+ return dialpadFragment != null && dialpadFragment.isVisible();
+ }
+
+ /**
+ * Returns the {@link DialpadFragment} that's shown by this activity, or {@code null}
+ * TODO(a bug): Make this method private after InCallActivityCommon is deleted.
+ */
+ @Nullable
+ DialpadFragment getDialpadFragment() {
+ FragmentManager fragmentManager = getDialpadFragmentManager();
+ if (fragmentManager == null) {
+ return null;
+ }
+ return (DialpadFragment) fragmentManager.findFragmentByTag(TAG_DIALPAD_FRAGMENT);
}
public void onForegroundCallChanged(DialerCall newForegroundCall) {
@@ -489,8 +506,13 @@ public class InCallActivity extends TransactionSafeFragmentActivity
needDismissPendingDialogs = false;
}
- private void enableInCallOrientationEventListener(boolean enable) {
- common.enableInCallOrientationEventListener(enable);
+ // TODO(a bug): Make this method private after InCallActivityCommon is deleted.
+ void enableInCallOrientationEventListener(boolean enable) {
+ if (enable) {
+ inCallOrientationEventListener.enable(true /* notifyDeviceOrientationChange */);
+ } else {
+ inCallOrientationEventListener.disable();
+ }
}
public void setExcludeFromRecents(boolean exclude) {