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

Bye bye veto button

Browse Source 
You were just overruled by the congress
of usefulness.
In other bad joke news: this also fixes a bug
where it was focusable.

Test: dismiss notification, observe it working
Change-Id: I6d170563d0c4371066ce7b149bc40053e41ca5e2
Fixes: 32127661
This commit is contained in:
Selim Cinek
2016-12-14 14:41:01 -08:00
parent ae1bbbb329
commit e907911e63
2 changed files with 9 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
View File

@@ -979,15 +979,8 @@ public abstract class BaseStatusBar extends SystemUI implements
}
}
protected void bindDismissListener(final ExpandableNotificationRow row) {
row.setOnDismissListener(new View.OnClickListener() {
public void onClick(View v) {
// Accessibility feedback
v.announceForAccessibility(
mContext.getString(R.string.accessibility_notification_dismissed));
performRemoveNotification(row.getStatusBarNotification());
}
});
protected void bindDismissRunnable(final ExpandableNotificationRow row) {
row.setOnDismissRunnable(() -> performRemoveNotification(row.getStatusBarNotification()));
}
protected void performRemoveNotification(StatusBarNotification n) {
@@ -1653,7 +1646,7 @@ public abstract class BaseStatusBar extends SystemUI implements
}
workAroundBadLayerDrawableOpacity(row);
bindDismissListener(row);
bindDismissRunnable(row);
// NB: the large icon is now handled entirely by the template

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

@@ -113,7 +113,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
private NotificationContentView mPrivateLayout;
private int mMaxExpandHeight;
private int mHeadsUpHeight;
private View mVetoButton;
private int mNotificationColor;
private ExpansionLogger mLogger;
private String mLoggingKey;
@@ -198,6 +197,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
private boolean mIconsVisible = true;
private boolean mAboveShelf;
private boolean mIsLastChild;
private Runnable mOnDismissRunnable;
public boolean isGroupExpansionChanging() {
if (isChildInGroup()) {
@@ -813,11 +813,13 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
}
public void performDismiss() {
mVetoButton.performClick();
if (mOnDismissRunnable != null) {
mOnDismissRunnable.run();
}
}
public void setOnDismissListener(OnClickListener listener) {
mVetoButton.setOnClickListener(listener);
public void setOnDismissRunnable(Runnable onDismissRunnable) {
mOnDismissRunnable = onDismissRunnable;
}
public View getNotificationIcon() {
@@ -1027,10 +1029,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
mTranslateableViews.add(mChildrenContainer);
}
});
mVetoButton = findViewById(R.id.veto);
mVetoButton.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO);
mVetoButton.setContentDescription(mContext.getString(
R.string.accessibility_remove_notification));
// Add the views that we translate to reveal the gear
mTranslateableViews = new ArrayList<View>();
@@ -1038,16 +1036,11 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
mTranslateableViews.add(getChildAt(i));
}
// Remove views that don't translate
mTranslateableViews.remove(mVetoButton);
mTranslateableViews.remove(mSettingsIconRowStub);
mTranslateableViews.remove(mChildrenContainerStub);
mTranslateableViews.remove(mGutsStub);
}
public View getVetoButton() {
return mVetoButton;
}
public void resetTranslation() {
if (mTranslateAnim != null) {
mTranslateAnim.cancel();