diff options
| author | wangqi <wangqi@google.com> | 2017-11-29 14:29:31 -0800 |
|---|---|---|
| committer | Copybara-Service <copybara-piper@google.com> | 2017-11-29 16:32:46 -0800 |
| commit | 1d62ab209130bdacdb64b2cd824b5ff35817b89f (patch) | |
| tree | 04e535956686bb2a8ddc98977fb305faa19bb77f /java/com/android/incallui/answer | |
| parent | b33463c7cdf3a4d481767452d3a21c09527ffcb1 (diff) | |
| download | android_packages_apps_Dialer-1d62ab209130bdacdb64b2cd824b5ff35817b89f.tar.gz android_packages_apps_Dialer-1d62ab209130bdacdb64b2cd824b5ff35817b89f.tar.bz2 android_packages_apps_Dialer-1d62ab209130bdacdb64b2cd824b5ff35817b89f.zip | |
Enable timer in emergency call.
"This phone's number: xxx" is shown for emergency call which replaces in call
timer. This change move it to under emergency location service so timer could
be shown again.
Bug: 69810801
Test: manual
PiperOrigin-RevId: 177363955
Change-Id: I543fbbee869923800ffd92a5799819b712f0b953
Diffstat (limited to 'java/com/android/incallui/answer')
| -rw-r--r-- | java/com/android/incallui/answer/impl/AnswerFragment.java | 4 | ||||
| -rw-r--r-- | java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/java/com/android/incallui/answer/impl/AnswerFragment.java b/java/com/android/incallui/answer/impl/AnswerFragment.java index 4362a995d..d687b6e01 100644 --- a/java/com/android/incallui/answer/impl/AnswerFragment.java +++ b/java/com/android/incallui/answer/impl/AnswerFragment.java @@ -694,6 +694,8 @@ public class AnswerFragment extends Fragment updateImportanceBadgeVisibility(); contactGridManager = new ContactGridManager(view, null, 0, false /* showAnonymousAvatar */); + boolean isInMultiWindowMode = ActivityCompat.isInMultiWindowMode(getActivity()); + contactGridManager.onMultiWindowModeChanged(isInMultiWindowMode); Fragment answerMethod = getChildFragmentManager().findFragmentById(R.id.answer_method_container); @@ -712,7 +714,7 @@ public class AnswerFragment extends Fragment initSecondaryButton(); int flags = View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION; - if (!ActivityCompat.isInMultiWindowMode(getActivity()) + if (!isInMultiWindowMode && (getActivity().checkSelfPermission(permission.STATUS_BAR) == PackageManager.PERMISSION_GRANTED)) { LogUtil.i("AnswerFragment.onCreateView", "STATUS_BAR permission granted, disabling nav bar"); diff --git a/java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml b/java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml index d79da8843..b17fc7358 100644 --- a/java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml +++ b/java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml @@ -131,6 +131,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content"/> + <include + layout="@layout/device_number_row" + android:layout_width="match_parent" + android:layout_height="wrap_content"/> + <FrameLayout android:id="@+id/incall_data_container" android:layout_width="match_parent" |