diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-20 01:23:29 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-20 01:23:29 +0000 |
commit | 14d26c5614b37641acd7079f9682d538d4b9f8eb (patch) | |
tree | f8458fa04699b06eaa6b17fd58ab18e88956ed55 | |
parent | c9e7439e96d4e2db385f6d83a9b9e92b0a6df4be (diff) | |
parent | eff8fc8090d0d051a6c65bf760de4232f3b8bad9 (diff) | |
download | platform_packages_apps_Car_Dialer-14d26c5614b37641acd7079f9682d538d4b9f8eb.tar.gz platform_packages_apps_Car_Dialer-14d26c5614b37641acd7079f9682d538d4b9f8eb.tar.bz2 platform_packages_apps_Car_Dialer-14d26c5614b37641acd7079f9682d538d4b9f8eb.zip |
Merge "Update dialpad layout" into rvc-dev am: eff8fc8090
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/Dialer/+/11919733
Change-Id: I4b6503b0dc1178211444e673087d643853ec732a
-rw-r--r-- | res/layout/dialpad_fragment_with_type_down.xml | 12 | ||||
-rw-r--r-- | res/layout/dialpad_fragment_without_type_down.xml | 42 |
2 files changed, 23 insertions, 31 deletions
diff --git a/res/layout/dialpad_fragment_with_type_down.xml b/res/layout/dialpad_fragment_with_type_down.xml index 547a9d3e..bdb1f490 100644 --- a/res/layout/dialpad_fragment_with_type_down.xml +++ b/res/layout/dialpad_fragment_with_type_down.xml @@ -26,16 +26,16 @@ android:layout_width="wrap_content" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toTopOf="@+id/call_button" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintEnd_toStartOf="@+id/divider"/> + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintRight_toLeftOf="@+id/divider"/> <ImageView android:id="@+id/call_button" style="@style/DialpadPrimaryButton" android:src="@drawable/icon_call_button" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintEnd_toStartOf="@+id/divider"/> + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintRight_toLeftOf="@+id/divider"/> <androidx.constraintlayout.widget.Guideline android:id="@+id/divider" @@ -49,8 +49,8 @@ android:layout_width="0dp" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toEndOf="@id/divider" - app:layout_constraintEnd_toEndOf="parent"> + app:layout_constraintLeft_toRightOf="@id/divider" + app:layout_constraintRight_toRightOf="parent"> <include layout="@layout/dialpad_info"/> </FrameLayout> </androidx.constraintlayout.widget.ConstraintLayout> diff --git a/res/layout/dialpad_fragment_without_type_down.xml b/res/layout/dialpad_fragment_without_type_down.xml index b61b6339..d1ee53bf 100644 --- a/res/layout/dialpad_fragment_without_type_down.xml +++ b/res/layout/dialpad_fragment_without_type_down.xml @@ -17,46 +17,38 @@ android:layout_height="match_parent"> <androidx.constraintlayout.widget.Guideline - android:id="@+id/type_down_guideline" + android:id="@+id/divider" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:orientation="horizontal" - app:layout_constraintGuide_percent="@dimen/config_type_down_guideline_percent"/> + android:orientation="vertical" + app:layout_constraintGuide_percent="0.5"/> <fragment android:id="@+id/dialpad_fragment" android:name="com.android.car.dialer.ui.dialpad.KeypadFragment" android:layout_height="wrap_content" android:layout_width="wrap_content" - android:layout_marginStart="@dimen/dialpad_info_margin_start" - app:layout_constraintTop_toBottomOf="@id/type_down_guideline" + app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toStartOf="parent"/> - - <View - android:layout_width="match_parent" - android:layout_height="@dimen/dialpad_line_divider_height" - android:background="@color/divider_color" - android:layout_marginStart="@dimen/horizontal_divider_inset" - android:layout_marginEnd="@dimen/horizontal_divider_inset" - app:layout_constraintTop_toBottomOf="@id/type_down_guideline"/> + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintRight_toLeftOf="@+id/divider"/> <include layout="@layout/dialpad_info" android:layout_width="0dp" android:layout_height="0dp" app:layout_constraintTop_toTopOf="@id/dialpad_fragment" - app:layout_constraintBottom_toBottomOf="@id/dialpad_fragment" - app:layout_constraintStart_toEndOf="@id/dialpad_fragment" - app:layout_constraintEnd_toEndOf="parent"/> + app:layout_constraintBottom_toTopOf="@+id/call_button" + app:layout_constraintLeft_toRightOf="@id/divider" + app:layout_constraintRight_toRightOf="parent"/> - <include - layout="@layout/list_fragment" - android:layout_width="match_parent" - android:layout_height="0dp" - app:layout_constraintTop_toTopOf="parent" - app:layout_constraintBottom_toTopOf="@id/type_down_guideline" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintEnd_toEndOf="parent"/> + <ImageView + android:id="@+id/call_button" + style="@style/DialpadPrimaryButton" + android:src="@drawable/icon_call_button" + android:layout_marginBottom="@dimen/dialpad_info_edge_padding_size" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintLeft_toRightOf="@id/divider" + app:layout_constraintRight_toRightOf="parent"/> </androidx.constraintlayout.widget.ConstraintLayout> |