diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-03-14 02:02:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-03-14 02:02:16 +0000 |
| commit | 4bafd2b91f5a563e28030cfdef18cbf64f0acc36 (patch) | |
| tree | a5725aea8e81b1a8efd7a9a46ecb718b03825490 | |
| parent | 04b0840f3fffb870b9325203837babd220d7f055 (diff) | |
| parent | f6c6f3befd928800dd5382eab106f6f2bab5cb08 (diff) | |
Merge "Fix full screen issue when switching between RTT and voice call."
3 files changed, 11 insertions, 5 deletions
diff --git a/java/com/android/incallui/incall/impl/res/layout/frag_incall_voice.xml b/java/com/android/incallui/incall/impl/res/layout/frag_incall_voice.xml index ccec8a4a4..2c6ee0d15 100644 --- a/java/com/android/incallui/incall/impl/res/layout/frag_incall_voice.xml +++ b/java/com/android/incallui/incall/impl/res/layout/frag_incall_voice.xml @@ -22,9 +22,6 @@ android:layout_height="match_parent"> <RelativeLayout - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" android:clipChildren="false" diff --git a/java/com/android/incallui/rtt/impl/RttChatFragment.java b/java/com/android/incallui/rtt/impl/RttChatFragment.java index e35ff4d73..3b943c431 100644 --- a/java/com/android/incallui/rtt/impl/RttChatFragment.java +++ b/java/com/android/incallui/rtt/impl/RttChatFragment.java @@ -152,6 +152,11 @@ public class RttChatFragment extends Fragment public View onCreateView( LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) { View view = inflater.inflate(R.layout.frag_rtt_chat, container, false); + view.setSystemUiVisibility( + View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN + | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION + | View.SYSTEM_UI_FLAG_LAYOUT_STABLE + | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR); editText = view.findViewById(R.id.rtt_chat_input); editText.setOnEditorActionListener(this); editText.addTextChangedListener(this); @@ -278,11 +283,14 @@ public class RttChatFragment extends Fragment Window window = getActivity().getWindow(); window.setStatusBarColor(activity.getColor(R.color.rtt_status_bar_color)); window.setNavigationBarColor(activity.getColor(R.color.rtt_navigation_bar_color)); - window.getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR); } @Override public void onRttScreenStop() { + Activity activity = getActivity(); + Window window = getActivity().getWindow(); + window.setStatusBarColor(activity.getColor(android.R.color.transparent)); + window.setNavigationBarColor(activity.getColor(android.R.color.transparent)); rttCallScreenDelegate.onRttCallScreenUiUnready(); } 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 3194b75bc..6940569a3 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 @@ -16,7 +16,8 @@ --> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:fitsSystemWindows="true"> <include layout="@layout/rtt_banner"/> |