From f4847868e580a0e7b14830f8e894ae04cdb9ee20 Mon Sep 17 00:00:00 2001 From: Mady Mellor Date: Mon, 17 Jun 2024 16:34:36 -0700 Subject: Lets use the same resId as floating bubbles, works better with tests The tests look up this id to check if bubbles are expanded, if these are the same in floating / bar mode then some of the tests can be reused for both. Flag: com.android.wm.shell.enable_bubble_bar Test: atest BubbleBarTest (with other CL) Bug: 347312208 Change-Id: I544b78a1ca1366f51ea2b0507da8a68f9fe2e51e --- libs/WindowManager/Shell/res/layout/bubble_bar_expanded_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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">