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

Commit 428451c3 authored by William Xiao's avatar William Xiao Committed by Android (Google) Code Review
Browse files

Merge changes from topic "b/339667383-dream-bottom-right" into main 

* changes:
  Add lock screen shortcut for opening glanceable hub
  Add bottom right chip to dream overlay to show glanceable hub
parents 3332d8ba 69d74b4e

packages/SystemUI/aconfig/systemui.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -989,6 +989,13 @@ flag { 
  }

}



flag {

  name: "glanceable_hub_shortcut_button"

  namespace: "systemui"

  description: "Shows a button over the dream and lock screen to open the glanceable hub"

  bug: "339667383"

}



flag {

  name: "glanceable_hub_gesture_handle"

  namespace: "systemui"

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/quickaffordance/KeyguardQuickAffordanceLegacySettingSyncerTest.kt

+1 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ class KeyguardQuickAffordanceLegacySettingSyncerTest : SysuiTestCase() { 
                            .thenReturn(FakeSharedPreferences())

                    },

                userTracker = FakeUserTracker(),

                systemSettings = FakeSettings(),

                broadcastDispatcher = fakeBroadcastDispatcher,

            )

        settings = FakeSettings()

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/quickaffordance/KeyguardQuickAffordanceLocalUserSelectionManagerTest.kt

+3 −1
Original line number Diff line number Diff line
@@ -22,13 +22,14 @@ import android.content.SharedPreferences 
import android.content.pm.UserInfo

import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.systemui.res.R

import com.android.systemui.SysuiTestCase

import com.android.systemui.backup.BackupHelper

import com.android.systemui.res.R

import com.android.systemui.settings.FakeUserTracker

import com.android.systemui.settings.UserFileManager

import com.android.systemui.util.FakeSharedPreferences

import com.android.systemui.util.mockito.whenever

import com.android.systemui.util.settings.FakeSettings

import com.google.common.truth.Truth.assertThat

import kotlinx.coroutines.Dispatchers

import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -80,6 +81,7 @@ class KeyguardQuickAffordanceLocalUserSelectionManagerTest : SysuiTestCase() { 
                context = context,

                userFileManager = userFileManager,

                userTracker = userTracker,

                systemSettings = FakeSettings(),

                broadcastDispatcher = fakeBroadcastDispatcher,

            )

    }

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/repository/KeyguardQuickAffordanceRepositoryTest.kt

+2 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import android.content.pm.UserInfo 
import android.os.UserHandle

import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.systemui.res.R

import com.android.systemui.SysuiTestCase

import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.keyguard.data.quickaffordance.FakeKeyguardQuickAffordanceConfig
@@ -32,6 +31,7 @@ import com.android.systemui.keyguard.data.quickaffordance.KeyguardQuickAffordanc 
import com.android.systemui.keyguard.data.quickaffordance.KeyguardQuickAffordanceRemoteUserSelectionManager

import com.android.systemui.keyguard.shared.model.KeyguardQuickAffordancePickerRepresentation

import com.android.systemui.keyguard.shared.model.KeyguardSlotPickerRepresentation

import com.android.systemui.res.R

import com.android.systemui.settings.FakeUserTracker

import com.android.systemui.settings.UserFileManager

import com.android.systemui.shared.customization.data.content.FakeCustomizationProviderClient
@@ -91,6 +91,7 @@ class KeyguardQuickAffordanceRepositoryTest : SysuiTestCase() { 
                            .thenReturn(FakeSharedPreferences())

                    },

                userTracker = userTracker,

                systemSettings = FakeSettings(),

                broadcastDispatcher = fakeBroadcastDispatcher,

            )

        client1 = FakeCustomizationProviderClient()

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorTest.kt

+1 −0
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ class KeyguardQuickAffordanceInteractorTest : SysuiTestCase() { 
                            .thenReturn(FakeSharedPreferences())

                    },

                userTracker = userTracker,

                systemSettings = FakeSettings(),

                broadcastDispatcher = fakeBroadcastDispatcher,

            )

        val remoteUserSelectionManager =