Add initial corner radius to pin button.

In master, I removed setting the corner radius in onLayout because it
was being called everytime we would push on a pin button and caused a
janky animation; however this has seemed to cause a regression in the
sim pin view. Only set corner radius on the first onLayout pass.

Fixes: 268297323
Test: open sim pin view.
Change-Id: I3cb2d9fa74cb43c8a10b670b823d44d4f1020b88
This commit is contained in:
Aaron Liu
2023-02-10 09:36:42 -08:00
parent cf12ebac3a
commit 7f13362d07
2 changed files with 62 additions and 1 deletions

View File

@@ -51,6 +51,7 @@ class NumPadAnimator {
private float mStartRadius;
private float mEndRadius;
private int mHeight;
private boolean mInitialized;
private static final int EXPAND_ANIMATION_MS = 100;
private static final int EXPAND_COLOR_ANIMATION_MS = 50;
@@ -95,9 +96,13 @@ class NumPadAnimator {
mHeight = height;
mStartRadius = height / 2f;
mEndRadius = height / 4f;
mBackground.setCornerRadius(mStartRadius);
mExpandAnimator.setFloatValues(mStartRadius, mEndRadius);
mContractAnimator.setFloatValues(mEndRadius, mStartRadius);
// Set initial corner radius.
if (!mInitialized) {
mBackground.setCornerRadius(mStartRadius);
mInitialized = true;
}
}
/**

View File

@@ -0,0 +1,56 @@
/*
* Copyright (C) 2023 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.keyguard
import android.graphics.drawable.Drawable
import android.graphics.drawable.GradientDrawable
import android.testing.AndroidTestingRunner
import android.testing.TestableLooper
import androidx.test.filters.SmallTest
import com.android.systemui.SysuiTestCase
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
import org.mockito.Mock
import org.mockito.Mockito.anyFloat
import org.mockito.Mockito.never
import org.mockito.Mockito.reset
import org.mockito.Mockito.verify
import org.mockito.MockitoAnnotations
@SmallTest
@RunWith(AndroidTestingRunner::class)
@TestableLooper.RunWithLooper
class NumPadAnimatorTest : SysuiTestCase() {
@Mock lateinit var background: GradientDrawable
@Mock lateinit var buttonImage: Drawable
private lateinit var underTest: NumPadAnimator
@Before
fun setup() {
MockitoAnnotations.initMocks(this)
underTest = NumPadAnimator(context, background, 0, buttonImage)
}
@Test
fun testOnLayout() {
underTest.onLayout(100)
verify(background).cornerRadius = 50f
reset(background)
underTest.onLayout(100)
verify(background, never()).cornerRadius = anyFloat()
}
}