summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Mady Mellor <madym@google.com> 2024-06-20 18:12:54 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-06-20 18:12:54 +0000
commitb1f1746213b76baef4bd87d28d8c25e1a499076c (patch)
tree490bbed540c08cdffc510f3be24a19b1e3eb66c0
parent7283ec5c703b80fe250884b335ad4835bee79782 (diff)
parentf4847868e580a0e7b14830f8e894ae04cdb9ee20 (diff)
Merge "Lets use the same resId as floating bubbles, works better with tests" into main
-rw-r--r--libs/WindowManager/Shell/res/layout/bubble_bar_expanded_view.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/WindowManager/Shell/res/layout/bubble_bar_expanded_view.xml b/libs/WindowManager/Shell/res/layout/bubble_bar_expanded_view.xml
index 34f03c2f226b..501bedd50f55 100644
--- a/libs/WindowManager/Shell/res/layout/bubble_bar_expanded_view.xml
+++ b/libs/WindowManager/Shell/res/layout/bubble_bar_expanded_view.xml
@@ -19,7 +19,7 @@
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:orientation="vertical"
- android:id="@+id/bubble_bar_expanded_view">
+ android:id="@+id/bubble_expanded_view">
<com.android.wm.shell.bubbles.bar.BubbleBarHandleView
android:id="@+id/bubble_bar_handle_view"