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

Commit 5c529940 authored by Bryce Lee's avatar Bryce Lee Committed by Android (Google) Code Review
Browse files

Merge "Make CommunalSurface fullscreen and at the correct z-order level."

parents 12450fe7 0a7733f1

packages/SystemUI/res/layout/communal_host_view.xml

+2 −9
Original line number Diff line number Diff line
@@ -18,13 +18,6 @@ 
<!-- This is a view that shows general status information in Keyguard. -->

<com.android.systemui.communal.CommunalHostView

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:systemui="http://schemas.android.com/apk/res-auto"

    android:id="@+id/communal_host"

    android:orientation="vertical"

    systemui:layout_constraintEnd_toEndOf="parent"

    systemui:layout_constraintStart_toStartOf="parent"

    systemui:layout_constraintTop_toTopOf="parent"

    systemui:layout_constraintBottom_toBottomOf="parent"

    systemui:layout_constraintHeight_percent="@dimen/communal_source_height_percentage"

    android:layout_width="0dp"

    android:layout_height="0dp"/>
 
 No newline at end of file
 
    android:layout_width="match_parent"

    android:layout_height="match_parent"/>
 
 No newline at end of file

packages/SystemUI/res/layout/status_bar_expanded.xml

+4 −3
Original line number Diff line number Diff line
@@ -25,6 +25,10 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:background="@android:color/transparent">



    <include layout="@layout/communal_host_view"

             android:visibility="gone"/>



    <FrameLayout

        android:id="@+id/big_clock_container"

        android:layout_width="match_parent"
@@ -125,9 +129,6 @@ 
            systemui:layout_constraintEnd_toEndOf="parent"

        />



        <include layout="@layout/communal_host_view"

                 android:visibility="gone"/>



        <include layout="@layout/ambient_indication"

            android:id="@+id/ambient_indication_container" />

packages/SystemUI/src/com/android/systemui/communal/service/CommunalSurfaceViewController.java

+1 −7
Original line number Diff line number Diff line
@@ -124,8 +124,7 @@ public class CommunalSurfaceViewController extends ViewController<SurfaceView> { 
    }



    @Override

    public void init() {

        super.init();

    protected void onInit() {

        mView.getHolder().addCallback(mSurfaceHolderCallback);

        mView.addOnLayoutChangeListener(mOnLayoutChangeListener);

    }
@@ -164,9 +163,6 @@ public class CommunalSurfaceViewController extends ViewController<SurfaceView> { 
            mNotificationShadeWindowController.setTouchExclusionRegion(emptyRegion);

            emptyRegion.recycle();

        }

        // TODO(b/197036940): This is no longer necessary once the surface view is not on top of the

        // z-order.

        mView.setZOrderOnTop(excludeTouches);

    }



    private void showSurface(boolean show) {
@@ -208,8 +204,6 @@ public class CommunalSurfaceViewController extends ViewController<SurfaceView> { 


                    if (surfacePackage != null) {

                        mView.setChildSurfacePackage(surfacePackage);

                        mView.setZOrderOnTop(true);

                        mView.setUseAlpha();

                        mView.postInvalidate();

                        mCommunalStateController.setCommunalViewShowing(true);

                    } else {