Tony
4043b05cde
Otherwise it's possible the badge scale animation will override the non-animated set value, which could mean a badge continues to show even though it shouldn't: - Animate badge scale to 1 - Before animation finishes, set badge scale to 0 - Badge scale ends at 1, since animation wasn't cancelled, so we continue to show it indefinitely Also exported some properties in case a similar issue arises. Bug: 111791593 Change-Id: Ia1a417239b909886adf9351e9bdc06a3b22d8b73
66 lines
2.0 KiB
Java
66 lines
2.0 KiB
Java
/*
|
|
* 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.badge;
|
|
|
|
import android.view.ViewDebug;
|
|
|
|
import com.android.launcher3.Utilities;
|
|
|
|
/**
|
|
* Subclass of BadgeInfo that only contains the badge count, which is
|
|
* the sum of all the Folder's items' notifications (each counts as 1).
|
|
*/
|
|
public class FolderBadgeInfo extends BadgeInfo {
|
|
|
|
private static final int MIN_COUNT = 0;
|
|
|
|
private int mNumNotifications;
|
|
|
|
public FolderBadgeInfo() {
|
|
super(null);
|
|
}
|
|
|
|
public void addBadgeInfo(BadgeInfo badgeToAdd) {
|
|
if (badgeToAdd == null) {
|
|
return;
|
|
}
|
|
mNumNotifications += badgeToAdd.getNotificationKeys().size();
|
|
mNumNotifications = Utilities.boundToRange(
|
|
mNumNotifications, MIN_COUNT, BadgeInfo.MAX_COUNT);
|
|
}
|
|
|
|
public void subtractBadgeInfo(BadgeInfo badgeToSubtract) {
|
|
if (badgeToSubtract == null) {
|
|
return;
|
|
}
|
|
mNumNotifications -= badgeToSubtract.getNotificationKeys().size();
|
|
mNumNotifications = Utilities.boundToRange(
|
|
mNumNotifications, MIN_COUNT, BadgeInfo.MAX_COUNT);
|
|
}
|
|
|
|
@Override
|
|
public int getNotificationCount() {
|
|
// This forces the folder badge to always show up as a dot.
|
|
return 0;
|
|
}
|
|
|
|
@ViewDebug.ExportedProperty(category = "launcher")
|
|
public boolean hasBadge() {
|
|
return mNumNotifications > 0;
|
|
}
|
|
}
|