diff options
| author | Adam Powell <adamp@google.com> | 2011-09-18 15:40:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-09-18 15:40:41 -0700 |
| commit | e891e7ab873fef72541642784cc63fd0f421eee5 (patch) | |
| tree | 19674056ece2b47031f204210e4f23a3378ca0b9 /policy | |
| parent | c1abc36cf06737a133a95674066b50550f56932b (diff) | |
| parent | d413eb3861aae87386d418e9af4875f6f330cd05 (diff) | |
| download | frameworks_base-e891e7ab873fef72541642784cc63fd0f421eee5.zip frameworks_base-e891e7ab873fef72541642784cc63fd0f421eee5.tar.gz frameworks_base-e891e7ab873fef72541642784cc63fd0f421eee5.tar.bz2 | |
am d413eb38: Merge "Fix bug 5333962 - Problems with no action bar/overlay action mode"
* commit 'd413eb3861aae87386d418e9af4875f6f330cd05':
Fix bug 5333962 - Problems with no action bar/overlay action mode
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindow.java | 9 |
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); } }; |