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

Commit 15a4a2cb authored by Steve Howard's avatar Steve Howard Committed by Android Git Automerger
Browse files

am 6d895fdb: am d2e5f95e: Merge "Make ProgressBar.setVisibility() remotable." into gingerbread

Merge commit '6d895fdb'

* commit '6d895fdb':
  Make ProgressBar.setVisibility() remotable.
parents e79486fe 6d895fdb
Loading
Loading
Loading
Loading
+7 −5
Original line number Original line Diff line number Diff line
@@ -21,8 +21,9 @@ import android.content.res.TypedArray;
import android.graphics.Bitmap;
import android.graphics.Bitmap;
import android.graphics.BitmapShader;
import android.graphics.BitmapShader;
import android.graphics.Canvas;
import android.graphics.Canvas;
import android.graphics.Shader;
import android.graphics.Rect;
import android.graphics.Rect;
import android.graphics.Shader;
import android.graphics.drawable.Animatable;
import android.graphics.drawable.AnimationDrawable;
import android.graphics.drawable.AnimationDrawable;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.ClipDrawable;
import android.graphics.drawable.ClipDrawable;
@@ -30,11 +31,14 @@ import android.graphics.drawable.Drawable;
import android.graphics.drawable.LayerDrawable;
import android.graphics.drawable.LayerDrawable;
import android.graphics.drawable.ShapeDrawable;
import android.graphics.drawable.ShapeDrawable;
import android.graphics.drawable.StateListDrawable;
import android.graphics.drawable.StateListDrawable;
import android.graphics.drawable.Animatable;
import android.graphics.drawable.shapes.RoundRectShape;
import android.graphics.drawable.shapes.RoundRectShape;
import android.graphics.drawable.shapes.Shape;
import android.graphics.drawable.shapes.Shape;
import android.os.Parcel;
import android.os.Parcelable;
import android.os.SystemClock;
import android.util.AttributeSet;
import android.util.AttributeSet;
import android.view.Gravity;
import android.view.Gravity;
import android.view.RemotableViewMethod;
import android.view.View;
import android.view.View;
import android.view.ViewDebug;
import android.view.ViewDebug;
import android.view.animation.AlphaAnimation;
import android.view.animation.AlphaAnimation;
@@ -44,9 +48,6 @@ import android.view.animation.Interpolator;
import android.view.animation.LinearInterpolator;
import android.view.animation.LinearInterpolator;
import android.view.animation.Transformation;
import android.view.animation.Transformation;
import android.widget.RemoteViews.RemoteView;
import android.widget.RemoteViews.RemoteView;
import android.os.Parcel;
import android.os.Parcelable;
import android.os.SystemClock;


import com.android.internal.R;
import com.android.internal.R;


@@ -763,6 +764,7 @@ public class ProgressBar extends View {
    }
    }


    @Override
    @Override
    @RemotableViewMethod
    public void setVisibility(int v) {
    public void setVisibility(int v) {
        if (getVisibility() != v) {
        if (getVisibility() != v) {
            super.setVisibility(v);
            super.setVisibility(v);