summaryrefslogtreecommitdiffstats
path: root/policy/src/com/android/internal
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2011-09-18 14:59:28 -0700
committerAdam Powell <adamp@google.com>2011-09-18 15:34:00 -0700
commit8ee6d7c20e7767c2f61f8db9a99d01e0a05f3842 (patch)
tree8f94303b817afe5be7bd041978f57ec2883b5e97 /policy/src/com/android/internal
parentbfb9a9ae1005998818dd2e75ac7e7f23277a1f03 (diff)
downloadframeworks_base-8ee6d7c20e7767c2f61f8db9a99d01e0a05f3842.zip
frameworks_base-8ee6d7c20e7767c2f61f8db9a99d01e0a05f3842.tar.gz
frameworks_base-8ee6d7c20e7767c2f61f8db9a99d01e0a05f3842.tar.bz2
Fix bug 5333962 - Problems with no action bar/overlay action mode
Change the standalone action mode window for overlay mode to be of TYPE_APPLICATION. (This also fixes a bug where overflow menus would not work properly on these types of action mode bars.) Set exitFadeDuration on btn_cab_done_holo_* drawables. Remove no-window-focus override selector states for selectable item backgrounds to allow proper touch feedback on windows that do not have focus but that the user can interact with. Change-Id: Ib504866238708150d21e6183ff7b695869c05d3e
Diffstat (limited to 'policy/src/com/android/internal')
-rw-r--r--policy/src/com/android/internal/policy/impl/PhoneWindow.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
index 903b405..1b7271d 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
@@ -2135,7 +2135,8 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
com.android.internal.R.attr.actionModePopupWindowStyle);
mActionModePopup.setLayoutInScreenEnabled(true);
mActionModePopup.setLayoutInsetDecor(true);
- mActionModePopup.setClippingEnabled(false);
+ mActionModePopup.setWindowLayoutType(
+ WindowManager.LayoutParams.TYPE_APPLICATION);
mActionModePopup.setContentView(mActionModeView);
mActionModePopup.setWidth(MATCH_PARENT);
@@ -2144,10 +2145,12 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
com.android.internal.R.attr.actionBarSize, heightValue, true);
final int height = TypedValue.complexToDimensionPixelSize(heightValue.data,
mContext.getResources().getDisplayMetrics());
- mActionModePopup.setHeight(height);
+ mActionModeView.setContentHeight(height);
+ mActionModePopup.setHeight(WRAP_CONTENT);
mShowActionModePopup = new Runnable() {
public void run() {
- mActionModePopup.showAtLocation(PhoneWindow.DecorView.this,
+ mActionModePopup.showAtLocation(
+ mActionModeView.getApplicationWindowToken(),
Gravity.TOP | Gravity.FILL_HORIZONTAL, 0, 0);
}
};