diff options
| author | Adam Powell <adamp@google.com> | 2011-08-02 10:26:54 -0700 |
|---|---|---|
| committer | Adam Powell <adamp@google.com> | 2011-08-02 17:58:24 -0700 |
| commit | 269248d112e35fe8e9f0d5d11c96dcb2ac1118b0 (patch) | |
| tree | 05bf3571008565ac1a2c0506c24b85043609a449 /core/java/android/app/Activity.java | |
| parent | e10bcdb37cad965ea60da3f9d413d7645b3ae75a (diff) | |
Fix bug 5098288 - Rethink the suite of new themes
Cut down the list of new themes for ICS. Holo apps now have
Theme.Holo, Theme.Holo.Light, and Theme.Holo.Light.DarkActionBar to
choose from.
Add manifest attribute android:uiOptions to express
splitActionBarWhenNarrow. Other options may move into this later as
well. (DialogWhenLarge?) This attribute is valid on both activity and
application tags; application settings will serve as the default for
activities that do not explicitly set uiOptions.
uiOptions are not currently reflected in the startup window for new
activities.
Change-Id: Iffdc2ce4cc69f79c9bd4e541b7923286e6936c1e
Diffstat (limited to 'core/java/android/app/Activity.java')
| -rw-r--r-- | core/java/android/app/Activity.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index d5b669e353de..98b867d34e2a 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -4399,6 +4399,9 @@ public class Activity extends ContextThemeWrapper if (info.softInputMode != WindowManager.LayoutParams.SOFT_INPUT_STATE_UNSPECIFIED) { mWindow.setSoftInputMode(info.softInputMode); } + if (info.uiOptions != 0) { + mWindow.setUiOptions(info.uiOptions); + } mUiThread = Thread.currentThread(); mMainThread = aThread; |