diff options
Diffstat (limited to 'java/com/android/incallui/answer/impl')
3 files changed, 4 insertions, 9 deletions
diff --git a/java/com/android/incallui/answer/impl/AnswerFragment.java b/java/com/android/incallui/answer/impl/AnswerFragment.java index 05fd4f6b2..e5271f5c2 100644 --- a/java/com/android/incallui/answer/impl/AnswerFragment.java +++ b/java/com/android/incallui/answer/impl/AnswerFragment.java @@ -53,7 +53,6 @@ import com.android.dialer.common.Assert; import com.android.dialer.common.FragmentUtils; import com.android.dialer.common.LogUtil; import com.android.dialer.common.MathUtil; -import com.android.dialer.compat.ActivityCompat; import com.android.dialer.logging.DialerImpression; import com.android.dialer.logging.Logger; import com.android.dialer.multimedia.MultimediaData; @@ -411,7 +410,7 @@ public class AnswerFragment extends Fragment LogUtil.i("AnswerFragment.setTextResponses", "no text responses, hiding secondary button"); this.textResponses = null; secondaryButton.setVisibility(View.INVISIBLE); - } else if (ActivityCompat.isInMultiWindowMode(getActivity())) { + } else if (getActivity().isInMultiWindowMode()) { LogUtil.i("AnswerFragment.setTextResponses", "in multiwindow, hiding secondary button"); this.textResponses = null; secondaryButton.setVisibility(View.INVISIBLE); @@ -731,7 +730,7 @@ public class AnswerFragment extends Fragment updateImportanceBadgeVisibility(); contactGridManager = new ContactGridManager(view, null, 0, false /* showAnonymousAvatar */); - boolean isInMultiWindowMode = ActivityCompat.isInMultiWindowMode(getActivity()); + boolean isInMultiWindowMode = getActivity().isInMultiWindowMode(); contactGridManager.onMultiWindowModeChanged(isInMultiWindowMode); Fragment answerMethod = diff --git a/java/com/android/incallui/answer/impl/answermethod/AnswerMethodFactory.java b/java/com/android/incallui/answer/impl/answermethod/AnswerMethodFactory.java index ccb132b95..f318f0826 100644 --- a/java/com/android/incallui/answer/impl/answermethod/AnswerMethodFactory.java +++ b/java/com/android/incallui/answer/impl/answermethod/AnswerMethodFactory.java @@ -22,7 +22,6 @@ import android.support.annotation.Nullable; import android.support.annotation.VisibleForTesting; import android.support.v4.app.Fragment; import com.android.dialer.common.LogUtil; -import com.android.dialer.compat.ActivityCompat; import com.android.incallui.util.AccessibilityUtil; /** Creates the appropriate {@link AnswerMethod} for the circumstances. */ @@ -59,7 +58,6 @@ public class AnswerMethodFactory { return true; } - return AccessibilityUtil.isTouchExplorationEnabled(activity) - || ActivityCompat.isInMultiWindowMode(activity); + return AccessibilityUtil.isTouchExplorationEnabled(activity) || activity.isInMultiWindowMode(); } } diff --git a/java/com/android/incallui/answer/impl/answermethod/TwoButtonMethod.java b/java/com/android/incallui/answer/impl/answermethod/TwoButtonMethod.java index 67b1b9689..10864499e 100644 --- a/java/com/android/incallui/answer/impl/answermethod/TwoButtonMethod.java +++ b/java/com/android/incallui/answer/impl/answermethod/TwoButtonMethod.java @@ -36,7 +36,6 @@ import android.view.ViewGroup; import android.widget.TextView; import com.android.dialer.common.Assert; import com.android.dialer.common.LogUtil; -import com.android.dialer.compat.ActivityCompat; import com.android.incallui.answer.impl.answermethod.FlingUpDownTouchHandler.OnProgressChangedListener; import com.android.incallui.util.AccessibilityUtil; @@ -157,8 +156,7 @@ public class TwoButtonMethod extends AnswerMethod if (hintTextView == null) { return; } - hintTextView.setVisibility( - ActivityCompat.isInMultiWindowMode(getActivity()) ? View.GONE : View.VISIBLE); + hintTextView.setVisibility(getActivity().isInMultiWindowMode() ? View.GONE : View.VISIBLE); if (!TextUtils.isEmpty(hintText) && !buttonClicked) { hintTextView.setText(hintText); hintTextView.animate().alpha(1f).start(); |