diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-02-27 21:06:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-02-27 21:06:05 +0000 |
| commit | 82393b8382b39fbbf94cb2fcc7fc61b1cb62588d (patch) | |
| tree | 2f3dce168d8d53abaeddd2ee9f6a19ce2ba0f774 /java/com/android/incallui | |
| parent | 46cdf805e07c90ef54ead2a53e5b770e5a5928d1 (diff) | |
| parent | a4a4df959c4163a99b43858c6f1cc50c403c644d (diff) | |
Merge changes I09e8be0d,Ic94816e1
* changes:
Fix bug that soft keyboard pushes action bar out of window.
Added 2 null checks to fix top crashers.
Diffstat (limited to 'java/com/android/incallui')
| -rw-r--r-- | java/com/android/incallui/AndroidManifest.xml | 3 | ||||
| -rw-r--r-- | java/com/android/incallui/rtt/impl/res/layout/frag_rtt_chat.xml | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/java/com/android/incallui/AndroidManifest.xml b/java/com/android/incallui/AndroidManifest.xml index eb080bc82..a45330b73 100644 --- a/java/com/android/incallui/AndroidManifest.xml +++ b/java/com/android/incallui/AndroidManifest.xml @@ -63,7 +63,8 @@ android:resizeableActivity="true" android:screenOrientation="nosensor" android:taskAffinity="com.android.incallui" - android:theme="@style/Theme.InCallScreen"> + android:theme="@style/Theme.InCallScreen" + android:windowSoftInputMode="adjustResize"> </activity> <activity diff --git a/java/com/android/incallui/rtt/impl/res/layout/frag_rtt_chat.xml b/java/com/android/incallui/rtt/impl/res/layout/frag_rtt_chat.xml index 5ba9f4ee8..ef3c1f91a 100644 --- a/java/com/android/incallui/rtt/impl/res/layout/frag_rtt_chat.xml +++ b/java/com/android/incallui/rtt/impl/res/layout/frag_rtt_chat.xml @@ -17,8 +17,7 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/dialer_theme_color" - android:fitsSystemWindows="true"> + android:background="@color/dialer_theme_color"> <include layout="@layout/rtt_banner"/> |