diff options
author | Tony Wickham <twickham@google.com> | 2017-03-24 11:31:12 -0700 |
---|---|---|
committer | Tony Wickham <twickham@google.com> | 2017-03-24 14:18:53 -0700 |
commit | 2f5bb169154d25bc8c164f057117fb056ad2de96 (patch) | |
tree | 04bd51eef88d60dadf5913306ac0c5aa120267a0 /src/com/android/launcher3/notification/NotificationKeyData.java | |
parent | ed68728b1f22bc849e0567f2be3aeaf6798440ca (diff) | |
download | android_packages_apps_Trebuchet-2f5bb169154d25bc8c164f057117fb056ad2de96.tar.gz android_packages_apps_Trebuchet-2f5bb169154d25bc8c164f057117fb056ad2de96.tar.bz2 android_packages_apps_Trebuchet-2f5bb169154d25bc8c164f057117fb056ad2de96.zip |
De-dupe shortcuts with the same id as the main notification.
- Pass NotificationKeyData, which includes the shortcut id, instead of
just the notification key from NotificationListener
- Remove the shortcut with the same shortcut id as the first
notification, if it has one, in PopupPopulator#sortAndFilterShorcuts()
- Add some unit tests
Bug: 36571718
Change-Id: I308941b34c525b34686583476e3f82ccb8b7e2d8
Diffstat (limited to 'src/com/android/launcher3/notification/NotificationKeyData.java')
-rw-r--r-- | src/com/android/launcher3/notification/NotificationKeyData.java | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/src/com/android/launcher3/notification/NotificationKeyData.java b/src/com/android/launcher3/notification/NotificationKeyData.java new file mode 100644 index 000000000..b3ff8dadd --- /dev/null +++ b/src/com/android/launcher3/notification/NotificationKeyData.java @@ -0,0 +1,60 @@ +/* + * Copyright (C) 2017 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.launcher3.notification; + +import android.service.notification.StatusBarNotification; +import android.support.annotation.NonNull; + +import java.util.ArrayList; +import java.util.List; + +/** + * The key data associated with the notification, used to determine what to include + * in badges and dummy popup views before they are populated. + * + * @see NotificationInfo for the full data used when populating the dummy views. + */ +public class NotificationKeyData { + public final String notificationKey; + public final String shortcutId; + + private NotificationKeyData(String notificationKey, String shortcutId) { + this.notificationKey = notificationKey; + this.shortcutId = shortcutId; + } + + public static NotificationKeyData fromNotification(StatusBarNotification sbn) { + return new NotificationKeyData(sbn.getKey(), sbn.getNotification().getShortcutId()); + } + + public static List<String> extractKeysOnly(@NonNull List<NotificationKeyData> notificationKeys) { + List<String> keysOnly = new ArrayList<>(notificationKeys.size()); + for (NotificationKeyData notificationKeyData : notificationKeys) { + keysOnly.add(notificationKeyData.notificationKey); + } + return keysOnly; + } + + @Override + public boolean equals(Object obj) { + if (!(obj instanceof NotificationKeyData)) { + return false; + } + // Only compare the keys. + return ((NotificationKeyData) obj).notificationKey.equals(notificationKey); + } +} |