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

Commit 4cf170e6 authored by Hawkwood Glazier's avatar Hawkwood Glazier Committed by Android (Google) Code Review
Browse files

Merge "Move package of LockscreenElement and related classes" into main

parents dbe9a292 c5d2b0fd

packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/LockscreenContent.kt

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ import com.android.systemui.keyguard.ui.composable.blueprint.ComposableLockscree 
import com.android.systemui.keyguard.ui.viewmodel.LockscreenContentViewModel

import com.android.systemui.lifecycle.rememberViewModel

import com.android.systemui.notifications.ui.composable.NotificationLockscreenScrim

import com.android.systemui.plugins.clocks.LockscreenElementKeys

import com.android.systemui.plugins.keyguard.ui.composable.elements.LockscreenElementKeys

import com.android.systemui.statusbar.notification.stack.ui.viewmodel.NotificationLockscreenScrimViewModel



/**

packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/blueprint/BurnInState.kt

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ import androidx.compose.ui.platform.LocalDensity 
import androidx.lifecycle.compose.collectAsStateWithLifecycle

import com.android.systemui.keyguard.ui.viewmodel.BurnInParameters

import com.android.systemui.keyguard.ui.viewmodel.KeyguardClockViewModel

import com.android.systemui.plugins.clocks.ClockController

import com.android.systemui.plugins.keyguard.ui.clocks.ClockController

import kotlin.math.min

import kotlin.math.roundToInt

packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/blueprint/DefaultBlueprint.kt

+4 −4
Original line number Diff line number Diff line
@@ -45,10 +45,10 @@ import com.android.systemui.keyguard.ui.viewmodel.KeyguardClockViewModel 
import com.android.systemui.keyguard.ui.viewmodel.LockscreenContentViewModel

import com.android.systemui.log.LogBuffer

import com.android.systemui.log.dagger.KeyguardBlueprintLog

import com.android.systemui.plugins.clocks.LockscreenElementContext

import com.android.systemui.plugins.clocks.LockscreenElementFactory

import com.android.systemui.plugins.clocks.LockscreenElementKeys.ClockSmall

import com.android.systemui.plugins.clocks.LockscreenElementKeys.SmartspaceCards

import com.android.systemui.plugins.keyguard.ui.composable.elements.LockscreenElementContext

import com.android.systemui.plugins.keyguard.ui.composable.elements.LockscreenElementFactory

import com.android.systemui.plugins.keyguard.ui.composable.elements.LockscreenElementKeys.ClockSmall

import com.android.systemui.plugins.keyguard.ui.composable.elements.LockscreenElementKeys.SmartspaceCards

import java.util.Optional

import javax.inject.Inject

packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/element/ClockRegionElementProvider.kt

+13 −13
Original line number Diff line number Diff line
@@ -33,19 +33,19 @@ import com.android.compose.animation.scene.ContentScope 
import com.android.compose.modifiers.padding

import com.android.systemui.customization.clocks.R as clocksR

import com.android.systemui.keyguard.ui.viewmodel.KeyguardClockViewModel

import com.android.systemui.plugins.clocks.LockscreenElement

import com.android.systemui.plugins.clocks.LockscreenElementContext

import com.android.systemui.plugins.clocks.LockscreenElementFactory

import com.android.systemui.plugins.clocks.LockscreenElementKeys.ClockLarge

import com.android.systemui.plugins.clocks.LockscreenElementKeys.ClockRegionLarge

import com.android.systemui.plugins.clocks.LockscreenElementKeys.ClockRegionSmall

import com.android.systemui.plugins.clocks.LockscreenElementKeys.ClockSmall

import com.android.systemui.plugins.clocks.LockscreenElementKeys.SmartspaceCards

import com.android.systemui.plugins.clocks.LockscreenElementKeys.SmartspaceDateLargeClock

import com.android.systemui.plugins.clocks.LockscreenElementKeys.SmartspaceDateSmallClock

import com.android.systemui.plugins.clocks.LockscreenElementKeys.SmartspaceWeatherLargeClock

import com.android.systemui.plugins.clocks.LockscreenElementKeys.SmartspaceWeatherSmallClock

import com.android.systemui.plugins.clocks.LockscreenElementProvider

import com.android.systemui.plugins.keyguard.ui.composable.elements.LockscreenElement

import com.android.systemui.plugins.keyguard.ui.composable.elements.LockscreenElementContext

import com.android.systemui.plugins.keyguard.ui.composable.elements.LockscreenElementFactory

import com.android.systemui.plugins.keyguard.ui.composable.elements.LockscreenElementKeys.ClockLarge

import com.android.systemui.plugins.keyguard.ui.composable.elements.LockscreenElementKeys.ClockRegionLarge

import com.android.systemui.plugins.keyguard.ui.composable.elements.LockscreenElementKeys.ClockRegionSmall

import com.android.systemui.plugins.keyguard.ui.composable.elements.LockscreenElementKeys.ClockSmall

import com.android.systemui.plugins.keyguard.ui.composable.elements.LockscreenElementKeys.SmartspaceCards

import com.android.systemui.plugins.keyguard.ui.composable.elements.LockscreenElementKeys.SmartspaceDateLargeClock

import com.android.systemui.plugins.keyguard.ui.composable.elements.LockscreenElementKeys.SmartspaceDateSmallClock

import com.android.systemui.plugins.keyguard.ui.composable.elements.LockscreenElementKeys.SmartspaceWeatherLargeClock

import com.android.systemui.plugins.keyguard.ui.composable.elements.LockscreenElementKeys.SmartspaceWeatherSmallClock

import com.android.systemui.plugins.keyguard.ui.composable.elements.LockscreenElementProvider

import com.android.systemui.shade.ShadeDisplayAware

import javax.inject.Inject

packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/element/SmartspaceElementProvider.kt

+9 −9
Original line number Diff line number Diff line
@@ -33,15 +33,15 @@ import com.android.compose.modifiers.padding 
import com.android.systemui.keyguard.KeyguardUnlockAnimationController

import com.android.systemui.keyguard.ui.viewmodel.AodBurnInViewModel

import com.android.systemui.keyguard.ui.viewmodel.KeyguardSmartspaceViewModel

import com.android.systemui.plugins.clocks.LockscreenElement

import com.android.systemui.plugins.clocks.LockscreenElementContext

import com.android.systemui.plugins.clocks.LockscreenElementFactory

import com.android.systemui.plugins.clocks.LockscreenElementKeys.SmartspaceCards

import com.android.systemui.plugins.clocks.LockscreenElementKeys.SmartspaceDateLargeClock

import com.android.systemui.plugins.clocks.LockscreenElementKeys.SmartspaceDateSmallClock

import com.android.systemui.plugins.clocks.LockscreenElementKeys.SmartspaceWeatherLargeClock

import com.android.systemui.plugins.clocks.LockscreenElementKeys.SmartspaceWeatherSmallClock

import com.android.systemui.plugins.clocks.LockscreenElementProvider

import com.android.systemui.plugins.keyguard.ui.composable.elements.LockscreenElement

import com.android.systemui.plugins.keyguard.ui.composable.elements.LockscreenElementContext

import com.android.systemui.plugins.keyguard.ui.composable.elements.LockscreenElementFactory

import com.android.systemui.plugins.keyguard.ui.composable.elements.LockscreenElementKeys.SmartspaceCards

import com.android.systemui.plugins.keyguard.ui.composable.elements.LockscreenElementKeys.SmartspaceDateLargeClock

import com.android.systemui.plugins.keyguard.ui.composable.elements.LockscreenElementKeys.SmartspaceDateSmallClock

import com.android.systemui.plugins.keyguard.ui.composable.elements.LockscreenElementKeys.SmartspaceWeatherLargeClock

import com.android.systemui.plugins.keyguard.ui.composable.elements.LockscreenElementKeys.SmartspaceWeatherSmallClock

import com.android.systemui.plugins.keyguard.ui.composable.elements.LockscreenElementProvider

import com.android.systemui.res.R

import com.android.systemui.shade.ShadeDisplayAware

import com.android.systemui.statusbar.lockscreen.LockscreenSmartspaceController