Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a914a39 authored by Joanne Chung's avatar Joanne Chung Committed by Android (Google) Code Review
Browse files

Merge "Move FloatingToolbarPopup out from FloatingToolbar"

parents feacb759 c048b812

core/java/com/android/internal/widget/FloatingToolbar.java

+1 −1587

File changed.

Preview size limit exceeded, changes collapsed.

core/java/com/android/internal/widget/FloatingToolbarPopup.java

0 → 100644
+1610 −0

File added.

Preview size limit exceeded, changes collapsed.

core/tests/coretests/src/android/widget/espresso/FloatingToolbarEspressoUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ import static androidx.test.espresso.matcher.ViewMatchers.withId; 
import static androidx.test.espresso.matcher.ViewMatchers.withTagValue;

import static androidx.test.espresso.matcher.ViewMatchers.withText;



import static com.android.internal.widget.FloatingToolbar.MenuItemRepr;

import static com.android.internal.widget.FloatingToolbarPopup.MenuItemRepr;



import static org.hamcrest.Matchers.allOf;

import static org.hamcrest.Matchers.is;