diff options
author | Dianne Hackborn <hackbod@google.com> | 2010-11-12 18:03:47 -0800 |
---|---|---|
committer | Dianne Hackborn <hackbod@google.com> | 2010-11-14 14:23:42 -0800 |
commit | 7eec10e6c99c30d5ee061fec08ac89ad4254ac32 (patch) | |
tree | b196fb70709f29c6f6e60423578162f5dd189e63 /policy/src | |
parent | 7c2ae6570321575ad74a25bdc72bea1ec6558660 (diff) | |
download | frameworks_base-7eec10e6c99c30d5ee061fec08ac89ad4254ac32.zip frameworks_base-7eec10e6c99c30d5ee061fec08ac89ad4254ac32.tar.gz frameworks_base-7eec10e6c99c30d5ee061fec08ac89ad4254ac32.tar.bz2 |
Get rid of the extended themes.
We now decide whether to use a bitmap background based on whether the
window's drawing is hardware accelerated. To do this, there is a new
"state_accelerated" that state list drawables can be parameterized on,
and the standard window background uses this to select a solid color
or bitmap drawable as appropriate.
Introduces a little hackery to have wm preview windows pretend like
they are hardware accelerated even if they aren't, so the preview looks
closer to the actual app.
Also Add a DialogWhenLarge variation for the light theme.
Change-Id: I215a79d5df65ba3eed52ab363cade9d8218a6588
Diffstat (limited to 'policy/src')
-rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindow.java | 7 | ||||
-rwxr-xr-x | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 4 |
2 files changed, 4 insertions, 7 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java index 1090c71..e99b74f 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java @@ -37,9 +37,7 @@ import com.android.internal.widget.ActionBarContextView; import com.android.internal.widget.ActionBarView; import android.app.KeyguardManager; -import android.content.ActivityNotFoundException; import android.content.Context; -import android.content.Intent; import android.content.res.Configuration; import android.content.res.TypedArray; import android.graphics.Canvas; @@ -51,7 +49,6 @@ import android.net.Uri; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; -import android.os.SystemClock; import android.util.AndroidRuntimeException; import android.util.Config; import android.util.EventLog; @@ -60,6 +57,7 @@ import android.util.SparseArray; import android.util.TypedValue; import android.view.ActionMode; import android.view.Gravity; +import android.view.HardwareRenderer; import android.view.InputQueue; import android.view.KeyCharacterMap; import android.view.KeyEvent; @@ -72,14 +70,12 @@ import android.view.View; import android.view.ViewGroup; import android.view.ViewManager; import android.view.ViewStub; -import android.view.VolumePanel; import android.view.Window; import android.view.WindowManager; import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityManager; import android.view.animation.Animation; import android.view.animation.AnimationUtils; -import android.view.inputmethod.InputMethodManager; import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.PopupWindow; @@ -166,7 +162,6 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { private MenuDialogHelper mContextMenuHelper; private int mVolumeControlStreamType = AudioManager.USE_DEFAULT_STREAM_TYPE; - private long mVolumeKeyUpTime; private AudioManager mAudioManager; private KeyguardManager mKeyguardManager; diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 4bc7433..7d58e41 100755 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -962,7 +962,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { /** {@inheritDoc} */ public View addStartingWindow(IBinder appToken, String packageName, int theme, CharSequence nonLocalizedLabel, - int labelRes, int icon) { + int labelRes, int icon, int windowFlags) { if (!SHOW_STARTING_ANIMATIONS) { return null; } @@ -1006,9 +1006,11 @@ public class PhoneWindowManager implements WindowManagerPolicy { // flag because we do know that the next window will take input // focus, so we want to get the IME window up on top of us right away. win.setFlags( + windowFlags| WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE| WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE| WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM, + windowFlags| WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE| WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE| WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM); |