Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 385cb312 authored by wangqi's avatar wangqi Committed by android-build-merger
Browse files

Merge "Fix full screen issue when switching between RTT and voice call." 

am: 4bafd2b9

Change-Id: Id6f9e5e8fb1f06f22e67d86d57f0fe9cba8a8323
parents 8d4396b6 4bafd2b9

java/com/android/incallui/incall/impl/res/layout/frag_incall_voice.xml

+0 −3
Original line number Diff line number Diff line
@@ -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"

java/com/android/incallui/rtt/impl/RttChatFragment.java

+9 −1
Original line number Diff line number Diff line
@@ -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();

  }

java/com/android/incallui/rtt/impl/res/layout/frag_rtt_chat.xml

+2 −1
Original line number Diff line number Diff line
@@ -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"/>