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

Merge "Moving setIsRootNamespace in notification one level higher" into udc-qpr-dev

Browse Source
This commit is contained in:
Michał Brzeziński
2023-06-19 13:48:51 +00:00
committed by Android (Google) Code Review
parent 2489bd750b 03756131ca
commit 136a00dc03
3 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/statusbar/NotificationRemoteInputManager.java
View File

@@ -402,7 +402,7 @@ public class NotificationRemoteInputManager implements Dumpable {
while (p != null) {
if (p instanceof View) {
View pv = (View) p;
if (pv.isRootNamespace()) {
if (pv.getId() == com.android.internal.R.id.status_bar_latest_event_content) {
riv = findRemoteInputView(pv);
row = (ExpandableNotificationRow) pv.getTag(R.id.row_tag_for_content_view);
break;

2
packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentInflater.java
View File

@@ -474,7 +474,6 @@ public class NotificationContentInflater implements NotificationRowContentBinder
parentLayout,
remoteViewClickHandler);
validateView(v, entry, row.getResources());
v.setIsRootNamespace(true);
applyCallback.setResultView(v);
} else {
newContentView.reapply(
@@ -511,7 +510,6 @@ public class NotificationContentInflater implements NotificationRowContentBinder
return;
}
if (isNewView) {
v.setIsRootNamespace(true);
applyCallback.setResultView(v);
} else if (existingWrapper != null) {
existingWrapper.onReinflated();

17
packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentView.java
View File

@@ -208,6 +208,23 @@ public class NotificationContentView extends FrameLayout implements Notification
mSmartReplyConstants = smartReplyConstants;
mSmartReplyController = smartReplyController;
mStatusBarService = statusBarService;
// We set root namespace so that we avoid searching children for id. Notification might
// contain custom view and their ids may clash with ids already existing in shade or
// notification panel
setIsRootNamespace(true);
}
@Override
public View focusSearch(View focused, int direction) {
// This implementation is copied from ViewGroup but with removed special handling of
// setIsRootNamespace. This view is set as tree root using setIsRootNamespace and it
// causes focus to be stuck inside of it. We need to be root to avoid id conflicts
// but we don't want to behave like root when it comes to focusing.
if (mParent != null) {
return mParent.focusSearch(focused, direction);
}
Log.wtf(TAG, "NotificationContentView doesn't have parent");
return null;
}
public void reinflate() {