summaryrefslogtreecommitdiff
path: root/java/com/android/incallui/InCallActivity.java
diff options
context:
space:
mode:
authorwangqi <wangqi@google.com>2018-05-21 15:57:36 -0700
committerCopybara-Service <copybara-piper@google.com>2018-05-21 16:25:15 -0700
commit73ed613c802ef866d74d9b1d5bcf273183d6fe00 (patch)
treeb957b06fd99ecd1e9864c2136a8ef9ea00487f46 /java/com/android/incallui/InCallActivity.java
parent0a41f3c3f1cefcd71cbdd79299fba3482e23a5e2 (diff)
Set navigation bar color when dialpad is visible.
Instead of fake a black bar on voice incall UI, the more reliable way is to set navigation bar color. Bug: 79902234 Test: manual PiperOrigin-RevId: 197475300 Change-Id: I96085700e633570ef385386cdf366d758e50a6e2
Diffstat (limited to 'java/com/android/incallui/InCallActivity.java')
-rw-r--r--java/com/android/incallui/InCallActivity.java26
1 files changed, 2 insertions, 24 deletions
diff --git a/java/com/android/incallui/InCallActivity.java b/java/com/android/incallui/InCallActivity.java
index 70ba71ba1..2fe38c0aa 100644
--- a/java/com/android/incallui/InCallActivity.java
+++ b/java/com/android/incallui/InCallActivity.java
@@ -488,7 +488,6 @@ public class InCallActivity extends TransactionSafeFragmentActivity
}
showDialpadRequest = DIALPAD_REQUEST_NONE;
}
- updateNavigationBar(isDialpadVisible());
CallList.getInstance()
.onInCallUiShown(getIntent().getBooleanExtra(IntentExtraNames.FOR_FULL_SCREEN, false));
@@ -807,10 +806,6 @@ public class InCallActivity extends TransactionSafeFragmentActivity
sensor.onDialpadVisible(show);
}
showDialpadRequest = DIALPAD_REQUEST_NONE;
-
- // Note: onInCallScreenDialpadVisibilityChange is called here to ensure that the dialpad FAB
- // repositions itself.
- getInCallOrRttCallScreen().onInCallScreenDialpadVisibilityChange(show);
}
private void showDialpadFragment() {
@@ -835,7 +830,7 @@ public class InCallActivity extends TransactionSafeFragmentActivity
dialpadFragmentManager.executePendingTransactions();
Logger.get(this).logScreenView(ScreenEvent.Type.INCALL_DIALPAD, this);
- updateNavigationBar(true /* isDialpadVisible */);
+ getInCallOrRttCallScreen().onInCallScreenDialpadVisibilityChange(true);
}
private void hideDialpadFragment() {
@@ -851,8 +846,8 @@ public class InCallActivity extends TransactionSafeFragmentActivity
transaction.commitAllowingStateLoss();
dialpadFragmentManager.executePendingTransactions();
dialpadFragment.setUserVisibleHint(false);
+ getInCallOrRttCallScreen().onInCallScreenDialpadVisibilityChange(false);
}
- updateNavigationBar(false /* isDialpadVisible */);
}
public boolean isDialpadVisible() {
@@ -1183,23 +1178,6 @@ public class InCallActivity extends TransactionSafeFragmentActivity
fragment.show(getSupportFragmentManager(), Tags.RTT_REQUEST_DIALOG);
}
- @Override
- public void onMultiWindowModeChanged(boolean isInMultiWindowMode) {
- super.onMultiWindowModeChanged(isInMultiWindowMode);
- updateNavigationBar(isDialpadVisible());
- }
-
- private void updateNavigationBar(boolean isDialpadVisible) {
- if (isInMultiWindowMode()) {
- return;
- }
-
- View navigationBarBackground = getWindow().findViewById(R.id.navigation_bar_background);
- if (navigationBarBackground != null) {
- navigationBarBackground.setVisibility(isDialpadVisible ? View.VISIBLE : View.GONE);
- }
- }
-
public void setAllowOrientationChange(boolean allowOrientationChange) {
if (this.allowOrientationChange == allowOrientationChange) {
return;