Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix NPE in Stepped Clock Animation" into tm-qpr-dev am: 8df7edf0e3 am: a1b9a4bc90

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

Change-Id: I696685a75e3642923da167355600228dcf42aef1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Hawkwood Glazier
2023-03-20 22:15:07 +00:00
committed by Automerger Merge Worker
parent a845428a3e a1b9a4bc90
commit 1f3f54b06c
3 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java
View File

@@ -22,6 +22,7 @@ import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
import static com.android.keyguard.KeyguardClockSwitch.LARGE;
import static com.android.keyguard.KeyguardClockSwitch.SMALL;
import android.annotation.Nullable;
import android.database.ContentObserver;
import android.os.UserHandle;
import android.provider.Settings;
@@ -458,6 +459,7 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS
mView.setClock(clock, mStatusBarStateController.getState());
}
@Nullable
private ClockController getClock() {
return mClockEventController.getClock();
}
@@ -510,7 +512,9 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS
}
/** Gets the animations for the current clock. */
@Nullable
public ClockAnimations getClockAnimations() {
return getClock().getAnimations();
ClockController clock = getClock();
return clock == null ? null : clock.getAnimations();
}
}

19
packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
View File

@@ -159,6 +159,7 @@ import com.android.systemui.model.SysUiState;
import com.android.systemui.navigationbar.NavigationBarController;
import com.android.systemui.navigationbar.NavigationBarView;
import com.android.systemui.navigationbar.NavigationModeController;
import com.android.systemui.plugins.ClockAnimations;
import com.android.systemui.plugins.FalsingManager;
import com.android.systemui.plugins.FalsingManager.FalsingTapListener;
import com.android.systemui.plugins.qs.QS;
@@ -1592,10 +1593,9 @@ public final class NotificationPanelViewController implements Dumpable {
transition.setInterpolator(Interpolators.FAST_OUT_SLOW_IN);
transition.setDuration(StackStateAnimator.ANIMATION_DURATION_STANDARD);
boolean customClockAnimation =
mKeyguardStatusViewController.getClockAnimations() != null
&& mKeyguardStatusViewController.getClockAnimations()
.getHasCustomPositionUpdatedAnimation();
ClockAnimations clockAnims = mKeyguardStatusViewController.getClockAnimations();
boolean customClockAnimation = clockAnims != null
&& clockAnims.getHasCustomPositionUpdatedAnimation();
if (mFeatureFlags.isEnabled(Flags.STEP_CLOCK_ANIMATION) && customClockAnimation) {
// Find the clock, so we can exclude it from this transition.
@@ -5119,9 +5119,14 @@ public final class NotificationPanelViewController implements Dumpable {
Rect from = (Rect) startValues.values.get(PROP_BOUNDS);
Rect to = (Rect) endValues.values.get(PROP_BOUNDS);
anim.addUpdateListener(
animation -> mController.getClockAnimations().onPositionUpdated(
from, to, animation.getAnimatedFraction()));
anim.addUpdateListener(animation -> {
ClockAnimations clockAnims = mController.getClockAnimations();
if (clockAnims == null) {
return;
}
clockAnims.onPositionUpdated(from, to, animation.getAnimatedFraction());
});
return anim;
}

7
packages/SystemUI/tests/src/com/android/keyguard/KeyguardClockSwitchControllerTest.java
View File

@@ -17,6 +17,7 @@
package com.android.keyguard;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.eq;
@@ -365,6 +366,12 @@ public class KeyguardClockSwitchControllerTest extends SysuiTestCase {
assertEquals(View.VISIBLE, mFakeWeatherView.getVisibility());
}
@Test
public void testGetClockAnimations_nullClock_returnsNull() {
when(mClockEventController.getClock()).thenReturn(null);
assertNull(mController.getClockAnimations());
}
private void verifyAttachment(VerificationMode times) {
verify(mClockRegistry, times).registerClockChangeListener(
any(ClockRegistry.ClockChangeListener.class));