From 0935e11743ad96dbce9add5d5b7acc95b01798b0 Mon Sep 17 00:00:00 2001 From: Stanley Wang Date: Tue, 15 Jun 2021 15:33:57 +0800 Subject: [PATCH] Remove the pause icon from IllustrationPreference. Fix: 189426848 Test: robotest and test the IllustrationPreference manually. Change-Id: I6087adb99e6b23642d952165073e4e3468397dab --- .../res/drawable/ic_gesture_play_button.xml | 24 ------ .../res/layout/illustration_preference.xml | 9 -- .../widget/IllustrationPreference.java | 83 +------------------ .../widget/IllustrationPreferenceTest.java | 16 ---- 4 files changed, 1 insertion(+), 131 deletions(-) delete mode 100644 packages/SettingsLib/IllustrationPreference/res/drawable/ic_gesture_play_button.xml diff --git a/packages/SettingsLib/IllustrationPreference/res/drawable/ic_gesture_play_button.xml b/packages/SettingsLib/IllustrationPreference/res/drawable/ic_gesture_play_button.xml deleted file mode 100644 index 55b3115a58a46..0000000000000 --- a/packages/SettingsLib/IllustrationPreference/res/drawable/ic_gesture_play_button.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - diff --git a/packages/SettingsLib/IllustrationPreference/res/layout/illustration_preference.xml b/packages/SettingsLib/IllustrationPreference/res/layout/illustration_preference.xml index 0929cc3d84a7f..3f8439c2db47c 100644 --- a/packages/SettingsLib/IllustrationPreference/res/layout/illustration_preference.xml +++ b/packages/SettingsLib/IllustrationPreference/res/layout/illustration_preference.xml @@ -50,14 +50,5 @@ android:background="@android:color/transparent" android:layout_gravity="center" android:visibility="gone"/> - - - diff --git a/packages/SettingsLib/IllustrationPreference/src/com/android/settingslib/widget/IllustrationPreference.java b/packages/SettingsLib/IllustrationPreference/src/com/android/settingslib/widget/IllustrationPreference.java index 7b2a0af269a60..1370eef2743bb 100644 --- a/packages/SettingsLib/IllustrationPreference/src/com/android/settingslib/widget/IllustrationPreference.java +++ b/packages/SettingsLib/IllustrationPreference/src/com/android/settingslib/widget/IllustrationPreference.java @@ -18,8 +18,6 @@ package com.android.settingslib.widget; import android.content.Context; import android.content.res.TypedArray; -import android.os.Parcel; -import android.os.Parcelable; import android.util.AttributeSet; import android.util.Log; import android.view.View; @@ -28,7 +26,6 @@ import android.widget.ImageView; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceClickListener; import androidx.preference.PreferenceViewHolder; import com.airbnb.lottie.LottieAnimationView; @@ -36,14 +33,12 @@ import com.airbnb.lottie.LottieAnimationView; /** * IllustrationPreference is a preference that can play lottie format animation */ -public class IllustrationPreference extends Preference implements OnPreferenceClickListener { +public class IllustrationPreference extends Preference { static final String TAG = "IllustrationPreference"; private int mAnimationId; - private boolean mIsAnimating; private boolean mIsAutoScale; - private ImageView mPlayButton; private LottieAnimationView mIllustrationView; private View mMiddleGroundView; private FrameLayout mMiddleGroundLayout; @@ -72,13 +67,11 @@ public class IllustrationPreference extends Preference implements OnPreferenceCl return; } mMiddleGroundLayout = (FrameLayout) holder.findViewById(R.id.middleground_layout); - mPlayButton = (ImageView) holder.findViewById(R.id.video_play_button); mIllustrationView = (LottieAnimationView) holder.findViewById(R.id.lottie_view); mIllustrationView.setAnimation(mAnimationId); mIllustrationView.loop(true); ColorUtils.applyDynamicColors(getContext(), mIllustrationView); mIllustrationView.playAnimation(); - updateAnimationStatus(mIsAnimating); if (mIsAutoScale) { enableAnimationAutoScale(mIsAutoScale); } @@ -87,28 +80,6 @@ public class IllustrationPreference extends Preference implements OnPreferenceCl } } - @Override - public boolean onPreferenceClick(Preference preference) { - mIsAnimating = !isAnimating(); - updateAnimationStatus(mIsAnimating); - return true; - } - - @Override - protected Parcelable onSaveInstanceState() { - Parcelable superState = super.onSaveInstanceState(); - SavedState ss = new SavedState(superState); - ss.mIsAnimating = mIsAnimating; - return ss; - } - - @Override - protected void onRestoreInstanceState(Parcelable state) { - SavedState ss = (SavedState) state; - super.onRestoreInstanceState(ss.getSuperState()); - mIsAnimating = ss.mIsAnimating; - } - @VisibleForTesting boolean isAnimating() { return mIllustrationView.isAnimating(); @@ -158,7 +129,6 @@ public class IllustrationPreference extends Preference implements OnPreferenceCl private void init(Context context, AttributeSet attrs) { setLayoutResource(R.layout.illustration_preference); - mIsAnimating = true; mIsAutoScale = false; if (attrs != null) { final TypedArray a = context.obtainStyledAttributes(attrs, @@ -166,56 +136,5 @@ public class IllustrationPreference extends Preference implements OnPreferenceCl mAnimationId = a.getResourceId(R.styleable.LottieAnimationView_lottie_rawRes, 0); a.recycle(); } - setOnPreferenceClickListener(this); - } - - private void updateAnimationStatus(boolean playAnimation) { - if (playAnimation) { - mIllustrationView.resumeAnimation(); - mPlayButton.setVisibility(View.INVISIBLE); - } else { - mIllustrationView.pauseAnimation(); - mPlayButton.setVisibility(View.VISIBLE); - } - } - - static class SavedState extends BaseSavedState { - boolean mIsAnimating; - - SavedState(Parcelable superState) { - super(superState); - } - - /** - * Constructor called from {@link #CREATOR} - */ - private SavedState(Parcel in) { - super(in); - mIsAnimating = (Boolean) in.readValue(null); - } - - @Override - public void writeToParcel(Parcel out, int flags) { - super.writeToParcel(out, flags); - out.writeValue(mIsAnimating); - } - - @Override - public String toString() { - return "IllustrationPreference.SavedState{" - + Integer.toHexString(System.identityHashCode(this)) - + " mIsAnimating=" + mIsAnimating + "}"; - } - - public static final Parcelable.Creator CREATOR = - new Parcelable.Creator() { - public SavedState createFromParcel(Parcel in) { - return new SavedState(in); - } - - public SavedState[] newArray(int size) { - return new SavedState[size]; - } - }; } } diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/IllustrationPreferenceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/IllustrationPreferenceTest.java index f197cbb2ac704..89b0fe72ca168 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/IllustrationPreferenceTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/IllustrationPreferenceTest.java @@ -18,8 +18,6 @@ package com.android.settingslib.widget; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.when; - import android.content.Context; import android.util.AttributeSet; import android.view.View; @@ -56,20 +54,6 @@ public class IllustrationPreferenceTest { ReflectionHelpers.setField(mPreference, "mIllustrationView", mAnimationView); } - @Test - public void isAnimating_lottieAnimationViewIsNotAnimating_shouldReturnFalse() { - when(mAnimationView.isAnimating()).thenReturn(false); - - assertThat(mPreference.isAnimating()).isFalse(); - } - - @Test - public void isAnimating_lottieAnimationViewIsAnimating_shouldReturnTrue() { - when(mAnimationView.isAnimating()).thenReturn(true); - - assertThat(mPreference.isAnimating()).isTrue(); - } - @Test public void setMiddleGroundView_middleGroundView_shouldVisible() { final View view = new View(mContext);