Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge "Add dump information for divider" into nyc-dev am: f28b23416e am: e124190bc1" into nyc-mr1-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2016-05-05 00:11:00 +00:00
committed by Android (Google) Code Review
parent 58ee03944a 7c7c3e1d46
commit 90484fa1cc
3 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java
View File

@@ -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

2
services/core/java/com/android/server/wm/DisplayContent.java
View File

@@ -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

13
services/core/java/com/android/server/wm/DockedStackDividerController.java
View File

@@ -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);
}
}
} }