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

Merge "Merge "Avoid callback leak in ComplicationHostViewController" into tm-qpr-dev am: 0348c776bd am: db5c344be2" into udc-dev

Browse Source
This commit is contained in:
Automerger Merge Worker
2023-03-09 18:18:15 +00:00
committed by Android (Google) Code Review
parent e17bb328f6 6f6af2a27d
commit b347fede81
2 changed files with 2 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationHostViewController.java
View File

@@ -61,9 +61,6 @@ public class ComplicationHostViewController extends ViewController<ConstraintLay
@VisibleForTesting @VisibleForTesting
boolean mIsAnimationEnabled; boolean mIsAnimationEnabled;
// Whether dream entry animations are finished.
private boolean mEntryAnimationsFinished = false;
@Inject @Inject
protected ComplicationHostViewController( protected ComplicationHostViewController(
@Named(SCOPED_COMPLICATIONS_LAYOUT) ConstraintLayout view, @Named(SCOPED_COMPLICATIONS_LAYOUT) ConstraintLayout view,
@@ -78,14 +75,6 @@ public class ComplicationHostViewController extends ViewController<ConstraintLay
mComplicationCollectionViewModel = viewModel; mComplicationCollectionViewModel = viewModel;
mDreamOverlayStateController = dreamOverlayStateController; mDreamOverlayStateController = dreamOverlayStateController;
mDreamOverlayStateController.addCallback(new DreamOverlayStateController.Callback() {
@Override
public void onStateChanged() {
mEntryAnimationsFinished =
mDreamOverlayStateController.areEntryAnimationsFinished();
}
});
// Whether animations are enabled. // Whether animations are enabled.
mIsAnimationEnabled = secureSettings.getFloatForUser( mIsAnimationEnabled = secureSettings.getFloatForUser(
Settings.Global.ANIMATOR_DURATION_SCALE, 1.0f, UserHandle.USER_CURRENT) != 0.0f; Settings.Global.ANIMATOR_DURATION_SCALE, 1.0f, UserHandle.USER_CURRENT) != 0.0f;
@@ -159,7 +148,8 @@ public class ComplicationHostViewController extends ViewController<ConstraintLay
// Complications to be added before dream entry animations are finished are set // Complications to be added before dream entry animations are finished are set
// to invisible and are animated in. // to invisible and are animated in.
if (!mEntryAnimationsFinished && mIsAnimationEnabled) { if (!mDreamOverlayStateController.areEntryAnimationsFinished()
&& mIsAnimationEnabled) {
view.setVisibility(View.INVISIBLE); view.setVisibility(View.INVISIBLE);
} }
mComplications.put(id, viewHolder); mComplications.put(id, viewHolder);

10
packages/SystemUI/tests/src/com/android/systemui/dreams/complication/ComplicationHostViewControllerTest.java
View File

@@ -92,9 +92,6 @@ public class ComplicationHostViewControllerTest extends SysuiTestCase {
@Captor @Captor
private ArgumentCaptor<Observer<Collection<ComplicationViewModel>>> mObserverCaptor; private ArgumentCaptor<Observer<Collection<ComplicationViewModel>>> mObserverCaptor;
@Captor
private ArgumentCaptor<DreamOverlayStateController.Callback> mCallbackCaptor;
@Complication.Category @Complication.Category
static final int COMPLICATION_CATEGORY = Complication.CATEGORY_SYSTEM; static final int COMPLICATION_CATEGORY = Complication.CATEGORY_SYSTEM;
@@ -189,8 +186,6 @@ public class ComplicationHostViewControllerTest extends SysuiTestCase {
// Dream entry animations finished. // Dream entry animations finished.
when(mDreamOverlayStateController.areEntryAnimationsFinished()).thenReturn(true); when(mDreamOverlayStateController.areEntryAnimationsFinished()).thenReturn(true);
final DreamOverlayStateController.Callback stateCallback = captureOverlayStateCallback();
stateCallback.onStateChanged();
// Add a complication after entry animations are finished. // Add a complication after entry animations are finished.
final HashSet<ComplicationViewModel> complications = new HashSet<>( final HashSet<ComplicationViewModel> complications = new HashSet<>(
@@ -223,9 +218,4 @@ public class ComplicationHostViewControllerTest extends SysuiTestCase {
mObserverCaptor.capture()); mObserverCaptor.capture());
return mObserverCaptor.getValue(); return mObserverCaptor.getValue();
} }
private DreamOverlayStateController.Callback captureOverlayStateCallback() {
verify(mDreamOverlayStateController).addCallback(mCallbackCaptor.capture());
return mCallbackCaptor.getValue();
}
} }