Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Creating the right views for low-priority group children

Browse Source 
Previously we always created the low-priority views even if it
was in a group, but now we use the collapsed or the singleline
one based on the group state.

Test: runtest systemui
Bug: 35125708
Change-Id: I49d418912f65c3bc8b672d383eb6a0526fcb8993
This commit is contained in:
Selim Cinek
2017-02-22 20:55:44 -08:00
parent 1a48babb5e
commit c478f9023d
3 changed files with 157 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
View File

@@ -16,6 +16,8 @@
package com.android.systemui.statusbar;
import static com.android.systemui.statusbar.notification.NotificationInflater.InflationExceptionHandler;
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
import android.animation.ObjectAnimator;
@@ -306,14 +308,19 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
mEntry = entry;
mStatusBarNotification = entry.notification;
mNotificationInflater.inflateNotificationViews();
onNotificationUpdated();
}
private void onNotificationUpdated() {
for (NotificationContentView l : mLayouts) {
l.onNotificationUpdated(entry);
l.onNotificationUpdated(mEntry);
}
mIsColorized = mStatusBarNotification.getNotification().isColorized();
mShowingPublicInitialized = false;
updateNotificationColor();
if (mIsSummaryWithChildren) {
mChildrenContainer.recreateNotificationHeader(mExpandClickListener, mEntry.notification);
mChildrenContainer.recreateNotificationHeader(mExpandClickListener,
mEntry.notification);
mChildrenContainer.onNotificationUpdated();
}
if (mIconAnimationRunning) {
@@ -463,6 +470,9 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
boolean childInGroup = StatusBar.ENABLE_CHILD_NOTIFICATIONS && isChildInGroup;
mNotificationParent = childInGroup ? parent : null;
mPrivateLayout.setIsChildInGroup(childInGroup);
if (mNotificationInflater.setIsChildInGroup(childInGroup)) {
onNotificationUpdated();
}
resetBackgroundAlpha();
updateBackgroundForGroupState();
updateClickAndFocus();
@@ -1035,6 +1045,10 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
mNotificationInflater.setRemoteViewClickHandler(remoteViewClickHandler);
}
public void setInflateExceptionHandler(InflationExceptionHandler inflateExceptionHandler) {
mNotificationInflater.setInflateExceptionHandler(inflateExceptionHandler);
}
public interface ExpansionLogger {
public void logNotificationExpansion(String key, boolean userAction, boolean expanded);
}

213
packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationInflater.java
View File

@@ -35,11 +35,20 @@ import java.util.Objects;
*/
public class NotificationInflater {
private static final int FLAG_REINFLATE_ALL = ~0;
private static final int FLAG_REINFLATE_CONTENT_VIEW = 1<<0;
private static final int FLAG_REINFLATE_EXPANDED_VIEW = 1<<1;
private static final int FLAG_REINFLATE_HEADS_UP_VIEW = 1<<2;
private static final int FLAG_REINFLATE_PUBLIC_VIEW = 1<<3;
private static final int FLAG_REINFLATE_AMBIENT_VIEW = 1<<4;
private final ExpandableNotificationRow mRow;
private boolean mIsLowPriority;
private boolean mUsesIncreasedHeight;
private boolean mUsesIncreasedHeadsUpHeight;
private RemoteViews.OnClickHandler mRemoteViewClickHandler;
private boolean mIsChildInGroup;
private InflationExceptionHandler mInflateExceptionHandler;
public NotificationInflater(ExpandableNotificationRow row) {
mRow = row;
@@ -49,6 +58,28 @@ public class NotificationInflater {
mIsLowPriority = isLowPriority;
}
/**
* Set whether the notification is a child in a group
*
* @return whether the view was re-inflated
*/
public boolean setIsChildInGroup(boolean childInGroup) {
if (childInGroup != mIsChildInGroup) {
mIsChildInGroup = childInGroup;
if (mIsLowPriority) {
try {
int flags = FLAG_REINFLATE_CONTENT_VIEW | FLAG_REINFLATE_EXPANDED_VIEW;
inflateNotificationViews(flags);
} catch (InflationException e) {
mInflateExceptionHandler.handleInflationException(
mRow.getStatusBarNotification(), e);
}
}
return true;
}
return false;
}
public void setUsesIncreasedHeight(boolean usesIncreasedHeight) {
mUsesIncreasedHeight = usesIncreasedHeight;
}
@@ -62,6 +93,17 @@ public class NotificationInflater {
}
public void inflateNotificationViews() throws InflationException {
inflateNotificationViews(FLAG_REINFLATE_ALL);
}
/**
* reinflate all views for the specified flags
* @param reInflateFlags flags which views should be reinflated. Use {@link #FLAG_REINFLATE_ALL}
* to reinflate all of views.
* @throws InflationException
*/
private void inflateNotificationViews(int reInflateFlags)
throws InflationException {
NotificationData.Entry entry = mRow.getEntry();
StatusBarNotification sbn = entry.notification;
Context context = mRow.getContext();
@@ -69,97 +111,108 @@ public class NotificationInflater {
try {
final Notification.Builder recoveredBuilder
= Notification.Builder.recoverBuilder(context, sbn.getNotification());
final RemoteViews newContentView = createContentView(recoveredBuilder,
mIsLowPriority, mUsesIncreasedHeadsUpHeight);
if (!compareRemoteViews(newContentView, entry.cachedContentView)) {
View contentViewLocal = newContentView.apply(
sbn.getPackageContext(context),
privateLayout,
mRemoteViewClickHandler);
contentViewLocal.setIsRootNamespace(true);
privateLayout.setContractedChild(contentViewLocal);
} else {
newContentView.reapply(sbn.getPackageContext(context),
privateLayout.getContractedChild(),
mRemoteViewClickHandler);
}
entry.cachedContentView = newContentView;
final RemoteViews newBigContentView = createBigContentView(
recoveredBuilder, mIsLowPriority);
if (newBigContentView != null) {
if (!compareRemoteViews(newBigContentView, entry.cachedBigContentView)) {
View bigContentViewLocal = newBigContentView.apply(
boolean isLowPriority = mIsLowPriority && !mIsChildInGroup;
if ((reInflateFlags & FLAG_REINFLATE_CONTENT_VIEW) != 0) {
final RemoteViews newContentView = createContentView(recoveredBuilder,
isLowPriority, mUsesIncreasedHeadsUpHeight);
if (!compareRemoteViews(newContentView,
entry.cachedContentView)) {
View contentViewLocal = newContentView.apply(
sbn.getPackageContext(context),
privateLayout,
mRemoteViewClickHandler);
bigContentViewLocal.setIsRootNamespace(true);
privateLayout.setExpandedChild(bigContentViewLocal);
contentViewLocal.setIsRootNamespace(true);
privateLayout.setContractedChild(contentViewLocal);
} else {
newBigContentView.reapply(sbn.getPackageContext(context),
privateLayout.getExpandedChild(),
newContentView.reapply(sbn.getPackageContext(context),
privateLayout.getContractedChild(),
mRemoteViewClickHandler);
}
} else if (entry.cachedBigContentView != null) {
privateLayout.setExpandedChild(null);
entry.cachedContentView = newContentView;
}
entry.cachedBigContentView = newBigContentView;
final RemoteViews newHeadsUpContentView =
recoveredBuilder.createHeadsUpContentView(mUsesIncreasedHeight);
if (newHeadsUpContentView != null) {
if (!compareRemoteViews(newHeadsUpContentView, entry.cachedHeadsUpContentView)) {
View headsUpContentViewLocal = newHeadsUpContentView.apply(
if ((reInflateFlags & FLAG_REINFLATE_EXPANDED_VIEW) != 0) {
final RemoteViews newBigContentView = createBigContentView(
recoveredBuilder, isLowPriority);
if (newBigContentView != null) {
if (!compareRemoteViews(newBigContentView, entry.cachedBigContentView)) {
View bigContentViewLocal = newBigContentView.apply(
sbn.getPackageContext(context),
privateLayout,
mRemoteViewClickHandler);
bigContentViewLocal.setIsRootNamespace(true);
privateLayout.setExpandedChild(bigContentViewLocal);
} else {
newBigContentView.reapply(sbn.getPackageContext(context),
privateLayout.getExpandedChild(),
mRemoteViewClickHandler);
}
} else if (entry.cachedBigContentView != null) {
privateLayout.setExpandedChild(null);
}
entry.cachedBigContentView = newBigContentView;
mRow.setExpandable(newBigContentView != null);
}
if ((reInflateFlags & FLAG_REINFLATE_HEADS_UP_VIEW) != 0) {
final RemoteViews newHeadsUpContentView =
recoveredBuilder.createHeadsUpContentView(mUsesIncreasedHeight);
if (newHeadsUpContentView != null) {
if (!compareRemoteViews(newHeadsUpContentView,
entry.cachedHeadsUpContentView)) {
View headsUpContentViewLocal = newHeadsUpContentView.apply(
sbn.getPackageContext(context),
privateLayout,
mRemoteViewClickHandler);
headsUpContentViewLocal.setIsRootNamespace(true);
privateLayout.setHeadsUpChild(headsUpContentViewLocal);
} else {
newHeadsUpContentView.reapply(sbn.getPackageContext(context),
privateLayout.getHeadsUpChild(),
mRemoteViewClickHandler);
}
} else if (entry.cachedHeadsUpContentView != null) {
privateLayout.setHeadsUpChild(null);
}
entry.cachedHeadsUpContentView = newHeadsUpContentView;
}
if ((reInflateFlags & FLAG_REINFLATE_PUBLIC_VIEW) != 0) {
NotificationContentView publicLayout = mRow.getPublicLayout();
final RemoteViews newPublicNotification
= recoveredBuilder.makePublicContentView();
if (!compareRemoteViews(newPublicNotification, entry.cachedPublicContentView)) {
View publicContentView = newPublicNotification.apply(
sbn.getPackageContext(context),
publicLayout,
mRemoteViewClickHandler);
publicContentView.setIsRootNamespace(true);
publicLayout.setContractedChild(publicContentView);
} else {
newPublicNotification.reapply(sbn.getPackageContext(context),
publicLayout.getContractedChild(),
mRemoteViewClickHandler);
}
entry.cachedPublicContentView = newPublicNotification;
}
if ((reInflateFlags & FLAG_REINFLATE_AMBIENT_VIEW) != 0) {
final RemoteViews newAmbientNotification
= recoveredBuilder.makeAmbientNotification();
if (!compareRemoteViews(newAmbientNotification, entry.cachedAmbientContentView)) {
View ambientContentView = newAmbientNotification.apply(
sbn.getPackageContext(context),
privateLayout,
mRemoteViewClickHandler);
headsUpContentViewLocal.setIsRootNamespace(true);
privateLayout.setHeadsUpChild(headsUpContentViewLocal);
ambientContentView.setIsRootNamespace(true);
privateLayout.setAmbientChild(ambientContentView);
} else {
newHeadsUpContentView.reapply(sbn.getPackageContext(context),
privateLayout.getHeadsUpChild(),
newAmbientNotification.reapply(sbn.getPackageContext(context),
privateLayout.getAmbientChild(),
mRemoteViewClickHandler);
}
} else if (entry.cachedHeadsUpContentView != null) {
privateLayout.setHeadsUpChild(null);
entry.cachedAmbientContentView = newAmbientNotification;
}
entry.cachedHeadsUpContentView = newHeadsUpContentView;
NotificationContentView publicLayout = mRow.getPublicLayout();
final RemoteViews newPublicNotification
= recoveredBuilder.makePublicContentView();
if (!compareRemoteViews(newPublicNotification, entry.cachedPublicContentView)) {
View publicContentView = newPublicNotification.apply(
sbn.getPackageContext(context),
publicLayout,
mRemoteViewClickHandler);
publicContentView.setIsRootNamespace(true);
publicLayout.setContractedChild(publicContentView);
} else {
newPublicNotification.reapply(sbn.getPackageContext(context),
publicLayout.getContractedChild(),
mRemoteViewClickHandler);
}
entry.cachedPublicContentView = newPublicNotification;
final RemoteViews newAmbientNotification
= recoveredBuilder.makeAmbientNotification();
if (!compareRemoteViews(newAmbientNotification, entry.cachedAmbientContentView)) {
View ambientContentView = newAmbientNotification.apply(
sbn.getPackageContext(context),
privateLayout,
mRemoteViewClickHandler);
ambientContentView.setIsRootNamespace(true);
privateLayout.setAmbientChild(ambientContentView);
} else {
newAmbientNotification.reapply(sbn.getPackageContext(context),
privateLayout.getAmbientChild(),
mRemoteViewClickHandler);
}
entry.cachedAmbientContentView = newAmbientNotification;
mRow.setExpandable(newBigContentView != null);
} catch (RuntimeException e) {
final String ident = sbn.getPackageName() + "/0x" + Integer.toHexString(sbn.getId());
@@ -199,6 +252,14 @@ public class NotificationInflater {
&& a.getPackage().equals(b.getPackage())
&& a.getLayoutId() == b.getLayoutId());
}
public void setInflateExceptionHandler(InflationExceptionHandler inflateExceptionHandler) {
mInflateExceptionHandler = inflateExceptionHandler;
}
public interface InflationExceptionHandler {
void handleInflationException(StatusBarNotification notification, InflationException e);
}
public void onDensityOrFontScaleChanged() {
NotificationData.Entry entry = mRow.getEntry();
entry.cachedAmbientContentView = null;

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

@@ -23,6 +23,7 @@ import static android.app.StatusBarManager.WINDOW_STATE_HIDDEN;
import static android.app.StatusBarManager.WINDOW_STATE_SHOWING;
import static android.app.StatusBarManager.windowStateToString;
import static com.android.systemui.statusbar.notification.NotificationInflater.InflationExceptionHandler;
import static com.android.systemui.statusbar.phone.BarTransitions.MODE_LIGHTS_OUT;
import static com.android.systemui.statusbar.phone.BarTransitions.MODE_LIGHTS_OUT_TRANSPARENT;
import static com.android.systemui.statusbar.phone.BarTransitions.MODE_OPAQUE;
@@ -171,6 +172,7 @@ import com.android.systemui.statusbar.ScrimView;
import com.android.systemui.statusbar.SignalClusterView;
import com.android.systemui.statusbar.StatusBarState;
import com.android.systemui.statusbar.notification.InflationException;
import com.android.systemui.statusbar.notification.NotificationInflater;
import com.android.systemui.statusbar.notification.VisualStabilityManager;
import com.android.systemui.statusbar.phone.StatusBarIconController.IconManager;
import com.android.systemui.statusbar.phone.UnlockMethodCache.OnUnlockMethodChangedListener;
@@ -716,6 +718,7 @@ public class StatusBar extends SystemUI implements DemoMode,
private LockscreenGestureLogger mLockscreenGestureLogger = new LockscreenGestureLogger();
private NotificationIconAreaController mNotificationIconAreaController;
private ConfigurationListener mDensityChangeListener;
private InflationExceptionHandler mInflationExceptionHandler = this::handleInflationException;
private void recycleAllVisibilityObjects(ArraySet<NotificationVisibility> array) {
final int N = array.size();
@@ -6091,6 +6094,7 @@ public class StatusBar extends SystemUI implements DemoMode,
row.setRemoteInputController(mRemoteInputController);
row.setOnExpandClickListener(this);
row.setRemoteViewClickHandler(mOnClickHandler);
row.setInflateExceptionHandler(mInflationExceptionHandler);
// Get the app name.
// Note that Notification.Builder#bindHeaderAppName has similar logic