Snap for 6052638 from 297a84231f594c686faad3d549eb61e78a2d0c72 to qt-qpr2-release (002c8d36) · Commits · e / os / android_frameworks_base

Android.bp

+0 −2

packages/SystemUI/src/com/android/systemui/glwallpaper/ImageRevealHelper.java

+4 −8

Original line number	Original line	Diff line number	Diff line
	@@ -81,12 +81,6 @@ class ImageRevealHelper {
	});		});
	}		}

	private void animate() {
	mAnimator.cancel();
	mAnimator.setFloatValues(mReveal, mAwake ? MAX_REVEAL : MIN_REVEAL);
	mAnimator.start();
	}

	public float getReveal() {		public float getReveal() {
	return mReveal;		return mReveal;
	}		}
	@@ -95,8 +89,8 @@ class ImageRevealHelper {
	if (DEBUG) {		if (DEBUG) {
	Log.d(TAG, "updateAwake: awake=" + awake + ", duration=" + duration);		Log.d(TAG, "updateAwake: awake=" + awake + ", duration=" + duration);
	}		}
			mAnimator.cancel();
	mAwake = awake;		mAwake = awake;
	mAnimator.setDuration(duration);
	if (duration == 0) {		if (duration == 0) {
	// We are transiting from home to aod or aod to home directly,		// We are transiting from home to aod or aod to home directly,
	// we don't need to do transition in these cases.		// we don't need to do transition in these cases.
	@@ -105,7 +99,9 @@ class ImageRevealHelper {
	mRevealListener.onRevealStateChanged();		mRevealListener.onRevealStateChanged();
	mRevealListener.onRevealEnd();		mRevealListener.onRevealEnd();
	} else {		} else {
	animate();		mAnimator.setDuration(duration);
			mAnimator.setFloatValues(mReveal, mAwake ? MAX_REVEAL : MIN_REVEAL);
			mAnimator.start();
	}		}
	}		}

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

+5 −3

Original line number	Original line	Diff line number	Diff line
	@@ -2638,7 +2638,7 @@ public class StatusBar extends SystemUI implements DemoMode,
	if (mRemoteInputManager.getController() != null) {		if (mRemoteInputManager.getController() != null) {
	mRemoteInputManager.getController().closeRemoteInputs();		mRemoteInputManager.getController().closeRemoteInputs();
	}		}
	if (mBubbleController.isStackExpanded()) {		if (mBubbleController != null && mBubbleController.isStackExpanded()) {
	mBubbleController.collapseStack();		mBubbleController.collapseStack();
	}		}
	if (mLockscreenUserManager.isCurrentProfile(getSendingUserId())) {		if (mLockscreenUserManager.isCurrentProfile(getSendingUserId())) {
	@@ -2654,7 +2654,7 @@ public class StatusBar extends SystemUI implements DemoMode,
	if (mStatusBarWindowController != null) {		if (mStatusBarWindowController != null) {
	mStatusBarWindowController.setNotTouchable(false);		mStatusBarWindowController.setNotTouchable(false);
	}		}
	if (mBubbleController.isStackExpanded()) {		if (mBubbleController != null && mBubbleController.isStackExpanded()) {
	mBubbleController.collapseStack();		mBubbleController.collapseStack();
	}		}
	finishBarAnimations();		finishBarAnimations();
	@@ -3386,8 +3386,10 @@ public class StatusBar extends SystemUI implements DemoMode,
	if (mNotificationPanel.canPanelBeCollapsed()) {		if (mNotificationPanel.canPanelBeCollapsed()) {
	animateCollapsePanels();		animateCollapsePanels();
	} else {		} else {
			if (mBubbleController != null) {
	mBubbleController.performBackPressIfNeeded();		mBubbleController.performBackPressIfNeeded();
	}		}
			}
	return true;		return true;
	}		}
	if (mKeyguardUserSwitcher != null && mKeyguardUserSwitcher.hideIfNotSimple(true)) {		if (mKeyguardUserSwitcher != null && mKeyguardUserSwitcher.hideIfNotSimple(true)) {

Original line number	Original line	Diff line number	Diff line
	@@ -321,7 +321,6 @@ java_defaults {
	"core/java/android/service/vr/IVrManager.aidl",		"core/java/android/service/vr/IVrManager.aidl",
	"core/java/android/service/vr/IVrStateCallbacks.aidl",		"core/java/android/service/vr/IVrStateCallbacks.aidl",
	"core/java/android/service/watchdog/IExplicitHealthCheckService.aidl",		"core/java/android/service/watchdog/IExplicitHealthCheckService.aidl",
	"core/java/android/service/watchdog/PackageConfig.aidl",
	"core/java/android/print/ILayoutResultCallback.aidl",		"core/java/android/print/ILayoutResultCallback.aidl",
	"core/java/android/print/IPrinterDiscoveryObserver.aidl",		"core/java/android/print/IPrinterDiscoveryObserver.aidl",
	"core/java/android/print/IPrintDocumentAdapter.aidl",		"core/java/android/print/IPrintDocumentAdapter.aidl",
	@@ -440,7 +439,6 @@ java_defaults {
	"core/java/com/android/internal/os/IShellCallback.aidl",		"core/java/com/android/internal/os/IShellCallback.aidl",
	"core/java/com/android/internal/statusbar/IStatusBar.aidl",		"core/java/com/android/internal/statusbar/IStatusBar.aidl",
	"core/java/com/android/internal/statusbar/IStatusBarService.aidl",		"core/java/com/android/internal/statusbar/IStatusBarService.aidl",
	"core/java/com/android/internal/statusbar/RegisterStatusBarResult.aidl",
	"core/java/com/android/internal/textservice/ISpellCheckerService.aidl",		"core/java/com/android/internal/textservice/ISpellCheckerService.aidl",
	"core/java/com/android/internal/textservice/ISpellCheckerServiceCallback.aidl",		"core/java/com/android/internal/textservice/ISpellCheckerServiceCallback.aidl",
	"core/java/com/android/internal/textservice/ISpellCheckerSession.aidl",		"core/java/com/android/internal/textservice/ISpellCheckerSession.aidl",