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

Commit 5ed0692b authored by Lei Yu's avatar Lei Yu Committed by Android (Google) Code Review
Browse files

Merge "Change animation based on visibility of the drawable"

parents 7bf650a6 089b6ac7
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ public class AnimatedImageView extends ImageView {

    private void updateAnimating() {
        if (mDrawable != null) {
            if (isShown() && mAnimating) {
            if (getVisibility() == View.VISIBLE && mAnimating) {
                mDrawable.start();
            } else {
                mDrawable.stop();
+52 −0
Original line number Diff line number Diff line
/*
 * Copyright (C) 2016 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.settingslib.widget;

import android.app.Activity;
import android.graphics.drawable.AnimatedRotateDrawable;
import android.view.View;
import com.android.settingslib.TestConfig;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config;

import static com.google.common.truth.Truth.assertThat;

@RunWith(RobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AnimatedImageViewTest {
    private AnimatedImageView mAnimatedImageView;

    @Before
    public void setUp() {
        Activity activity = Robolectric.setupActivity(Activity.class);
        mAnimatedImageView = new AnimatedImageView(activity);
        mAnimatedImageView.setImageDrawable(new AnimatedRotateDrawable());
    }

    @Test
    public void testAnimation_ViewVisible_AnimationRunning() {
        mAnimatedImageView.setVisibility(View.VISIBLE);
        mAnimatedImageView.setAnimating(true);
        AnimatedRotateDrawable drawable = (AnimatedRotateDrawable) mAnimatedImageView.getDrawable();
        assertThat(drawable.isRunning()).isTrue();
    }

}