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

Commit da996f39 authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

auto import from //branches/cupcake/...@131421

parent d24b8183

Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ aidl_files := \ 
	frameworks/base/core/java/android/content/Intent.aidl \

	frameworks/base/core/java/android/content/SyncStats.aidl \

	frameworks/base/core/java/android/content/res/Configuration.aidl \

	frameworks/base/core/java/android/gadget/GadgetInfo.aidl \

	frameworks/base/core/java/android/gadget/GadgetProviderInfo.aidl \

	frameworks/base/core/java/android/net/Uri.aidl \

	frameworks/base/core/java/android/os/Bundle.aidl \

	frameworks/base/core/java/android/os/ParcelFileDescriptor.aidl \

api/current.xml

+1365 −199

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/app/LauncherActivity.java

+0 −17
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package android.app; 


import android.content.Context;

import android.content.Intent;

import android.content.pm.ActivityInfo;

import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.content.res.Resources;
@@ -31,9 +30,7 @@ import android.graphics.Rect; 
import android.graphics.drawable.BitmapDrawable;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.PaintDrawable;

import android.os.AsyncTask;

import android.os.Bundle;

import android.view.KeyEvent;

import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;
@@ -145,17 +142,6 @@ public abstract class LauncherActivity extends ListActivity { 
            return view;

        }



        private char getCandidateLetter(ResolveInfo info) {

            PackageManager pm = LauncherActivity.this.getPackageManager();

            CharSequence label = info.loadLabel(pm);



            if (label == null) {

                label = info.activityInfo.name;

            }



            return Character.toLowerCase(label.charAt(0));

        }



        private void bindView(View view, ListItem item) {

            TextView text = (TextView) view;

            text.setText(item.label);
@@ -191,7 +177,6 @@ public abstract class LauncherActivity extends ListActivity { 
                        results.count = list.size();

                    }

                } else {

                    final PackageManager pm = LauncherActivity.this.getPackageManager();

                    final String prefixString = prefix.toString().toLowerCase();



                    ArrayList<ListItem> values = mOriginalValues;
@@ -243,8 +228,6 @@ public abstract class LauncherActivity extends ListActivity { 
        private int mIconWidth = -1;

        private int mIconHeight = -1;



        private final Paint mPaint = new Paint();

        private final Rect mBounds = new Rect();

        private final Rect mOldBounds = new Rect();

        private Canvas mCanvas = new Canvas();

core/java/android/app/SearchDialog.java

+5 −3
Original line number Diff line number Diff line
@@ -835,9 +835,6 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS 
        // also guard against possible race conditions (late arrival after dismiss)

        if (mSearchable != null) {

            handled = doSuggestionsKey(v, keyCode, event);

            if (!handled) {

                handled = refocusingKeyListener(v, keyCode, event);

            }

        }

        return handled;

    }
@@ -1024,6 +1021,11 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS 
     * @param jamQuery True means to set the query, false means to reset it to the user's choice

     */

    private void jamSuggestionQuery(boolean jamQuery, AdapterView<?> parent, int position) {

        // quick check against race conditions

        if (mSearchable == null) {

            return;

        }

        

        mSuggestionsAdapter.setNonUserQuery(true);       // disables any suggestions processing

        if (jamQuery) {

            CursorAdapter ca = getSuggestionsAdapter(parent);

core/java/android/content/Intent.java

+2 −0
Original line number Diff line number Diff line
@@ -1112,6 +1112,8 @@ public class Intent implements Parcelable { 
     * <p>My include the following extras:

     * <ul>

     * <li> {@link #EXTRA_UID} containing the integer uid assigned to the new package.

     * <li> {@link #EXTRA_REPLACING} is set to true if this is following

     * an {@link #ACTION_PACKAGE_REMOVED} broadcast for the same package.

     * </ul>

     */

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)