diff options
Diffstat (limited to 'java/com/android/dialer/widget')
4 files changed, 23 insertions, 18 deletions
diff --git a/java/com/android/dialer/widget/MessageFragment.java b/java/com/android/dialer/widget/MessageFragment.java index 615ad3b77..7a0fcfd0f 100644 --- a/java/com/android/dialer/widget/MessageFragment.java +++ b/java/com/android/dialer/widget/MessageFragment.java @@ -134,10 +134,9 @@ public class MessageFragment extends Fragment @Override public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { - if (getMessage() == null) { - return false; + if (!TextUtils.isEmpty(getMessage())) { + getListener().onMessageFragmentSendMessage(getMessage()); } - getListener().onMessageFragmentSendMessage(getMessage()); return true; } diff --git a/java/com/android/dialer/widget/res/layout/fragment_message.xml b/java/com/android/dialer/widget/res/layout/fragment_message.xml index 5b0bab536..bdb85fa81 100644 --- a/java/com/android/dialer/widget/res/layout/fragment_message.xml +++ b/java/com/android/dialer/widget/res/layout/fragment_message.xml @@ -14,28 +14,36 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License --> -<LinearLayout +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical" - android:gravity="bottom" android:background="@color/background_dialer_white"> - <LinearLayout - android:id="@+id/message_container" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="wrap_content"/> + <ScrollView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_above="@+id/divider"> + + <LinearLayout + android:id="@+id/message_container" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="wrap_content"/> + </ScrollView> <View + android:id="@+id/divider" android:layout_width="match_parent" android:layout_height="@dimen/message_divider_height" - android:background="#12000000"/> + android:background="#12000000" + android:layout_above="@+id/edittext_container"/> <RelativeLayout + android:id="@+id/edittext_container" android:layout_width="wrap_content" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + android:layout_alignParentBottom="true"> <EditText android:id="@+id/custom_message" @@ -50,7 +58,7 @@ android:textCursorDrawable="@drawable/searchedittext_custom_cursor" android:layout_toStartOf="@+id/count_and_send_container" android:inputType="textShortMessage|textCapSentences" - android:imeOptions="actionSend"/> + android:imeOptions="flagNoExtractUi|actionSend"/> <LinearLayout android:id="@+id/count_and_send_container" @@ -80,4 +88,4 @@ android:textColor="@color/dialer_edit_text_hint_color"/> </LinearLayout> </RelativeLayout> -</LinearLayout>
\ No newline at end of file +</RelativeLayout>
\ No newline at end of file diff --git a/java/com/android/dialer/widget/res/values-bs/strings.xml b/java/com/android/dialer/widget/res/values-bs/strings.xml index 239c07412..539d5b44d 100644 --- a/java/com/android/dialer/widget/res/values-bs/strings.xml +++ b/java/com/android/dialer/widget/res/values-bs/strings.xml @@ -20,7 +20,7 @@ <string name="custom_message_hint" msgid="2179012696339457461">"Napišite prilagođenu poruku"</string> <string name="toolbar_close" msgid="1081308076149879833">"Zatvori"</string> <string name="all_contacts_empty" msgid="4260556610403994011">"Još nemate nijedan kontakt"</string> - <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Kreirajte novi kontakt"</string> + <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Kreiraj novi kontakt"</string> <string name="permission_single_turn_on" msgid="1306416016676232584">"Uključi"</string> <string name="permission_no_contacts" msgid="2388204904477299207">"Da vidite kontakte, uključite dozvolu za Kontakte."</string> <string name="add_contact_not_available" msgid="3083256438899321502">"Nije dostupna nijedna aplikacija za kontakte"</string> diff --git a/java/com/android/dialer/widget/res/values/dimens.xml b/java/com/android/dialer/widget/res/values/dimens.xml index 537ad7bd7..65963a6c4 100644 --- a/java/com/android/dialer/widget/res/values/dimens.xml +++ b/java/com/android/dialer/widget/res/values/dimens.xml @@ -23,12 +23,10 @@ <dimen name="send_container_width">48dp</dimen> <dimen name="toolbar_title_text_size">20sp</dimen> - <dimen name="toolbar_title_small_text_size">14sp</dimen> <dimen name="toolbar_subtitle_text_size">12sp</dimen> <dimen name="toolbar_elevation">4dp</dimen> <dimen name="toolbar_end_padding">4dp</dimen> <!-- Empty List --> - <dimen name="empty_list_message_top_padding">20dp</dimen> <dimen name="empty_list_message_text_size">16sp</dimen> </resources>
\ No newline at end of file |