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

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

Merge changes from topic "clock_cherrypick_fixes-master" 

* changes:
  Initialize TimeZone during DefaultClockProvider init
  Correct large clock position
  Additional Tests for DefaultClock
  Update DefaultClockProvider colors
  Allow manually specified time
parents 997a17f0 d236127c

packages/SystemUI/ktfmt_includes.txt

+7 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
-packages/SystemUI/src-release/com/android/systemui/flags/FlagsModule.kt

-packages/SystemUI/src/com/android/keyguard/ActiveUnlockConfig.kt

-packages/SystemUI/src/com/android/keyguard/BouncerPanelExpansionCalculator.kt

-packages/SystemUI/src/com/android/keyguard/ClockEventController.kt

-packages/SystemUI/src/com/android/keyguard/KeyguardBiometricLockoutLogger.kt

-packages/SystemUI/src/com/android/keyguard/KeyguardListenModel.kt

-packages/SystemUI/src/com/android/keyguard/KeyguardListenQueue.kt
@@ -156,6 +157,8 @@ 
-packages/SystemUI/src/com/android/systemui/controls/ui/ToggleRangeBehavior.kt

-packages/SystemUI/src/com/android/systemui/controls/ui/TouchBehavior.kt

-packages/SystemUI/src/com/android/systemui/dagger/SystemUICoreStartableModule.kt

-packages/SystemUI/src/com/android/systemui/decor/CutoutDecorProviderFactory.kt

-packages/SystemUI/src/com/android/systemui/decor/CutoutDecorProviderImpl.kt

-packages/SystemUI/src/com/android/systemui/decor/DecorProvider.kt

-packages/SystemUI/src/com/android/systemui/decor/DecorProviderFactory.kt

-packages/SystemUI/src/com/android/systemui/decor/FaceScanningProviderFactory.kt
@@ -246,6 +249,7 @@ 
-packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/ReceiverChipRippleView.kt

-packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/ChipStateSender.kt

-packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/MediaTttChipControllerSender.kt

-packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/MediaTttChipRootView.kt

-packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderLogger.kt

-packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderUiEventLogger.kt

-packages/SystemUI/src/com/android/systemui/navigationbar/gestural/BackPanel.kt
@@ -575,6 +579,7 @@ 
-packages/SystemUI/src/com/android/systemui/volume/VolumePanelFactory.kt

-packages/SystemUI/tests/src/com/android/keyguard/ActiveUnlockConfigTest.kt

-packages/SystemUI/tests/src/com/android/keyguard/BouncerPanelExpansionCalculatorTest.kt

-packages/SystemUI/tests/src/com/android/keyguard/ClockEventControllerTest.kt

-packages/SystemUI/tests/src/com/android/keyguard/KeyguardBiometricLockoutLoggerTest.kt

-packages/SystemUI/tests/src/com/android/keyguard/KeyguardListenQueueTest.kt

-packages/SystemUI/tests/src/com/android/keyguard/KeyguardPasswordViewControllerTest.kt
@@ -633,6 +638,7 @@ 
-packages/SystemUI/tests/src/com/android/systemui/controls/management/TestControlsRequestDialog.kt

-packages/SystemUI/tests/src/com/android/systemui/controls/ui/ControlViewHolderTest.kt

-packages/SystemUI/tests/src/com/android/systemui/controls/ui/DetailDialogTest.kt

-packages/SystemUI/tests/src/com/android/systemui/decor/CutoutDecorProviderFactoryTest.kt

-packages/SystemUI/tests/src/com/android/systemui/decor/OverlayWindowTest.kt

-packages/SystemUI/tests/src/com/android/systemui/decor/PrivacyDotDecorProviderFactoryTest.kt

-packages/SystemUI/tests/src/com/android/systemui/decor/RoundedCornerDecorProviderFactoryTest.kt
@@ -720,6 +726,7 @@ 
-packages/SystemUI/tests/src/com/android/systemui/screenrecord/ScreenRecordDialogTest.kt

-packages/SystemUI/tests/src/com/android/systemui/screenshot/ImageCaptureImplTest.kt

-packages/SystemUI/tests/src/com/android/systemui/screenshot/RequestProcessorTest.kt

-packages/SystemUI/tests/src/com/android/systemui/screenshot/ScreenshotPolicyImplTest.kt

-packages/SystemUI/tests/src/com/android/systemui/screenshot/TakeScreenshotServiceTest.kt

-packages/SystemUI/tests/src/com/android/systemui/settings/UserFileManagerImplTest.kt

-packages/SystemUI/tests/src/com/android/systemui/settings/UserTrackerImplTest.kt

packages/SystemUI/plugin/src/com/android/systemui/plugins/ClockProviderPlugin.kt

+3 −4
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ import android.content.res.Resources 
import android.graphics.drawable.Drawable

import android.view.View

import com.android.systemui.plugins.annotations.ProvidesInterface

import com.android.systemui.shared.regionsampling.RegionDarkness

import java.io.PrintWriter

import java.util.Locale

import java.util.TimeZone
@@ -62,7 +61,7 @@ interface Clock { 


    /** Initializes various rendering parameters. If never called, provides reasonable defaults. */

    fun initialize(resources: Resources, dozeFraction: Float, foldFraction: Float) {

        events.onColorPaletteChanged(resources, RegionDarkness.DEFAULT, RegionDarkness.DEFAULT)

        events.onColorPaletteChanged(resources, true, true)

        animations.doze(dozeFraction)

        animations.fold(foldFraction)

        events.onTimeTick()
@@ -92,8 +91,8 @@ interface ClockEvents { 
    /** Call whenever the color palette should update */

    fun onColorPaletteChanged(

            resources: Resources,

            smallClockIsDark: RegionDarkness,

            largeClockIsDark: RegionDarkness

            smallClockIsDark: Boolean,

            largeClockIsDark: Boolean

    ) { }

}

packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml

+4 −6
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
    android:id="@+id/keyguard_clock_container"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:clipChildren="false"

    android:layout_gravity="center_horizontal|top">

    <FrameLayout

        android:id="@+id/lockscreen_clock_view"
@@ -30,16 +31,13 @@ 
        android:layout_height="wrap_content"

        android:layout_alignParentStart="true"

        android:layout_alignParentTop="true"

        android:paddingStart="@dimen/clock_padding_start">

    </FrameLayout>

        android:paddingStart="@dimen/clock_padding_start" />

    <FrameLayout

        android:id="@+id/lockscreen_clock_view_large"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_below="@id/keyguard_slice_view"

        android:paddingTop="@dimen/keyguard_large_clock_top_padding"

        android:visibility="gone">

    </FrameLayout>

        android:layout_marginTop="@dimen/keyguard_large_clock_top_margin"

        android:visibility="gone" />



    <!-- Not quite optimal but needed to translate these items as a group. The

         NotificationIconContainer has its own logic for translation. -->

packages/SystemUI/res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -669,7 +669,7 @@ 
    <!-- When large clock is showing, offset the smartspace by this amount -->

    <dimen name="keyguard_smartspace_top_offset">12dp</dimen>

    <!-- With the large clock, move up slightly from the center -->

    <dimen name="keyguard_large_clock_top_padding">100dp</dimen>

    <dimen name="keyguard_large_clock_top_margin">-60dp</dimen>



    <dimen name="notification_scrim_corner_radius">32dp</dimen>

packages/SystemUI/screenshot/src/com/android/systemui/testing/screenshot/ViewScreenshotTestRule.kt

+5 −2
Original line number Diff line number Diff line
@@ -36,9 +36,13 @@ import platform.test.screenshot.DeviceEmulationSpec 
import platform.test.screenshot.MaterialYouColorsRule

import platform.test.screenshot.ScreenshotTestRule

import platform.test.screenshot.getEmulatedDevicePathConfig

import platform.test.screenshot.matchers.BitmapMatcher



/** A rule for View screenshot diff unit tests. */

class ViewScreenshotTestRule(emulationSpec: DeviceEmulationSpec) : TestRule {

class ViewScreenshotTestRule(

    emulationSpec: DeviceEmulationSpec,

    private val matcher: BitmapMatcher = UnitTestBitmapMatcher

) : TestRule {

    private val colorsRule = MaterialYouColorsRule()

    private val deviceEmulationRule = DeviceEmulationRule(emulationSpec)

    private val screenshotRule =
@@ -51,7 +55,6 @@ class ViewScreenshotTestRule(emulationSpec: DeviceEmulationSpec) : TestRule { 
            .around(deviceEmulationRule)

            .around(screenshotRule)

            .around(activityRule)

    private val matcher = UnitTestBitmapMatcher



    override fun apply(base: Statement, description: Description): Statement {

        return delegateRule.apply(base, description)