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

Commit f4f70461 authored by Romain Guy's avatar Romain Guy
Browse files

Update spinner's drawables. Clean up resources, pave the way for new animation.

parent fbd8f69a

core/java/android/app/SearchDialog.java

+5 −6
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ import android.content.pm.PackageManager.NameNotFoundException; 
import android.content.res.Configuration;

import android.content.res.Resources;

import android.database.Cursor;

import android.graphics.drawable.AnimationDrawable;

import android.graphics.drawable.Drawable;

import android.net.Uri;

import android.os.Bundle;
@@ -107,7 +106,7 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS 
    private Button mGoButton;

    private ImageButton mVoiceButton;

    private View mSearchPlate;

    private AnimationDrawable mWorkingSpinner;

    private Drawable mWorkingSpinner;



    // interaction with searchable application

    private SearchableInfo mSearchable;
@@ -188,7 +187,7 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS 
        mGoButton = (Button) findViewById(com.android.internal.R.id.search_go_btn);

        mVoiceButton = (ImageButton) findViewById(com.android.internal.R.id.search_voice_btn);

        mSearchPlate = findViewById(com.android.internal.R.id.search_plate);

        mWorkingSpinner = (AnimationDrawable) getContext().getResources().

        mWorkingSpinner = getContext().getResources().

                getDrawable(com.android.internal.R.drawable.search_spinner);

        

        // attach listeners
@@ -423,11 +422,11 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS 
        if (working) {

            mSearchAutoComplete.setCompoundDrawablesWithIntrinsicBounds(

                    null, null, mWorkingSpinner, null);

            mWorkingSpinner.start();

//            mWorkingSpinner.start();

        } else {

            mSearchAutoComplete.setCompoundDrawablesWithIntrinsicBounds(

                    null, null, null, null);

            mWorkingSpinner.stop();

//            mWorkingSpinner.stop();

        }

    }
@@ -601,7 +600,7 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS 
                    mSearchPlate.getPaddingBottom());

        } else {

            PackageManager pm = getContext().getPackageManager();

            Drawable icon = null;

            Drawable icon;

            try {

                ActivityInfo info = pm.getActivityInfo(mLaunchComponent, 0);

                icon = pm.getApplicationIcon(info.applicationInfo);

core/res/res/drawable/progress.xml

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

<!--

/* //device/apps/common/res/drawable/progress.xml

**

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

*/

-->



<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:drawable="@android:drawable/progress_circular_background" />

    <item>

        <shape android:shape="ring"

               android:innerRadiusRatio="3.4"

               android:thicknessRatio="6.0">

            <gradient

                   android:useLevel="true"

                   android:type="sweep"

                   android:startColor="#ff000000"

                   android:endColor="#ffffffff" />

        </shape>

    </item>

    <item>

        <rotate

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

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

            android:drawable="@android:drawable/progress_particle" />

    </item>

</layer-list>

core/res/res/drawable/progress_circular_background.png

deleted100644 → 0
−2 KiB
Loading image diff...

core/res/res/drawable/progress_circular_background_small.png

deleted100644 → 0
−484 B
Loading image diff...

core/res/res/drawable/progress_circular_indeterminate.png

deleted100644 → 0
−2.32 KiB
Loading image diff...