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

Commit 91c91b74 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 5817 into donut 

* changes:
   Replace indeterminate progress animated asset with new ones
parents 441cb04e b5537c45

api/current.xml

+109 −66
Original line number Diff line number Diff line
@@ -3419,39 +3419,6 @@ 
 visibility="public"

>

</field>

<field name="donut_resource_pad23"

 type="int"

 transient="false"

 volatile="false"

 value="16843401"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="donut_resource_pad24"

 type="int"

 transient="false"

 volatile="false"

 value="16843400"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="donut_resource_pad25"

 type="int"

 transient="false"

 volatile="false"

 value="16843399"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="donut_resource_pad3"

 type="int"

 transient="false"
@@ -6730,6 +6697,17 @@ 
 visibility="public"

>

</field>

<field name="progressBarStyleInverse"

 type="int"

 transient="false"

 volatile="false"

 value="16843399"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="progressBarStyleLarge"

 type="int"

 transient="false"
@@ -6741,6 +6719,17 @@ 
 visibility="public"

>

</field>

<field name="progressBarStyleLargeInverse"

 type="int"

 transient="false"

 volatile="false"

 value="16843401"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="progressBarStyleSmall"

 type="int"

 transient="false"
@@ -6752,6 +6741,17 @@ 
 visibility="public"

>

</field>

<field name="progressBarStyleSmallInverse"

 type="int"

 transient="false"

 volatile="false"

 value="16843400"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="progressBarStyleSmallTitle"

 type="int"

 transient="false"
@@ -15156,6 +15156,17 @@ 
 visibility="public"

>

</field>

<field name="Widget_ProgressBar_Inverse"

 type="int"

 transient="false"

 volatile="false"

 value="16973915"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="Widget_ProgressBar_Large"

 type="int"

 transient="false"
@@ -15167,6 +15178,17 @@ 
 visibility="public"

>

</field>

<field name="Widget_ProgressBar_Large_Inverse"

 type="int"

 transient="false"

 volatile="false"

 value="16973916"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="Widget_ProgressBar_Small"

 type="int"

 transient="false"
@@ -15178,6 +15200,17 @@ 
 visibility="public"

>

</field>

<field name="Widget_ProgressBar_Small_Inverse"

 type="int"

 transient="false"

 volatile="false"

 value="16973917"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="Widget_RatingBar"

 type="int"

 transient="false"
@@ -15409,39 +15442,6 @@ 
 visibility="public"

>

</field>

<field name="donut_resource_pad20"

 type="int"

 transient="false"

 volatile="false"

 value="16973917"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="donut_resource_pad21"

 type="int"

 transient="false"

 volatile="false"

 value="16973916"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="donut_resource_pad22"

 type="int"

 transient="false"

 volatile="false"

 value="16973915"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="donut_resource_pad3"

 type="int"

 transient="false"
@@ -56678,6 +56678,47 @@ 
</package>

<package name="android.graphics.drawable"

>

<interface name="Animatable"

 abstract="true"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<method name="isRunning"

 return="boolean"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="start"

 return="void"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="stop"

 return="void"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

</interface>

<class name="AnimationDrawable"

 extends="android.graphics.drawable.DrawableContainer"

 abstract="false"
@@ -56686,6 +56727,8 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<implements name="android.graphics.drawable.Animatable">

</implements>

<implements name="java.lang.Runnable">

</implements>

<constructor name="AnimationDrawable"

core/java/android/app/SearchDialog.java

+3 −2
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import android.content.res.Configuration; 
import android.content.res.Resources;

import android.database.Cursor;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.Animatable;

import android.net.Uri;

import android.os.Bundle;

import android.os.SystemClock;
@@ -422,11 +423,11 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS 
        if (working) {

            mSearchAutoComplete.setCompoundDrawablesWithIntrinsicBounds(

                    null, null, mWorkingSpinner, null);

//            mWorkingSpinner.start();

            ((Animatable) mWorkingSpinner).start();

        } else {

            mSearchAutoComplete.setCompoundDrawablesWithIntrinsicBounds(

                    null, null, null, null);

//            mWorkingSpinner.stop();

            ((Animatable) mWorkingSpinner).stop();

        }

    }

core/java/android/widget/ProgressBar.java

+6 −5
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.graphics.drawable.Drawable; 
import android.graphics.drawable.LayerDrawable;

import android.graphics.drawable.ShapeDrawable;

import android.graphics.drawable.StateListDrawable;

import android.graphics.drawable.Animatable;

import android.graphics.drawable.shapes.RoundRectShape;

import android.graphics.drawable.shapes.Shape;

import android.util.AttributeSet;
@@ -683,7 +684,7 @@ public class ProgressBar extends View { 
            return;

        }



        if (mIndeterminateDrawable instanceof AnimationDrawable) {

        if (mIndeterminateDrawable instanceof Animatable) {

            mShouldStartAnimationDrawable = true;

            mAnimation = null;

        } else {
@@ -708,8 +709,8 @@ public class ProgressBar extends View { 
    void stopAnimation() {

        mAnimation = null;

        mTransformation = null;

        if (mIndeterminateDrawable instanceof AnimationDrawable) {

            ((AnimationDrawable) mIndeterminateDrawable).stop();

        if (mIndeterminateDrawable instanceof Animatable) {

            ((Animatable) mIndeterminateDrawable).stop();

            mShouldStartAnimationDrawable = false;

        }

    }
@@ -818,8 +819,8 @@ public class ProgressBar extends View { 
            }

            d.draw(canvas);

            canvas.restore();

            if (mShouldStartAnimationDrawable && d instanceof AnimationDrawable) {

                ((AnimationDrawable) d).start();

            if (mShouldStartAnimationDrawable && d instanceof Animatable) {

                ((Animatable) d).start();

                mShouldStartAnimationDrawable = false;

            }

        }

core/res/res/drawable/progress_large.xml

+23 −43
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2007 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.

<!--

/*

**

** Copyright 2009, 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.

*/

-->



    

<rotate xmlns:android="http://schemas.android.com/apk/res/android"

        android:pivotX="50%" android:pivotY="50%"

        android:fromDegrees="0" android:toDegrees="360">

        

    <shape

            android:shape="ring"

            android:innerRadiusRatio="3"

            android:thicknessRatio="8"

            android:useLevel="false">



        <size

                android:width="76dip"

                android:height="76dip"

        />

        

        <gradient

                android:type="sweep"

                android:useLevel="false"

                android:startColor="#4c737373"

                android:centerColor="#4c737373"

                android:centerY="0.50"

                android:endColor="#ffffd300"

        />

        

    </shape>

    

</rotate>

    
<animated-rotate xmlns:android="http://schemas.android.com/apk/res/android"

    android:drawable="@drawable/spinner_black_76"

    android:pivotX="50%"

    android:pivotY="50%"

    android:framesCount="12"

    android:frameDuration="100" />

core/res/res/drawable/progress_large_white.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

**

** Copyright 2009, 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.

*/

-->

<animated-rotate xmlns:android="http://schemas.android.com/apk/res/android"

    android:drawable="@drawable/spinner_white_76"

    android:pivotX="50%"

    android:pivotY="50%"

    android:framesCount="12"

    android:frameDuration="100" />