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/incall/impl/res | |
| 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/incall/impl/res')
| -rw-r--r-- | java/com/android/incallui/incall/impl/res/layout/frag_incall_voice.xml | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/java/com/android/incallui/incall/impl/res/layout/frag_incall_voice.xml b/java/com/android/incallui/incall/impl/res/layout/frag_incall_voice.xml index 73b9c267e..ccec8a4a4 100644 --- a/java/com/android/incallui/incall/impl/res/layout/frag_incall_voice.xml +++ b/java/com/android/incallui/incall/impl/res/layout/frag_incall_voice.xml @@ -36,8 +36,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" - android:layout_marginStart="@dimen/incall_window_margin_horizontal" - android:layout_marginEnd="@dimen/incall_window_margin_horizontal" android:gravity="center_horizontal" android:orientation="vertical"> @@ -51,7 +49,9 @@ <include layout="@layout/incall_contactgrid_top_row" android:layout_width="wrap_content" - android:layout_height="wrap_content"/> + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/incall_window_margin_horizontal" + android:layout_marginEnd="@dimen/incall_window_margin_horizontal"/> <!-- We have to keep deprecated singleLine to allow long text being truncated with ellipses. a bug --> @@ -60,6 +60,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="4dp" + android:layout_marginStart="@dimen/incall_window_margin_horizontal" + android:layout_marginEnd="@dimen/incall_window_margin_horizontal" android:singleLine="true" android:textAppearance="@style/Dialer.Incall.TextAppearance.Large" app:autoResizeText_minTextSize="28sp" @@ -69,12 +71,19 @@ <include layout="@layout/incall_contactgrid_bottom_row" android:layout_width="wrap_content" - android:layout_height="wrap_content"/> + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/incall_window_margin_horizontal" + android:layout_marginEnd="@dimen/incall_window_margin_horizontal"/> <FrameLayout android:id="@+id/incall_location_holder" android:layout_width="match_parent" android:layout_height="match_parent"/> + + <include + layout="@layout/device_number_row" + android:layout_width="match_parent" + android:layout_height="wrap_content"/> </LinearLayout> <com.android.dialer.widget.LockableViewPager @@ -123,6 +132,6 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_gravity="bottom" - android:visibility="gone" - android:background="@android:color/background_dark"/> + android:background="@android:color/background_dark" + android:visibility="gone"/> </FrameLayout> |