diff options
Diffstat (limited to 'core/java/com')
4 files changed, 16 insertions, 9 deletions
diff --git a/core/java/com/android/internal/os/RuntimeInit.java b/core/java/com/android/internal/os/RuntimeInit.java index 18e1b45..f58f261 100644 --- a/core/java/com/android/internal/os/RuntimeInit.java +++ b/core/java/com/android/internal/os/RuntimeInit.java @@ -24,7 +24,6 @@ import android.os.IBinder; import android.os.Process; import android.os.SystemProperties; import android.util.Config; -import android.util.Finalizers; import android.util.Log; import android.util.Slog; @@ -142,12 +141,6 @@ public class RuntimeInit { Debug.enableEmulatorTraceOutput(); } - /** - * Initialize the thread used to reclaim resources without - * going through finalizers. - */ - Finalizers.init(); - initialized = true; } diff --git a/core/java/com/android/internal/view/IInputMethodManager.aidl b/core/java/com/android/internal/view/IInputMethodManager.aidl index 215809f..b2fbd3a 100644 --- a/core/java/com/android/internal/view/IInputMethodManager.aidl +++ b/core/java/com/android/internal/view/IInputMethodManager.aidl @@ -31,7 +31,8 @@ import com.android.internal.view.IInputMethodClient; interface IInputMethodManager { List<InputMethodInfo> getInputMethodList(); List<InputMethodInfo> getEnabledInputMethodList(); - List<InputMethodSubtype> getEnabledInputMethodSubtypeList(in InputMethodInfo imi); + List<InputMethodSubtype> getEnabledInputMethodSubtypeList(in InputMethodInfo imi, + boolean allowsImplicitlySelectedSubtypes); // TODO: We should change the return type from List to List<Parcelable> // Currently there is a bug that aidl doesn't accept List<Parcelable> List getShortcutInputMethodsAndSubtypes(); diff --git a/core/java/com/android/internal/view/menu/MenuPopupHelper.java b/core/java/com/android/internal/view/menu/MenuPopupHelper.java index a5fd38e..a070835 100644 --- a/core/java/com/android/internal/view/menu/MenuPopupHelper.java +++ b/core/java/com/android/internal/view/menu/MenuPopupHelper.java @@ -124,7 +124,7 @@ public class MenuPopupHelper implements AdapterView.OnItemClickListener, View.On if (mOverflowOnly) { item = mMenu.getOverflowItem(position); } else { - item = mMenu.getItem(position); + item = mMenu.getVisibleItems().get(position); } mMenu.performItemAction(item, 0); dismiss(); @@ -142,12 +142,18 @@ public class MenuPopupHelper implements AdapterView.OnItemClickListener, View.On // Menus don't tend to be long, so this is more sane than it looks. int width = 0; View itemView = null; + int itemType = 0; final int widthMeasureSpec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED); final int heightMeasureSpec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED); final int count = adapter.getCount(); for (int i = 0; i < count; i++) { + final int positionType = adapter.getItemViewType(i); + if (positionType != itemType) { + itemType = positionType; + itemView = null; + } itemView = adapter.getView(i, itemView, null); itemView.measure(widthMeasureSpec, heightMeasureSpec); width = Math.max(width, itemView.getMeasuredWidth()); diff --git a/core/java/com/android/internal/widget/ActionBarContainer.java b/core/java/com/android/internal/widget/ActionBarContainer.java index e520e69..e63a68f 100644 --- a/core/java/com/android/internal/widget/ActionBarContainer.java +++ b/core/java/com/android/internal/widget/ActionBarContainer.java @@ -19,6 +19,7 @@ package com.android.internal.widget; import android.content.Context; import android.content.res.TypedArray; import android.util.AttributeSet; +import android.view.MotionEvent; import android.widget.FrameLayout; /** @@ -39,4 +40,10 @@ public class ActionBarContainer extends FrameLayout { setBackgroundDrawable(a.getDrawable(com.android.internal.R.styleable.ActionBar_background)); a.recycle(); } + + @Override + public boolean onTouchEvent(MotionEvent ev) { + super.onTouchEvent(ev); + return true; + } } |