Merge "Improved opening performance" (e6d714a6) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/qs/QSFooterImpl.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -45,6 +45,7 @@ import android.widget.Toast;
		import com.android.internal.logging.MetricsLogger;
		import com.android.internal.logging.nano.MetricsProto;
		import com.android.keyguard.KeyguardStatusView;
		import com.android.keyguard.KeyguardUpdateMonitor;
		import com.android.settingslib.Utils;
		import com.android.settingslib.drawable.UserIconDrawable;
		import com.android.systemui.Dependency;
		@@ -431,7 +432,7 @@ public class QSFooterImpl extends FrameLayout implements QSFooter,
		@Override
		public void onUserInfoChanged(String name, Drawable picture, String userAccount) {
		if (picture != null &&
		UserManager.get(mContext).isGuestUser(ActivityManager.getCurrentUser()) &&
		UserManager.get(mContext).isGuestUser(KeyguardUpdateMonitor.getCurrentUser()) &&
		!(picture instanceof UserIconDrawable)) {
		picture = picture.getConstantState().newDrawable(mContext.getResources()).mutate();
		picture.setColorFilter(

packages/SystemUI/src/com/android/systemui/qs/QSFragment.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -63,6 +63,7 @@ public class QSFragment extends Fragment implements QS {
		private QSContainerImpl mContainer;
		private int mLayoutDirection;
		private QSFooter mFooter;
		private float mLastQSExpansion = -1;

		@Override
		public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
		@@ -227,6 +228,7 @@ public class QSFragment extends Fragment implements QS {
		public void setKeyguardShowing(boolean keyguardShowing) {
		if (DEBUG) Log.d(TAG, "setKeyguardShowing " + keyguardShowing);
		mKeyguardShowing = keyguardShowing;
		mLastQSExpansion = -1;

		if (mQSAnimator != null) {
		mQSAnimator.setOnKeyguard(keyguardShowing);
		@@ -268,6 +270,10 @@ public class QSFragment extends Fragment implements QS {
		getView().setTranslationY(mKeyguardShowing ? (translationScaleY * height)
		: headerTranslation);
		}
		if (expansion == mLastQSExpansion) {
		return;
		}
		mLastQSExpansion = expansion;
		mHeader.setExpansion(mKeyguardShowing ? 1 : expansion);
		mFooter.setExpansion(mKeyguardShowing ? 1 : expansion);
		int heightDiff = mQSPanel.getBottom() - mHeader.getBottom() + mHeader.getPaddingBottom()

packages/SystemUI/src/com/android/systemui/statusbar/ExpandableOutlineView.java

+15 −4

Original line number	Diff line number	Diff line
		@@ -80,11 +80,22 @@ public abstract class ExpandableOutlineView extends ExpandableView {
		private final ViewOutlineProvider mProvider = new ViewOutlineProvider() {
		@Override
		public void getOutline(View view, Outline outline) {
		if (!mCustomOutline && mCurrentTopRoundness == 0.0f
		&& mCurrentBottomRoundness == 0.0f && !mAlwaysRoundBothCorners) {
		int translation = mShouldTranslateContents ? (int) getTranslation() : 0;
		int left = Math.max(translation + mCurrentSidePaddings, mCurrentSidePaddings);
		int top = mClipTopAmount + mBackgroundTop;
		int right = getWidth() - mCurrentSidePaddings + Math.min(translation, 0);
		int bottom = Math.max(getActualHeight() - mClipBottomAmount, top);
		outline.setRect(left, top, right, bottom);
		} else {
		Path clipPath = getClipPath();
		if (clipPath != null && clipPath.isConvex()) {
		// The path might not be convex in border cases where the view is small and clipped
		// The path might not be convex in border cases where the view is small and
		// clipped
		outline.setConvexPath(clipPath);
		}
		}
		outline.setAlpha(mOutlineAlpha);
		}
		};

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -102,7 +102,7 @@ public class KeyguardBouncer {
		return;
		}

		final int activeUserId = ActivityManager.getCurrentUser();
		final int activeUserId = KeyguardUpdateMonitor.getCurrentUser();
		final boolean isSystemUser =
		UserManager.isSplitSystemUser() && activeUserId == UserHandle.USER_SYSTEM;
		final boolean allowDismissKeyguard = !isSystemUser && activeUserId == keyguardUserId;

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

+42 −28

Original line number	Diff line number	Diff line
		@@ -3694,23 +3694,35 @@ public class StatusBar extends SystemUI implements DemoMode,
		* See also StatusBar.setPanelExpanded for another place where we attempt to do this.
		*/
		private void handleVisibleToUserChangedImpl(boolean visibleToUser) {
		try {
		if (visibleToUser) {
		boolean pinnedHeadsUp = mHeadsUpManager.hasPinnedHeadsUp();
		boolean clearNotificationEffects =
		!isPresenterFullyCollapsed() &&
		(mState == StatusBarState.SHADE \|\| mState == StatusBarState.SHADE_LOCKED);
		(mState == StatusBarState.SHADE
		\|\| mState == StatusBarState.SHADE_LOCKED);
		int notificationLoad = mNotificationData.getActiveNotifications().size();
		if (pinnedHeadsUp && isPresenterFullyCollapsed()) {
		notificationLoad = 1;
		}
		mBarService.onPanelRevealed(clearNotificationEffects, notificationLoad);
		final int finalNotificationLoad = notificationLoad;
		mUiOffloadThread.submit(() -> {
		try {
		mBarService.onPanelRevealed(clearNotificationEffects,
		finalNotificationLoad);
		} catch (RemoteException ex) {
		// Won't fail unless the world has ended.
		}
		});
		} else {
		mUiOffloadThread.submit(() -> {
		try {
		mBarService.onPanelHidden();
		}
		} catch (RemoteException ex) {
		// Won't fail unless the world has ended.
		}
		});
		}

		}

		private void stopNotificationLogging() {
		@@ -3746,6 +3758,7 @@ public class StatusBar extends SystemUI implements DemoMode,
		newlyVisible.toArray(new NotificationVisibility[newlyVisible.size()]);
		NotificationVisibility[] noLongerVisibleAr =
		noLongerVisible.toArray(new NotificationVisibility[noLongerVisible.size()]);
		mUiOffloadThread.submit(() -> {
		try {
		mBarService.onNotificationVisibilityChanged(newlyVisibleAr, noLongerVisibleAr);
		} catch (RemoteException e) {
		@@ -3761,6 +3774,7 @@ public class StatusBar extends SystemUI implements DemoMode,

		setNotificationsShown(newlyVisibleKeyAr);
		}
		});
		}

		// State logging