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

Commit 11090061 authored by Andreas Gampe's avatar Andreas Gampe
Browse files

resolved conflicts for merge of 038b8462 to master 

Change-Id: I394b152c3cfe8368e87fc4bc57566b410c96b554
parents 0e22acb6 038b8462

core/java/android/view/WindowManager.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -1989,7 +1989,8 @@ public interface WindowManager extends ViewManager { 
            if (userActivityTimeout >= 0) {

            if (userActivityTimeout >= 0) {

                sb.append(" userActivityTimeout=").append(userActivityTimeout);

                sb.append(" userActivityTimeout=").append(userActivityTimeout);

            }

            }

            if (!surfaceInsets.equals(Insets.NONE) || hasManualSurfaceInsets) {

            if (surfaceInsets.left != 0 || surfaceInsets.top != 0 || surfaceInsets.right != 0 ||

                    surfaceInsets.bottom != 0 || hasManualSurfaceInsets) {

                sb.append(" surfaceInsets=").append(surfaceInsets);

                sb.append(" surfaceInsets=").append(surfaceInsets);

                if (hasManualSurfaceInsets) {

                if (hasManualSurfaceInsets) {

                    sb.append(" (manual)");

                    sb.append(" (manual)");