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

Commit 45f906f4 authored by Josh Tsuji's avatar Josh Tsuji Committed by Automerger Merge Worker
Browse files

Merge "Offset bounds by card top padding to align lockscreen/launcher... 

Merge "Offset bounds by card top padding to align lockscreen/launcher smartspaces." into tm-dev am: 2274df1e am: 4377d236

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18199686



Change-Id: I0b7ee14660d8f57d9effb227bacbcfa3b98ca1a6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bb442ab4 4377d236

packages/SystemUI/plugin/bcsmartspace/src/com/android/systemui/plugins/BcSmartspaceDataPlugin.java

+6 −0
Original line number Diff line number Diff line
@@ -134,6 +134,12 @@ public interface BcSmartspaceDataPlugin extends Plugin { 
         * Get the index of the currently selected page.

         */

        int getSelectedPage();



        /**

         * Return the top padding value from the currently visible card, or 0 if there is no current

         * card.

         */

        int getCurrentCardTopPadding();

    }



    /** Interface for launching Intents, which can differ on the lockscreen */

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardUnlockAnimationController.kt

+12 −0
Original line number Diff line number Diff line
@@ -409,7 +409,19 @@ class KeyguardUnlockAnimationController @Inject constructor( 
        if (willUnlockWithSmartspaceTransition) {

            lockscreenSmartspaceBounds = Rect().apply {

                lockscreenSmartspace!!.getBoundsOnScreen(this)



                // The smartspace container on the lockscreen has left and top padding to align it

                // with other lockscreen content. This padding is inside the bounds on screen, so

                // add it to those bounds so that the padding-less launcher smartspace is properly

                // aligned.

                offset(lockscreenSmartspace!!.paddingLeft, lockscreenSmartspace!!.paddingTop)



                // Also offset by the current card's top padding, if it has any. This allows us to

                // align the tops of the lockscreen/launcher smartspace cards. Some cards, such as

                // the three-line date/weather/alarm card, only have three lines on lockscreen but

                // two on launcher.

                offset(0, (lockscreenSmartspace

                        as? BcSmartspaceDataPlugin.SmartspaceView)?.currentCardTopPadding ?: 0)

            }

        }

packages/SystemUI/tests/src/com/android/systemui/smartspace/DreamSmartspaceControllerTest.kt

+2 −0
Original line number Diff line number Diff line
@@ -153,6 +153,8 @@ class DreamSmartspaceControllerTest : SysuiTestCase() { 
        override fun setMediaTarget(target: SmartspaceTarget?) {}



        override fun getSelectedPage(): Int { return 0; }



        override fun getCurrentCardTopPadding(): Int { return 0; }

    }



    /**

packages/SystemUI/tests/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceControllerTest.kt

+4 −0
Original line number Diff line number Diff line
@@ -603,6 +603,10 @@ class LockscreenSmartspaceControllerTest : SysuiTestCase() { 
            override fun getSelectedPage(): Int {

                return -1

            }



            override fun getCurrentCardTopPadding(): Int {

                return 0

            }

        })

    }

}