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

Commit e46eb27d authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Merge "Add dump information for divider" into nyc-dev am:... 

Merge "Merge "Merge "Add dump information for divider" into nyc-dev am: f28b2341 am: e124190b" into nyc-mr1-dev-plus-aosp am: 90484fa1"
parents 0180997c 338f5d00

packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java

+10 −0
Original line number Original line Diff line number Diff line
@@ -30,6 +30,9 @@ import com.android.systemui.recents.misc.SystemServicesProxy; 
import static android.content.res.Configuration.ORIENTATION_LANDSCAPE;

import static android.content.res.Configuration.ORIENTATION_LANDSCAPE;

import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;

import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;





import java.io.FileDescriptor;

import java.io.PrintWriter;



/**

/**

 * Controls the docked stack divider.

 * Controls the docked stack divider.

 */

 */
@@ -134,6 +137,13 @@ public class Divider extends SystemUI { 
        mWindowManager.setTouchable(!mMinimized && !mAdjustedForIme);

        mWindowManager.setTouchable(!mMinimized && !mAdjustedForIme);

    }

    }





    @Override

    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

        pw.print("  mVisible="); pw.println(mVisible);

        pw.print("  mMinimized="); pw.println(mMinimized);

        pw.print("  mAdjustedForIme="); pw.println(mAdjustedForIme);

    }



    class DockDividerVisibilityListener extends IDockedStackListener.Stub {

    class DockDividerVisibilityListener extends IDockedStackListener.Stub {





        @Override

        @Override

services/core/java/com/android/server/wm/DisplayContent.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -603,6 +603,8 @@ class DisplayContent { 
        }

        }

        pw.println();

        pw.println();

        mDimLayerController.dump(prefix + "  ", pw);

        mDimLayerController.dump(prefix + "  ", pw);

        pw.println();

        mDividerControllerLocked.dump(prefix + "  ", pw);

    }

    }





    @Override

    @Override

services/core/java/com/android/server/wm/DockedStackDividerController.java

+13 −0
Original line number Original line Diff line number Diff line
@@ -44,6 +44,7 @@ import android.view.animation.PathInterpolator; 
import com.android.server.wm.DimLayer.DimLayerUser;

import com.android.server.wm.DimLayer.DimLayerUser;

import com.android.server.wm.WindowManagerService.H;

import com.android.server.wm.WindowManagerService.H;





import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.ArrayList;





/**

/**
@@ -692,4 +693,16 @@ public class DockedStackDividerController implements DimLayerUser { 
    WindowState getWindow() {

    WindowState getWindow() {

        return mWindow;

        return mWindow;

    }

    }



    void dump(String prefix, PrintWriter pw) {

        pw.println(prefix + "DockedStackDividerController");

        pw.println(prefix + "  mLastVisibility=" + mLastVisibility);

        pw.println(prefix + "  mMinimizedDock=" + mMinimizedDock);

        pw.println(prefix + "  mAdjustedForIme=" + mAdjustedForIme);

        pw.println(prefix + "  mAdjustedForDivider=" + mAdjustedForDivider);

        if (mDimLayer.isDimming()) {

            pw.println(prefix + "  Dim layer is dimming: ");

            mDimLayer.printTo(prefix + "    ", pw);

        }

    }

}
 
}