summaryrefslogtreecommitdiff
path: root/java/com/android/incallui/InCallActivity.java
diff options
context:
space:
mode:
authorlinyuh <linyuh@google.com>2018-03-26 12:46:18 -0700
committerCopybara-Service <copybara-piper@google.com>2018-03-26 22:23:52 -0700
commit437ae9552cce7768068fa92663740711ee541417 (patch)
tree1ae9af42ed23c09404b87ca613247e18c3fa10d2 /java/com/android/incallui/InCallActivity.java
parentcf14ecbc3cb604804ae1f9d01e47444fcf0eedc6 (diff)
Remove obsolete version checks and compat utilities after min SDK was bumped up to N.
Test: Existing tests PiperOrigin-RevId: 190508397 Change-Id: Ia5f33e45af1d1cc666fec5f43efa564b2b68c193
Diffstat (limited to 'java/com/android/incallui/InCallActivity.java')
-rw-r--r--java/com/android/incallui/InCallActivity.java8
1 files changed, 3 insertions, 5 deletions
diff --git a/java/com/android/incallui/InCallActivity.java b/java/com/android/incallui/InCallActivity.java
index be365096a..3236e160a 100644
--- a/java/com/android/incallui/InCallActivity.java
+++ b/java/com/android/incallui/InCallActivity.java
@@ -60,7 +60,6 @@ import com.android.dialer.common.Assert;
import com.android.dialer.common.LogUtil;
import com.android.dialer.common.concurrent.DialerExecutorComponent;
import com.android.dialer.common.concurrent.ThreadUtil;
-import com.android.dialer.compat.ActivityCompat;
import com.android.dialer.compat.CompatUtils;
import com.android.dialer.configprovider.ConfigProviderBindings;
import com.android.dialer.logging.DialerImpression.Type;
@@ -465,8 +464,7 @@ public class InCallActivity extends TransactionSafeFragmentActivity
InCallPresenter.getInstance().onUiShowing(true);
}
- if (ActivityCompat.isInMultiWindowMode(this)
- && !getResources().getBoolean(R.bool.incall_dialpad_allowed)) {
+ if (isInMultiWindowMode() && !getResources().getBoolean(R.bool.incall_dialpad_allowed)) {
// Hide the dialpad because there may not be enough room
showDialpadFragment(false, false);
}
@@ -926,7 +924,7 @@ public class InCallActivity extends TransactionSafeFragmentActivity
@ColorInt int bottom;
@ColorInt int gray = 0x66000000;
- if (ActivityCompat.isInMultiWindowMode(this)) {
+ if (isInMultiWindowMode()) {
top = themeColorManager.getBackgroundColorSolid();
middle = themeColorManager.getBackgroundColorSolid();
bottom = themeColorManager.getBackgroundColorSolid();
@@ -1236,7 +1234,7 @@ public class InCallActivity extends TransactionSafeFragmentActivity
}
private void updateNavigationBar(boolean isDialpadVisible) {
- if (ActivityCompat.isInMultiWindowMode(this)) {
+ if (isInMultiWindowMode()) {
return;
}