diff options
author | Eric Erfanian <erfanian@google.com> | 2017-04-06 09:41:50 -0700 |
---|---|---|
committer | Eric Erfanian <erfanian@google.com> | 2017-04-06 09:41:50 -0700 |
commit | d8046e520a866b9948ee9ba47cf642b441ca8e23 (patch) | |
tree | 8d08d4f2292aa84dc435d455891e7ab633d95a25 /java/com/android/dialer/callcomposer/res/layout | |
parent | cdb1edf966a892abebcba425a85b7d4e47758302 (diff) |
Update AOSP Dialer source from internal google3 repository at
cl/152373142.
Test: make, treehugger
This CL updates the AOSP Dialer source with all the changes that have
gone into the private google3 repository. This includes all the
changes from cl/151342913 (3/27/2017) to cl/152373142 (4/06/2017).
This goal of these drops is to keep the AOSP source in sync with the
internal google3 repository. Currently these sync are done by hand
with very minor modifications to the internal source code.
See the Android.mk file for list of modifications.
Our current goal is to do frequent drops (daily if possible) and
eventually switched to an automated process.
Change-Id: I2fbc88cf6867b90ac8b65f75e5e34468988c7217
Diffstat (limited to 'java/com/android/dialer/callcomposer/res/layout')
4 files changed, 29 insertions, 27 deletions
diff --git a/java/com/android/dialer/callcomposer/res/layout/call_composer_activity.xml b/java/com/android/dialer/callcomposer/res/layout/call_composer_activity.xml index f687f0b5c..c3f1102d1 100644 --- a/java/com/android/dialer/callcomposer/res/layout/call_composer_activity.xml +++ b/java/com/android/dialer/callcomposer/res/layout/call_composer_activity.xml @@ -74,12 +74,14 @@ android:id="@+id/call_composer_view_pager" android:layout_width="match_parent" android:layout_height="@dimen/call_composer_view_pager_height"/> + </LinearLayout> - <FrameLayout + <FrameLayout android:layout_width="match_parent" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + android:layout_gravity="bottom"> - <LinearLayout + <LinearLayout android:id="@+id/media_actions" android:layout_width="match_parent" android:layout_height="@dimen/call_composer_media_bar_height" @@ -88,7 +90,7 @@ android:background="@color/dialer_secondary_color" android:clickable="true"> - <ImageView + <ImageView android:id="@+id/call_composer_camera" android:layout_width="@dimen/call_composer_media_actions_width" android:layout_height="match_parent" @@ -96,7 +98,7 @@ android:src="@drawable/quantum_ic_camera_alt_white_24" android:background="?android:attr/selectableItemBackgroundBorderless"/> - <ImageView + <ImageView android:id="@+id/call_composer_photo" android:layout_width="@dimen/call_composer_media_actions_width" android:layout_height="match_parent" @@ -104,22 +106,22 @@ android:src="@drawable/quantum_ic_photo_white_24" android:background="?android:attr/selectableItemBackgroundBorderless"/> - <ImageView + <ImageView android:id="@+id/call_composer_message" android:layout_width="@dimen/call_composer_media_actions_width" android:layout_height="match_parent" android:scaleType="center" - android:src="@drawable/ic_message_24dp" + android:src="@drawable/quantum_ic_message_white_24" android:background="?android:attr/selectableItemBackgroundBorderless"/> - </LinearLayout> + </LinearLayout> - <FrameLayout + <FrameLayout android:id="@+id/send_and_call_button" android:layout_width="match_parent" android:layout_height="@dimen/call_composer_media_bar_height" android:visibility="invisible" android:background="@color/compose_and_call_background"> - <TextView + <TextView android:id="@+id/send_and_call_text" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -131,18 +133,11 @@ android:textSize="@dimen/send_and_call_text_size" android:fontFamily="sans-serif-medium" android:textColor="@color/background_dialer_white"/> - </FrameLayout> </FrameLayout> - </LinearLayout> + </FrameLayout> - <Toolbar - android:id="@+id/toolbar" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:minHeight="?attr/actionBarSize" - android:visibility="invisible" - android:titleTextAppearance="@style/toolbar_title_text" - android:subtitleTextAppearance="@style/toolbar_subtitle_text" - android:navigationIcon="@drawable/quantum_ic_close_white_24" - android:background="@color/dialer_theme_color"/> -</FrameLayout>
\ No newline at end of file + <com.android.dialer.widget.DialerToolbar + android:id="@+id/toolbar" + android:layout_width="match_parent" + android:layout_height="wrap_content"/> +</FrameLayout> diff --git a/java/com/android/dialer/callcomposer/res/layout/fragment_camera_composer.xml b/java/com/android/dialer/callcomposer/res/layout/fragment_camera_composer.xml index 200a3dce7..f1db48e5b 100644 --- a/java/com/android/dialer/callcomposer/res/layout/fragment_camera_composer.xml +++ b/java/com/android/dialer/callcomposer/res/layout/fragment_camera_composer.xml @@ -17,7 +17,8 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_height="match_parent" - android:layout_width="match_parent"> + android:layout_width="match_parent" + android:paddingBottom="@dimen/call_composer_media_bar_height"> <include android:layout_width="match_parent" diff --git a/java/com/android/dialer/callcomposer/res/layout/fragment_gallery_composer.xml b/java/com/android/dialer/callcomposer/res/layout/fragment_gallery_composer.xml index a4bd4df03..6cd6418a4 100644 --- a/java/com/android/dialer/callcomposer/res/layout/fragment_gallery_composer.xml +++ b/java/com/android/dialer/callcomposer/res/layout/fragment_gallery_composer.xml @@ -18,7 +18,8 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/background_dialer_white"> + android:background="@color/background_dialer_white" + android:paddingBottom="@dimen/call_composer_media_bar_height"> <GridView android:id="@+id/gallery_grid_view" diff --git a/java/com/android/dialer/callcomposer/res/layout/fragment_message_composer.xml b/java/com/android/dialer/callcomposer/res/layout/fragment_message_composer.xml index 577887be9..77c7a58d1 100644 --- a/java/com/android/dialer/callcomposer/res/layout/fragment_message_composer.xml +++ b/java/com/android/dialer/callcomposer/res/layout/fragment_message_composer.xml @@ -59,7 +59,10 @@ android:id="@+id/custom_message" android:layout_width="match_parent" android:layout_height="wrap_content" - android:padding="@dimen/message_composer_item_padding" + android:paddingTop="@dimen/message_composer_item_padding" + android:paddingStart="@dimen/message_composer_item_padding" + android:paddingEnd="@dimen/message_composer_item_padding" + android:paddingBottom="64dp" android:textSize="@dimen/message_compose_item_text_size" android:hint="@string/message_composer_custom_message_hint" android:textColor="@color/dialer_primary_text_color" @@ -67,13 +70,15 @@ android:background="@color/background_dialer_white" android:textCursorDrawable="@drawable/searchedittext_custom_cursor" android:layout_toStartOf="@+id/remaining_characters" - android:imeOptions="flagNoExtractUi"/> + android:inputType="textShortMessage" + android:imeOptions="flagNoExtractUi|actionSend"/> <TextView android:id="@+id/remaining_characters" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="@dimen/message_composer_item_padding" + android:paddingBottom="@dimen/call_composer_media_bar_height" android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:textSize="@dimen/message_compose_remaining_char_text_size" |