Merge changes I1d04a92e,I8d7596fa,If63c5434 into nyc-mr2-dev (c687aa08) · Commits · e / os / android_frameworks_base

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

+40 −25

Original line number	Diff line number	Diff line
		@@ -103,6 +103,7 @@ import com.android.systemui.assist.AssistManager;
		import com.android.systemui.recents.Recents;
		import com.android.systemui.statusbar.NotificationData.Entry;
		import com.android.systemui.statusbar.NotificationGuts.OnGutsClosedListener;
		import com.android.systemui.statusbar.notification.VisualStabilityManager;
		import com.android.systemui.statusbar.phone.NavigationBarView;
		import com.android.systemui.statusbar.phone.NotificationGroupManager;
		import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;
		@@ -118,14 +119,14 @@ import java.util.HashSet;
		import java.util.List;
		import java.util.Locale;
		import java.util.Set;
		import java.util.Stack;

		import static android.service.notification.NotificationListenerService.Ranking.IMPORTANCE_HIGH;

		public abstract class BaseStatusBar extends SystemUI implements
		CommandQueue.Callbacks, ActivatableNotificationView.OnActivatedListener,
		ExpandableNotificationRow.ExpansionLogger, NotificationData.Environment,
		ExpandableNotificationRow.OnExpandClickListener,
		OnGutsClosedListener {
		ExpandableNotificationRow.OnExpandClickListener, OnGutsClosedListener {
		public static final String TAG = "StatusBar";
		public static final boolean DEBUG = false;
		public static final boolean MULTIUSER_DEBUG = false;
		@@ -179,6 +180,9 @@ public abstract class BaseStatusBar extends SystemUI implements
		// for heads up notifications
		protected HeadsUpManager mHeadsUpManager;

		// handling reordering
		protected VisualStabilityManager mVisualStabilityManager = new VisualStabilityManager();

		protected int mCurrentUserId = 0;
		final protected SparseArray<UserInfo> mCurrentProfiles = new SparseArray<UserInfo>();

		@@ -979,12 +983,12 @@ public abstract class BaseStatusBar extends SystemUI implements
		// Accessibility feedback
		v.announceForAccessibility(
		mContext.getString(R.string.accessibility_notification_dismissed));
		performRemoveNotification(row.getStatusBarNotification(), false /* removeView */);
		performRemoveNotification(row.getStatusBarNotification());
		}
		});
		}

		protected void performRemoveNotification(StatusBarNotification n, boolean removeView) {
		protected void performRemoveNotification(StatusBarNotification n) {
		final String pkg = n.getPackageName();
		final String tag = n.getTag();
		final int id = n.getId();
		@@ -994,14 +998,8 @@ public abstract class BaseStatusBar extends SystemUI implements
		if (FORCE_REMOTE_INPUT_HISTORY
		&& mKeysKeptForRemoteInput.contains(n.getKey())) {
		mKeysKeptForRemoteInput.remove(n.getKey());
		removeView = true;
		}
		if (mRemoteInputEntriesToRemoveOnCollapse.remove(mNotificationData.get(n.getKey()))) {
		removeView = true;
		}
		if (removeView) {
		removeNotification(n.getKey(), null);
		}

		} catch (RemoteException ex) {
		// system process is dead if we're here.
		@@ -2000,8 +1998,7 @@ public abstract class BaseStatusBar extends SystemUI implements
		Runnable removeRunnable = new Runnable() {
		@Override
		public void run() {
		performRemoveNotification(parentToCancelFinal,
		true);
		performRemoveNotification(parentToCancelFinal);
		}
		};
		if (isCollapsing()) {
		@@ -2252,9 +2249,8 @@ public abstract class BaseStatusBar extends SystemUI implements
		*/
		protected void updateRowStates() {
		mKeyguardIconOverflowContainer.getIconsView().removeAllViews();
		final int N = mStackScroller.getChildCount();

		ArrayList<Entry> activeNotifications = mNotificationData.getActiveNotifications();
		final int N = activeNotifications.size();

		int visibleNotifications = 0;
		boolean onKeyguard = mState == StatusBarState.KEYGUARD;
		@@ -2262,14 +2258,23 @@ public abstract class BaseStatusBar extends SystemUI implements
		if (onKeyguard) {
		maxNotifications = getMaxKeyguardNotifications(true /* recompute */);
		}
		for (int i = 0; i < N; i++) {
		NotificationData.Entry entry = activeNotifications.get(i);
		Stack<ExpandableNotificationRow> stack = new Stack<>();
		for (int i = N - 1; i >= 0; i--) {
		View child = mStackScroller.getChildAt(i);
		if (!(child instanceof ExpandableNotificationRow)) {
		continue;
		}
		stack.push((ExpandableNotificationRow) child);
		}
		while(!stack.isEmpty()) {
		ExpandableNotificationRow row = stack.pop();
		NotificationData.Entry entry = row.getEntry();
		boolean childNotification = mGroupManager.isChildInGroupWithSummary(entry.notification);
		if (onKeyguard) {
		entry.row.setOnKeyguard(true);
		row.setOnKeyguard(true);
		} else {
		entry.row.setOnKeyguard(false);
		entry.row.setSystemExpanded(visibleNotifications == 0 && !childNotification);
		row.setOnKeyguard(false);
		row.setSystemExpanded(visibleNotifications == 0 && !childNotification);
		}
		boolean suppressedSummary = mGroupManager.isSummaryOfSuppressedGroup(
		entry.notification) && !entry.row.isRemoved();
		@@ -2286,7 +2291,9 @@ public abstract class BaseStatusBar extends SystemUI implements
		}
		} else {
		boolean wasGone = entry.row.getVisibility() == View.GONE;
		if (wasGone) {
		entry.row.setVisibility(View.VISIBLE);
		}
		if (!childNotification && !entry.row.isRemoved()) {
		if (wasGone) {
		// notify the scroller of a child addition
		@@ -2296,6 +2303,14 @@ public abstract class BaseStatusBar extends SystemUI implements
		visibleNotifications++;
		}
		}
		if (row.isSummaryWithChildren()) {
		List<ExpandableNotificationRow> notificationChildren =
		row.getNotificationChildren();
		int size = notificationChildren.size();
		for (int i = size - 1; i >= 0; i--) {
		stack.push(notificationChildren.get(i));
		}
		}
		}

		mStackScroller.updateOverflowContainerVisibility(onKeyguard
		@@ -2533,9 +2548,7 @@ public abstract class BaseStatusBar extends SystemUI implements
		return false;
		}

		boolean inUse = mPowerManager.isScreenOn()
		&& (!mStatusBarKeyguardViewManager.isShowing()
		\|\| mStatusBarKeyguardViewManager.isOccluded());
		boolean inUse = mPowerManager.isScreenOn();
		try {
		inUse = inUse && !mDreamManager.isDreaming();
		} catch (RemoteException e) {
		@@ -2574,7 +2587,9 @@ public abstract class BaseStatusBar extends SystemUI implements
		if (DEBUG) Log.d(TAG, "No peeking: accessible fullscreen: " + sbn.getKey());
		return false;
		} else {
		return true;
		// we only allow head-up on the lockscreen if it doesn't have a fullscreen intent
		return !mStatusBarKeyguardViewManager.isShowing()
		\|\| mStatusBarKeyguardViewManager.isOccluded();
		}
		}

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

+15 −5

Original line number	Diff line number	Diff line
		@@ -48,6 +48,7 @@ import com.android.internal.util.NotificationColorUtil;
		import com.android.systemui.R;
		import com.android.systemui.classifier.FalsingManager;
		import com.android.systemui.statusbar.notification.HybridNotificationView;
		import com.android.systemui.statusbar.notification.VisualStabilityManager;
		import com.android.systemui.statusbar.phone.NotificationGroupManager;
		import com.android.systemui.statusbar.policy.HeadsUpManager;
		import com.android.systemui.statusbar.stack.NotificationChildrenContainer;
		@@ -318,6 +319,10 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
		return mStatusBarNotification;
		}

		public NotificationData.Entry getEntry() {
		return mEntry;
		}

		public boolean isHeadsUp() {
		return mIsHeadsUp;
		}
		@@ -451,10 +456,15 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
		* Apply the order given in the list to the children.
		*
		* @param childOrder the new list order
		* @param visualStabilityManager
		* @param callback the callback to invoked in case it is not allowed
		* @return whether the list order has changed
		*/
		public boolean applyChildOrder(List<ExpandableNotificationRow> childOrder) {
		return mChildrenContainer != null && mChildrenContainer.applyChildOrder(childOrder);
		public boolean applyChildOrder(List<ExpandableNotificationRow> childOrder,
		VisualStabilityManager visualStabilityManager,
		VisualStabilityManager.Callback callback) {
		return mChildrenContainer != null && mChildrenContainer.applyChildOrder(childOrder,
		visualStabilityManager, callback);
		}

		public void getChildrenStates(StackScrollState resultState) {
		@@ -1205,7 +1215,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
		return getMinHeight();
		} else if (mIsSummaryWithChildren && !mOnKeyguard) {
		return mChildrenContainer.getIntrinsicHeight();
		} else if (mIsHeadsUp \|\| mHeadsupDisappearRunning) {
		} else if (!mOnKeyguard && (mIsHeadsUp \|\| mHeadsupDisappearRunning)) {
		if (isPinned() \|\| mHeadsupDisappearRunning) {
		return getPinnedHeadsUpHeight(true /* atLeastMinHeight */);
		} else if (isExpanded()) {
		@@ -1504,11 +1514,11 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {

		@Override
		public int getMinHeight() {
		if (mIsHeadsUp && mHeadsUpManager.isTrackingHeadsUp()) {
		if (!mOnKeyguard && mIsHeadsUp && mHeadsUpManager.isTrackingHeadsUp()) {
		return getPinnedHeadsUpHeight(false /* atLeastMinHeight */);
		} else if (mIsSummaryWithChildren && !isGroupExpanded() && !mShowingPublic) {
		return mChildrenContainer.getMinHeight();
		} else if (mIsHeadsUp) {
		} else if (!mOnKeyguard && mIsHeadsUp) {
		return mHeadsUpHeight;
		}
		NotificationContentView showingLayout = getShowingLayout();

packages/SystemUI/src/com/android/systemui/statusbar/notification/VisibilityLocationProvider.java

0 → 100644

+30 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2016 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License
		*/

		package com.android.systemui.statusbar.notification;

		import com.android.systemui.statusbar.ExpandableNotificationRow;

		/**
		* An object that can determine the visibility of a Notification.
		*/
		public interface VisibilityLocationProvider {

		/**
		* @return whether the view is in a visible location right now.
		*/
		boolean isInVisibleLocation(ExpandableNotificationRow row);
		}

packages/SystemUI/src/com/android/systemui/statusbar/notification/VisualStabilityManager.java

0 → 100644

+147 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2016 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License
		*/

		package com.android.systemui.statusbar.notification;

		import android.util.ArraySet;
		import android.view.View;

		import com.android.systemui.statusbar.ExpandableNotificationRow;
		import com.android.systemui.statusbar.NotificationData;
		import com.android.systemui.statusbar.policy.OnHeadsUpChangedListener;

		import java.util.ArrayList;

		/**
		* A manager that ensures that notifications are visually stable. It will suppress reorderings
		* and reorder at the right time when they are out of view.
		*/
		public class VisualStabilityManager implements OnHeadsUpChangedListener {

		private final ArrayList<Callback> mCallbacks = new ArrayList<>();

		private boolean mPanelExpanded;
		private boolean mScreenOn;
		private boolean mReorderingAllowed;
		private VisibilityLocationProvider mVisibilityLocationProvider;
		private ArraySet<View> mAllowedReorderViews = new ArraySet<>();
		private ArraySet<View> mAddedChildren = new ArraySet<>();

		/**
		* Add a callback to invoke when reordering is allowed again.
		* @param callback
		*/
		public void addReorderingAllowedCallback(Callback callback) {
		if (mCallbacks.contains(callback)) {
		return;
		}
		mCallbacks.add(callback);
		}

		/**
		* Set the panel to be expanded.
		*/
		public void setPanelExpanded(boolean expanded) {
		mPanelExpanded = expanded;
		updateReorderingAllowed();
		}

		/**
		* @param screenOn whether the screen is on
		*/
		public void setScreenOn(boolean screenOn) {
		mScreenOn = screenOn;
		updateReorderingAllowed();
		}

		private void updateReorderingAllowed() {
		boolean reorderingAllowed = !mScreenOn \|\| !mPanelExpanded;
		boolean changed = reorderingAllowed && !mReorderingAllowed;
		mReorderingAllowed = reorderingAllowed;
		if (changed) {
		notifyCallbacks();
		}
		}

		private void notifyCallbacks() {
		for (int i = 0; i < mCallbacks.size(); i++) {
		Callback callback = mCallbacks.get(i);
		callback.onReorderingAllowed();
		}
		mCallbacks.clear();
		}

		/**
		* @return whether reordering is currently allowed in general.
		*/
		public boolean isReorderingAllowed() {
		return mReorderingAllowed;
		}

		/**
		* @return whether a specific notification is allowed to reorder. Certain notifications are
		* allowed to reorder even if {@link #isReorderingAllowed()} returns false, like newly added
		* notifications or heads-up notifications that are out of view.
		*/
		public boolean canReorderNotification(ExpandableNotificationRow row) {
		if (mReorderingAllowed) {
		return true;
		}
		if (mAddedChildren.contains(row)) {
		return true;
		}
		if (mAllowedReorderViews.contains(row)
		&& !mVisibilityLocationProvider.isInVisibleLocation(row)) {
		return true;
		}
		return false;
		}

		public void setVisibilityLocationProvider(
		VisibilityLocationProvider visibilityLocationProvider) {
		mVisibilityLocationProvider = visibilityLocationProvider;
		}

		public void onReorderingFinished() {
		mAllowedReorderViews.clear();
		mAddedChildren.clear();
		}

		@Override
		public void onHeadsUpStateChanged(NotificationData.Entry entry, boolean isHeadsUp) {
		if (isHeadsUp) {
		// Heads up notifications should in general be allowed to reorder if they are out of
		// view and stay at the current location if they aren't.
		mAllowedReorderViews.add(entry.row);
		}
		}

		/**
		* Notify the visual stability manager that a new view was added and should be allowed to
		* reorder next time.
		*/
		public void notifyViewAddition(View view) {
		mAddedChildren.add(view);
		}

		public interface Callback {
		/**
		* Called when reordering is allowed again.
		*/
		void onReorderingAllowed();
		}

		}

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ import com.android.systemui.statusbar.ExpandableNotificationRow;
		import com.android.systemui.statusbar.NotificationData;
		import com.android.systemui.statusbar.StatusBarState;
		import com.android.systemui.statusbar.policy.HeadsUpManager;
		import com.android.systemui.statusbar.policy.OnHeadsUpChangedListener;

		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		@@ -35,7 +36,7 @@ import java.util.Map;
		/**
		* A class to handle notifications and their corresponding groups.
		*/
		public class NotificationGroupManager implements HeadsUpManager.OnHeadsUpChangedListener {
		public class NotificationGroupManager implements OnHeadsUpChangedListener {

		private final HashMap<String, NotificationGroup> mGroupMap = new HashMap<>();
		private OnGroupChangeListener mListener;