diff options
author | calderwoodra <calderwoodra@google.com> | 2017-07-11 17:54:31 -0700 |
---|---|---|
committer | Eric Erfanian <erfanian@google.com> | 2017-07-13 13:58:28 -0700 |
commit | b3d73844bd131e6aa806ea44e00cd6c4cd715cda (patch) | |
tree | 6e30aa765212af7917f927a1dfb906b2e3bd97e6 | |
parent | b4b4b08f2232c686f93e899bacdbfd8600ff78e4 (diff) |
PostCallActivity edittext is not always visible on all screen sizes.
before: http://screen/DsVrM1vK89e
after: http://screen/RzGZvPTXRQb
Bug: 63093275
Test: manual
PiperOrigin-RevId: 161609906
Change-Id: If53681b9414dd79dba16371f42be437f1afa2729
4 files changed, 33 insertions, 26 deletions
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 15562476a..39c2d0d47 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 @@ -51,7 +51,6 @@ android:background="@color/call_composer_divider"/> <RelativeLayout - android:orientation="horizontal" android:layout_width="wrap_content" android:layout_height="wrap_content"> diff --git a/java/com/android/dialer/postcall/AndroidManifest.xml b/java/com/android/dialer/postcall/AndroidManifest.xml index 22c77dd93..7e69d3368 100644 --- a/java/com/android/dialer/postcall/AndroidManifest.xml +++ b/java/com/android/dialer/postcall/AndroidManifest.xml @@ -22,7 +22,6 @@ android:name="com.android.dialer.postcall.PostCallActivity" android:exported="false" android:theme="@style/DialerThemeBase.NoActionBar" - android:windowSoftInputMode="adjustResize" - android:screenOrientation="portrait"/> + android:windowSoftInputMode="adjustResize"/> </application> </manifest> diff --git a/java/com/android/dialer/postcall/res/layout/post_call_activity.xml b/java/com/android/dialer/postcall/res/layout/post_call_activity.xml index 256c110b9..c42764e5b 100644 --- a/java/com/android/dialer/postcall/res/layout/post_call_activity.xml +++ b/java/com/android/dialer/postcall/res/layout/post_call_activity.xml @@ -14,20 +14,21 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License --> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:background="@color/background_dialer_white" +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" android:layout_width="match_parent" - android:layout_height="match_parent"> - - <FrameLayout - android:id="@+id/message_container" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:background="@color/background_dialer_white"/> + android:layout_height="match_parent" + android:background="@color/background_dialer_white"> <com.android.dialer.widget.DialerToolbar android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="wrap_content"/> -</RelativeLayout>
\ No newline at end of file + + <FrameLayout + android:id="@+id/message_container" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/background_dialer_white"/> +</LinearLayout>
\ No newline at end of file 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 |