summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2019-10-03 01:16:36 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2019-10-03 01:16:36 +0000
commitc08ba02dde3cd73bc7bcd37d53794474c625469b (patch)
treeea335b547d0d726cbbeeb8bc6a1836ba55936c75
parentd1a38a10da64535dc543e02353b117a70f229bf7 (diff)
parent9da5e0ea56d985c0f70cae7506f53174fed70de7 (diff)
downloadplatform_packages_apps_Car_Dialer-android10-qpr1-release.tar.gz
platform_packages_apps_Car_Dialer-android10-qpr1-release.tar.bz2
platform_packages_apps_Car_Dialer-android10-qpr1-release.zip
Change-Id: If29412e2a8f246a9c64d8986ae3f075d5a870a72
-rw-r--r--res/layout-port/dialpad_fragment.xml7
-rw-r--r--res/values/configs.xml4
-rw-r--r--src/com/android/car/dialer/ui/dialpad/DialpadFragment.java3
3 files changed, 7 insertions, 7 deletions
diff --git a/res/layout-port/dialpad_fragment.xml b/res/layout-port/dialpad_fragment.xml
index 1581dbdc..fffbf707 100644
--- a/res/layout-port/dialpad_fragment.xml
+++ b/res/layout-port/dialpad_fragment.xml
@@ -54,13 +54,10 @@
app:layout_constraintStart_toEndOf="@id/title"
app:layout_constraintEnd_toEndOf="@id/dialpad_fragment"/>
- <TextView
- android:id="@+id/display_name"
+ <include
+ layout="@layout/dialpad_user_profile"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textAppearance="@style/TextAppearance.DialpadDisplayName"
- android:focusable="true"
- android:singleLine="true"
app:layout_constraintTop_toBottomOf="@id/title"
app:layout_constraintBottom_toTopOf="@id/dialpad_fragment"
app:layout_constraintStart_toStartOf="parent"
diff --git a/res/values/configs.xml b/res/values/configs.xml
index e0345e0f..47bcd2c5 100644
--- a/res/values/configs.xml
+++ b/res/values/configs.xml
@@ -16,11 +16,13 @@
-->
<resources>
+ <bool name="config_enable_dial_motion">true</bool>
<item name="config_dial_motion_scale_start" format="float" type="integer">1.5</item>
<integer name="config_dial_motion_duration">200</integer>
+ <!-- 8388629 stands for Gravity.END | Gravity.CENTER_VERTICAL-->
+ <integer name="config_dialed_number_gravity">8388629</integer>
<item name="config_background_image_alpha" format="float" type="dimen">1.0</item>
<item name="config_background_image_error_alpha" format="float" type="dimen">1.0</item>
- <bool name="config_enable_dial_motion">true</bool>
<bool name="config_show_detailed_user_profile_on_dialpad">false</bool>
</resources>
diff --git a/src/com/android/car/dialer/ui/dialpad/DialpadFragment.java b/src/com/android/car/dialer/ui/dialpad/DialpadFragment.java
index 94a22d6e..aa22ba2e 100644
--- a/src/com/android/car/dialer/ui/dialpad/DialpadFragment.java
+++ b/src/com/android/car/dialer/ui/dialpad/DialpadFragment.java
@@ -225,7 +225,8 @@ public class DialpadFragment extends AbstractDialpadFragment {
: R.string.emergency_call_description);
ViewUtils.setVisible(mDeleteButton, false);
} else {
- mTitleView.setGravity(Gravity.END | Gravity.CENTER_VERTICAL);
+ mTitleView.setGravity(
+ getResources().getInteger(R.integer.config_dialed_number_gravity));
if (number.length() <= MAX_DIAL_NUMBER) {
mTitleView.setText(
TelecomUtils.getFormattedNumber(getContext(), number.toString()));