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

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

Merge changes from topic "b/339667383-revert" into main

* changes:
  Revert "Add lock screen shortcut for opening glanceable hub"
  Revert "Add bottom right chip to dream overlay to show glanceable hub"
parents 06f282ec 8634b728
Loading
Loading
Loading
Loading
+0 −7
Original line number Diff line number Diff line
@@ -1031,13 +1031,6 @@ 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"
+0 −1
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ class KeyguardQuickAffordanceLegacySettingSyncerTest : SysuiTestCase() {
                            .thenReturn(FakeSharedPreferences())
                    },
                userTracker = FakeUserTracker(),
                systemSettings = FakeSettings(),
                broadcastDispatcher = fakeBroadcastDispatcher,
            )
        settings = FakeSettings()
+0 −2
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 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
@@ -81,7 +80,6 @@ class KeyguardQuickAffordanceLocalUserSelectionManagerTest : SysuiTestCase() {
                context = context,
                userFileManager = userFileManager,
                userTracker = userTracker,
                systemSettings = FakeSettings(),
                broadcastDispatcher = fakeBroadcastDispatcher,
            )
    }
+0 −1
Original line number Diff line number Diff line
@@ -91,7 +91,6 @@ class KeyguardQuickAffordanceRepositoryTest : SysuiTestCase() {
                            .thenReturn(FakeSharedPreferences())
                    },
                userTracker = userTracker,
                systemSettings = FakeSettings(),
                broadcastDispatcher = fakeBroadcastDispatcher,
            )
        client1 = FakeCustomizationProviderClient()
+0 −1
Original line number Diff line number Diff line
@@ -148,7 +148,6 @@ class KeyguardQuickAffordanceInteractorTest : SysuiTestCase() {
                            .thenReturn(FakeSharedPreferences())
                    },
                userTracker = userTracker,
                systemSettings = FakeSettings(),
                broadcastDispatcher = fakeBroadcastDispatcher,
            )
        val remoteUserSelectionManager =
Loading