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

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

Merge "Migrate AnimatableClockView to SystemUISharedLib" into tm-qpr-dev

parents b3728bc5 8485dc1b

packages/SystemUI/src/com/android/keyguard/FontInterpolator.kt→packages/SystemUI/animation/src/com/android/systemui/animation/FontInterpolator.kt

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.keyguard

package com.android.systemui.animation



import android.graphics.fonts.Font

import android.graphics.fonts.FontVariationAxis

packages/SystemUI/src/com/android/keyguard/TextAnimator.kt→packages/SystemUI/animation/src/com/android/systemui/animation/TextAnimator.kt

+4 −4
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.keyguard

package com.android.systemui.animation



import android.animation.Animator

import android.animation.AnimatorListenerAdapter
@@ -61,8 +61,8 @@ class TextAnimator( 
    private val invalidateCallback: () -> Unit

) {

    // Following two members are for mutable for testing purposes.

    internal var textInterpolator: TextInterpolator = TextInterpolator(layout)

    internal var animator: ValueAnimator = ValueAnimator.ofFloat(1f).apply {

    public var textInterpolator: TextInterpolator = TextInterpolator(layout)

    public var animator: ValueAnimator = ValueAnimator.ofFloat(1f).apply {

        duration = DEFAULT_ANIMATION_DURATION

        addUpdateListener {

            textInterpolator.progress = it.animatedValue as Float

packages/SystemUI/src/com/android/keyguard/TextInterpolator.kt→packages/SystemUI/animation/src/com/android/systemui/animation/TextInterpolator.kt

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package com.android.keyguard

package com.android.systemui.animation



import android.graphics.Canvas

import android.graphics.Paint

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

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
        android:layout_alignParentStart="true"

        android:layout_alignParentTop="true"

        android:paddingStart="@dimen/clock_padding_start">

        <com.android.keyguard.AnimatableClockView

        <com.android.systemui.shared.clocks.AnimatableClockView

            android:id="@+id/animatable_clock_view"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"
@@ -53,7 +53,7 @@ 
        android:layout_height="wrap_content"

        android:layout_below="@id/keyguard_slice_view"

        android:visibility="gone">

        <com.android.keyguard.AnimatableClockView

        <com.android.systemui.shared.clocks.AnimatableClockView

            android:id="@+id/animatable_clock_view_large"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

packages/SystemUI/res-keyguard/values/attrs.xml

+0 −6
Original line number Diff line number Diff line
@@ -41,10 +41,4 @@ 
    <attr name="passwordStyle" format="reference" />



    <attr name="numPadKeyStyle" format="reference" />



    <declare-styleable name="AnimatableClockView">

        <attr name="dozeWeight" format="integer" />

        <attr name="lockScreenWeight" format="integer" />

        <attr name="chargeAnimationDelay" format="integer" />

    </declare-styleable>

</resources>