am f03ef334: am 43387c0c: am eb6f138b: Honor the sort and group keys for notification ranking. (73cc43da) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -27282,6 +27282,7 @@ package android.service.notification {
	ctor public StatusBarNotification(android.os.Parcel);		ctor public StatusBarNotification(android.os.Parcel);
	method public android.service.notification.StatusBarNotification clone();		method public android.service.notification.StatusBarNotification clone();
	method public int describeContents();		method public int describeContents();
			method public java.lang.String getGroupKey();
	method public int getId();		method public int getId();
	method public java.lang.String getKey();		method public java.lang.String getKey();
	method public android.app.Notification getNotification();		method public android.app.Notification getNotification();

core/java/android/service/notification/StatusBarNotification.java

+23 −0

Original line number	Original line	Diff line number	Diff line
	@@ -30,6 +30,7 @@ public class StatusBarNotification implements Parcelable {
	private final int id;		private final int id;
	private final String tag;		private final String tag;
	private final String key;		private final String key;
			private final String groupKey;

	private final int uid;		private final int uid;
	private final String opPkg;		private final String opPkg;
	@@ -65,6 +66,7 @@ public class StatusBarNotification implements Parcelable {
	this.notification.setUser(user);		this.notification.setUser(user);
	this.postTime = postTime;		this.postTime = postTime;
	this.key = key();		this.key = key();
			this.groupKey = groupKey();
	}		}

	public StatusBarNotification(Parcel in) {		public StatusBarNotification(Parcel in) {
	@@ -84,12 +86,26 @@ public class StatusBarNotification implements Parcelable {
	this.notification.setUser(this.user);		this.notification.setUser(this.user);
	this.postTime = in.readLong();		this.postTime = in.readLong();
	this.key = key();		this.key = key();
			this.groupKey = groupKey();
	}		}

	private String key() {		private String key() {
	return user.getIdentifier() + "\|" + pkg + "\|" + id + "\|" + tag + "\|" + uid;		return user.getIdentifier() + "\|" + pkg + "\|" + id + "\|" + tag + "\|" + uid;
	}		}

			private String groupKey() {
			final String group = getNotification().getGroup();
			final String sortKey = getNotification().getSortKey();
			if (group == null && sortKey == null) {
			// a group of one
			return key;
			}
			return user.getIdentifier() + "\|" + pkg + "\|" +
			(group == null
			? "p:" + notification.priority
			: "g:" + group);
			}

	public void writeToParcel(Parcel out, int flags) {		public void writeToParcel(Parcel out, int flags) {
	out.writeString(this.pkg);		out.writeString(this.pkg);
	out.writeString(this.opPkg);		out.writeString(this.opPkg);
	@@ -240,4 +256,11 @@ public class StatusBarNotification implements Parcelable {
	public String getKey() {		public String getKey() {
	return key;		return key;
	}		}

			/**
			* A key that indicates the group with which this message ranks.
			*/
			public String getGroupKey() {
			return groupKey;
			}
	}		}

services/core/java/com/android/server/notification/GroupedNotificationComparator.java

0 → 100644

+57 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright (C) 2014 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.server.notification;

			import android.text.TextUtils;
			import android.util.Log;

			/**
			* Sorts notifications, accounting for groups and sort keys.
			*/
			public class GroupedNotificationComparator extends NotificationComparator {
			private static final String TAG = "GroupedNotificationComparator";

			@Override
			public int compare(NotificationRecord left, NotificationRecord right) {
			// "recently intrusive" is an ad hoc group that temporarily claims noisy notifications
			if (left.isRecentlyIntrusive() != right.isRecentlyIntrusive()) {
			return left.isRecentlyIntrusive() ? -1 : 1;
			}

			final NotificationRecord leftProxy = left.getRankingProxy();
			if (leftProxy == null) {
			throw new RuntimeException("left proxy cannot be null: " + left.getKey());
			}
			final NotificationRecord rightProxy = right.getRankingProxy();
			if (rightProxy == null) {
			throw new RuntimeException("right proxy cannot be null: " + right.getKey());
			}
			final String leftSortKey = left.getNotification().getSortKey();
			final String rightSortKey = right.getNotification().getSortKey();
			if (leftProxy != rightProxy) {
			// between groups, compare proxies
			return Integer.compare(leftProxy.getAuthoritativeRank(),
			rightProxy.getAuthoritativeRank());
			} else if (TextUtils.isEmpty(leftSortKey) \|\| TextUtils.isEmpty(rightSortKey)) {
			// missing sort keys, use prior rank
			return Integer.compare(left.getAuthoritativeRank(),
			right.getAuthoritativeRank());
			} else {
			// use sort keys within group
			return leftSortKey.compareTo(rightSortKey);
			}
			}
			}

services/core/java/com/android/server/notification/NotificationComparator.java

+14 −14

Original line number	Original line	Diff line number	Diff line
	@@ -18,35 +18,35 @@ package com.android.server.notification;
	import java.util.Comparator;		import java.util.Comparator;

	/**		/**
	* Sorts notificaitons into attention-relelvant order.		* Sorts notifications individually into attention-relelvant order.
	*/		*/
	public class NotificationComparator		public class NotificationComparator
	implements Comparator<NotificationRecord> {		implements Comparator<NotificationRecord> {

	@Override		@Override
	public int compare(NotificationRecord lhs, NotificationRecord rhs) {		public int compare(NotificationRecord left, NotificationRecord right) {
	if (lhs.isRecentlyIntrusive() != rhs.isRecentlyIntrusive()) {		final int leftPackagePriority = left.getPackagePriority();
	return lhs.isRecentlyIntrusive() ? -1 : 1;		final int rightPackagePriority = right.getPackagePriority();
	}
	final int leftPackagePriority = lhs.getPackagePriority();
	final int rightPackagePriority = rhs.getPackagePriority();
	if (leftPackagePriority != rightPackagePriority) {		if (leftPackagePriority != rightPackagePriority) {
	// by priority, high to low		// by priority, high to low
	return -1 * Integer.compare(leftPackagePriority, rightPackagePriority);		return -1 * Integer.compare(leftPackagePriority, rightPackagePriority);
	}		}
	final int leftScore = lhs.sbn.getScore();
	final int rightScore = rhs.sbn.getScore();		final int leftScore = left.sbn.getScore();
			final int rightScore = right.sbn.getScore();
	if (leftScore != rightScore) {		if (leftScore != rightScore) {
	// by priority, high to low		// by priority, high to low
	return -1 * Integer.compare(leftScore, rightScore);		return -1 * Integer.compare(leftScore, rightScore);
	}		}
	final float leftPeple = lhs.getContactAffinity();
	final float rightPeople = rhs.getContactAffinity();		final float leftPeople = left.getContactAffinity();
	if (leftPeple != rightPeople) {		final float rightPeople = right.getContactAffinity();
			if (leftPeople != rightPeople) {
	// by contact proximity, close to far		// by contact proximity, close to far
	return -1 * Float.compare(leftPeple, rightPeople);		return -1 * Float.compare(leftPeople, rightPeople);
	}		}

	// then break ties by time, most recent first		// then break ties by time, most recent first
	return -1 * Long.compare(lhs.getRankingTimeMs(), rhs.getRankingTimeMs());		return -1 * Long.compare(left.getRankingTimeMs(), right.getRankingTimeMs());
	}		}
	}		}

services/core/java/com/android/server/notification/NotificationRecord.java

+31 −1

Original line number	Original line	Diff line number	Diff line
	@@ -21,6 +21,7 @@ import android.content.pm.PackageManager.NameNotFoundException;
	import android.content.res.Resources;		import android.content.res.Resources;
	import android.graphics.Bitmap;		import android.graphics.Bitmap;
	import android.service.notification.StatusBarNotification;		import android.service.notification.StatusBarNotification;
			import com.android.internal.annotations.VisibleForTesting;

	import java.io.PrintWriter;		import java.io.PrintWriter;
	import java.lang.reflect.Array;		import java.lang.reflect.Array;
	@@ -60,7 +61,12 @@ public final class NotificationRecord {
	public boolean isUpdate;		public boolean isUpdate;
	private int mPackagePriority;		private int mPackagePriority;

	NotificationRecord(StatusBarNotification sbn, int score)		// The record that ranking should use for comparisons outside the group.
			private NotificationRecord mRankingProxy;
			private int mAuthoritativeRank;

			@VisibleForTesting
			public NotificationRecord(StatusBarNotification sbn, int score)
	{		{
	this.sbn = sbn;		this.sbn = sbn;
	this.score = score;		this.score = score;
	@@ -73,7 +79,9 @@ public final class NotificationRecord {
	mRecentlyIntrusive = previous.mRecentlyIntrusive;		mRecentlyIntrusive = previous.mRecentlyIntrusive;
	mPackagePriority = previous.mPackagePriority;		mPackagePriority = previous.mPackagePriority;
	mIntercept = previous.mIntercept;		mIntercept = previous.mIntercept;
			mRankingProxy = previous.mRankingProxy;
	mRankingTimeMs = calculateRankingTimeMs(previous.getRankingTimeMs());		mRankingTimeMs = calculateRankingTimeMs(previous.getRankingTimeMs());
			// Don't copy mGroupKey, recompute it, in case it has changed
	}		}

	public Notification getNotification() { return sbn.getNotification(); }		public Notification getNotification() { return sbn.getNotification(); }
	@@ -89,6 +97,7 @@ public final class NotificationRecord {
	+ " / " + idDebugString(baseContext, sbn.getPackageName(), notification.icon));		+ " / " + idDebugString(baseContext, sbn.getPackageName(), notification.icon));
	pw.println(prefix + " pri=" + notification.priority + " score=" + sbn.getScore());		pw.println(prefix + " pri=" + notification.priority + " score=" + sbn.getScore());
	pw.println(prefix + " key=" + sbn.getKey());		pw.println(prefix + " key=" + sbn.getKey());
			pw.println(prefix + " groupKey=" + getGroupKey());
	pw.println(prefix + " contentIntent=" + notification.contentIntent);		pw.println(prefix + " contentIntent=" + notification.contentIntent);
	pw.println(prefix + " deleteIntent=" + notification.deleteIntent);		pw.println(prefix + " deleteIntent=" + notification.deleteIntent);
	pw.println(prefix + " tickerText=" + notification.tickerText);		pw.println(prefix + " tickerText=" + notification.tickerText);
	@@ -145,6 +154,7 @@ public final class NotificationRecord {
	pw.println(prefix + " mRecentlyIntrusive=" + mRecentlyIntrusive);		pw.println(prefix + " mRecentlyIntrusive=" + mRecentlyIntrusive);
	pw.println(prefix + " mPackagePriority=" + mPackagePriority);		pw.println(prefix + " mPackagePriority=" + mPackagePriority);
	pw.println(prefix + " mIntercept=" + mIntercept);		pw.println(prefix + " mIntercept=" + mIntercept);
			pw.println(prefix + " mRankingProxy=" + getRankingProxy().getKey());
	pw.println(prefix + " mRankingTimeMs=" + mRankingTimeMs);		pw.println(prefix + " mRankingTimeMs=" + mRankingTimeMs);
	}		}

	@@ -241,4 +251,24 @@ public final class NotificationRecord {
	}		}
	return sbn.getPostTime();		return sbn.getPostTime();
	}		}

			public NotificationRecord getRankingProxy() {
			return mRankingProxy;
			}

			public void setRankingProxy(NotificationRecord proxy) {
			mRankingProxy = proxy;
			}

			public void setAuthoritativeRank(int authoritativeRank) {
			mAuthoritativeRank = authoritativeRank;
			}

			public int getAuthoritativeRank() {
			return mAuthoritativeRank;
			}

			public String getGroupKey() {
			return sbn.getGroupKey();
			}
	}		}