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

Merge "Update DreamOverlayService to work with Headless System User Mode." into udc-qpr-dev

Browse Source
This commit is contained in:
Bryce Lee
2023-06-02 20:19:46 +00:00
committed by Android (Google) Code Review
parent 4720a28b02 8d829ef412
commit c3ab285d71
3 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/AndroidManifest.xml
View File

@@ -817,7 +817,8 @@
<service
android:name=".dreams.DreamOverlayService"
android:enabled="false"
android:exported="true" />
android:exported="true"
android:singleUser="true" />
<activity android:name=".keyguard.WorkLockActivity"
android:label="@string/accessibility_desc_work_lock"

1
packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayService.java
View File

@@ -283,6 +283,7 @@ public class DreamOverlayService extends android.service.dreams.DreamOverlayServ
mWindow.clearFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
mWindow.addFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE);
mWindow.addPrivateFlags(WindowManager.LayoutParams.SYSTEM_FLAG_SHOW_FOR_ALL_USERS);
mWindow.requestFeature(Window.FEATURE_NO_TITLE);
// Hide all insets when the dream is showing
mWindow.getDecorView().getWindowInsetsController().hide(WindowInsets.Type.systemBars());

21
packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayServiceTest.java
View File

@@ -16,6 +16,8 @@
package com.android.systemui.dreams;
import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_SHOW_FOR_ALL_USERS;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
@@ -512,4 +514,23 @@ public class DreamOverlayServiceTest extends SysuiTestCase {
mMainExecutor.runAllReady();
verify(mDreamOverlayContainerViewController, never()).wakeUp(callback, mMainExecutor);
}
@Test
public void testSystemFlagShowForAllUsersSetOnWindow() throws RemoteException {
final IDreamOverlayClient client = getClient();
// Inform the overlay service of dream starting. Do not show dream complications.
client.startDream(mWindowParams, mDreamOverlayCallback, DREAM_COMPONENT,
false /*shouldShowComplication*/);
mMainExecutor.runAllReady();
final ArgumentCaptor<WindowManager.LayoutParams> paramsCaptor =
ArgumentCaptor.forClass(WindowManager.LayoutParams.class);
// Verify that a new window is added.
verify(mWindowManager).addView(any(), paramsCaptor.capture());
assertThat((paramsCaptor.getValue().privateFlags & SYSTEM_FLAG_SHOW_FOR_ALL_USERS)
== SYSTEM_FLAG_SHOW_FOR_ALL_USERS).isTrue();
}
}