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

Commit 6cf1a663 authored by Craig Mautner's avatar Craig Mautner Committed by Android (Google) Code Review
Browse files

Merge "Call adjustWallpaperWindowsLocked once per pass."

parents a52b503b ae44659f

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+32 −32
Original line number Diff line number Diff line
@@ -58,15 +58,6 @@ import android.os.UEventObserver; 
import android.os.UserHandle;

import android.os.Vibrator;

import android.provider.Settings;



import com.android.internal.R;

import com.android.internal.policy.PolicyManager;

import com.android.internal.policy.impl.keyguard.KeyguardViewManager;

import com.android.internal.policy.impl.keyguard.KeyguardViewMediator;

import com.android.internal.statusbar.IStatusBarService;

import com.android.internal.telephony.ITelephony;

import com.android.internal.widget.PointerLocationView;



import android.util.DisplayMetrics;

import android.util.EventLog;

import android.util.Log;
@@ -82,43 +73,68 @@ import android.view.InputDevice; 
import android.view.InputEvent;

import android.view.InputEventReceiver;

import android.view.KeyCharacterMap;

import android.view.KeyCharacterMap.FallbackAction;

import android.view.KeyEvent;

import android.view.MotionEvent;

import android.view.WindowManagerGlobal;

import android.view.WindowOrientationListener;

import android.view.Surface;

import android.view.View;

import android.view.ViewConfiguration;

import android.view.Window;

import android.view.WindowManager;

import android.view.WindowManagerGlobal;

import android.view.WindowManagerPolicy;

import android.view.WindowOrientationListener;

import android.view.accessibility.AccessibilityEvent;

import android.view.animation.Animation;

import android.view.animation.AnimationUtils;



import com.android.internal.R;

import com.android.internal.policy.PolicyManager;

import com.android.internal.policy.impl.keyguard.KeyguardViewManager;

import com.android.internal.policy.impl.keyguard.KeyguardViewMediator;

import com.android.internal.statusbar.IStatusBarService;

import com.android.internal.telephony.ITelephony;

import com.android.internal.widget.PointerLocationView;



import java.io.File;

import java.io.FileReader;

import java.io.IOException;

import java.io.PrintWriter;



import static android.view.WindowManager.LayoutParams.FIRST_APPLICATION_WINDOW;

import static android.view.WindowManager.LayoutParams.FLAG_ALLOW_LOCK_WHILE_SCREEN_ON;

import static android.view.WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD;

import static android.view.WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN;

import static android.view.WindowManager.LayoutParams.FLAG_FULLSCREEN;

import static android.view.WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN;

import static android.view.WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR;

import static android.view.WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS;

import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED;

import static android.view.WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD;

import static android.view.WindowManager.LayoutParams.FLAG_ALLOW_LOCK_WHILE_SCREEN_ON;

import static android.view.WindowManager.LayoutParams.LAST_APPLICATION_WINDOW;

import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_SHOW_FOR_ALL_USERS;

import static android.view.WindowManager.LayoutParams.SOFT_INPUT_MASK_ADJUST;

import static android.view.WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE;

import static android.view.WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING;

import static android.view.WindowManager.LayoutParams.LAST_APPLICATION_WINDOW;

import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_ATTACHED_DIALOG;

import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_MEDIA;

import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_MEDIA_OVERLAY;

import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_PANEL;

import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_STARTING;

import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_SUB_PANEL;

import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_ATTACHED_DIALOG;

import static android.view.WindowManager.LayoutParams.TYPE_BOOT_PROGRESS;

import static android.view.WindowManager.LayoutParams.TYPE_DISPLAY_OVERLAY;

import static android.view.WindowManager.LayoutParams.TYPE_DRAG;

import static android.view.WindowManager.LayoutParams.TYPE_DREAM;

import static android.view.WindowManager.LayoutParams.TYPE_HIDDEN_NAV_CONSUMER;

import static android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD;

import static android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD_DIALOG;

import static android.view.WindowManager.LayoutParams.TYPE_KEYGUARD;

import static android.view.WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG;

import static android.view.WindowManager.LayoutParams.TYPE_MAGNIFICATION_OVERLAY;

import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR;

import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR_PANEL;

import static android.view.WindowManager.LayoutParams.TYPE_PHONE;

import static android.view.WindowManager.LayoutParams.TYPE_POINTER;

import static android.view.WindowManager.LayoutParams.TYPE_PRIORITY_PHONE;

import static android.view.WindowManager.LayoutParams.TYPE_RECENTS_OVERLAY;

import static android.view.WindowManager.LayoutParams.TYPE_SEARCH_BAR;
@@ -126,33 +142,17 @@ import static android.view.WindowManager.LayoutParams.TYPE_SECURE_SYSTEM_OVERLAY 
import static android.view.WindowManager.LayoutParams.TYPE_STATUS_BAR;

import static android.view.WindowManager.LayoutParams.TYPE_STATUS_BAR_PANEL;

import static android.view.WindowManager.LayoutParams.TYPE_STATUS_BAR_SUB_PANEL;

import static android.view.WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG;

import static android.view.WindowManager.LayoutParams.TYPE_SYSTEM_ALERT;

import static android.view.WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG;

import static android.view.WindowManager.LayoutParams.TYPE_SYSTEM_ERROR;

import static android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD;

import static android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD_DIALOG;

import static android.view.WindowManager.LayoutParams.TYPE_SYSTEM_OVERLAY;

import static android.view.WindowManager.LayoutParams.TYPE_TOAST;

import static android.view.WindowManager.LayoutParams.TYPE_UNIVERSE_BACKGROUND;

import static android.view.WindowManager.LayoutParams.TYPE_VOLUME_OVERLAY;

import static android.view.WindowManager.LayoutParams.TYPE_WALLPAPER;

import static android.view.WindowManager.LayoutParams.TYPE_POINTER;

import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR;

import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR_PANEL;

import static android.view.WindowManager.LayoutParams.TYPE_BOOT_PROGRESS;

import android.view.WindowManagerPolicy;

import static android.view.WindowManagerPolicy.WindowManagerFuncs.LID_ABSENT;

import static android.view.WindowManagerPolicy.WindowManagerFuncs.LID_OPEN;

import static android.view.WindowManagerPolicy.WindowManagerFuncs.LID_CLOSED;

import android.view.KeyCharacterMap.FallbackAction;

import android.view.accessibility.AccessibilityEvent;

import android.view.animation.Animation;

import android.view.animation.AnimationUtils;



import java.io.File;

import java.io.FileReader;

import java.io.IOException;

import java.io.PrintWriter;



/**

 * WindowManagerPolicy implementation for the Android phone UI.  This

services/java/com/android/server/am/ActivityManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -12372,7 +12372,7 @@ public final class ActivityManagerService extends ActivityManagerNative 
                }

                newConfig.seq = mConfigurationSeq;

                mConfiguration = newConfig;

                Slog.i(TAG, "Config changed: " + newConfig);

                Slog.i(TAG, "Config changes=" + Integer.toHexString(changes) + " " + newConfig);















                final Configuration configCopy = new Configuration(mConfiguration);















                

































services/java/com/android/server/wm/AppTransition.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -110,8 +110,8 @@ public class AppTransition implements Dump {













        return mAppTransitionReady;















    }





























    void setReady(boolean ready) {













        mAppTransitionReady = ready;













    void setReady() {













        mAppTransitionReady = true;















    }































    boolean isRunning() {

































services/java/com/android/server/wm/WindowAnimator.java



+4
−4




























Original line number
Diff line number
Diff line








@@ -54,10 +54,10 @@ public class WindowAnimator {













     * is a long initialized to Long.MIN_VALUE so that it doesn't match this value on startup. */















    private int mAnimTransactionSequence;





























    // Window currently running an animation that has requested it be detached













    // from the wallpaper.  This means we need to ensure the wallpaper is













    // visible behind it in case it animates in a way that would allow it to be













    // seen. If multiple windows satisfy this, use the lowest window.













    /** Window currently running an animation that has requested it be detached













     * from the wallpaper.  This means we need to ensure the wallpaper is













     * visible behind it in case it animates in a way that would allow it to be













     * seen. If multiple windows satisfy this, use the lowest window. */















    WindowState mWindowDetachedWallpaper = null;































    WindowStateAnimator mUniverseBackground = null;

































services/java/com/android/server/wm/WindowManagerService.java



+69
−132


























File changed.
Preview size limit exceeded, changes collapsed.