diff options
| author | Adam Powell <adamp@google.com> | 2014-05-23 17:27:24 -0700 |
|---|---|---|
| committer | Adam Powell <adamp@google.com> | 2014-05-28 12:36:38 -0700 |
| commit | e021e6ed8931a0a8296af182fc9b0c76b64fb0c4 (patch) | |
| tree | 8bf85bb26b93d8f44d42fcf36c63091a2174b851 /policy | |
| parent | 560ce61c598d9912c4adbd9c602f1a870fb478f4 (diff) | |
| download | frameworks_base-e021e6ed8931a0a8296af182fc9b0c76b64fb0c4.zip frameworks_base-e021e6ed8931a0a8296af182fc9b0c76b64fb0c4.tar.gz frameworks_base-e021e6ed8931a0a8296af182fc9b0c76b64fb0c4.tar.bz2 | |
Toolbar factoring and ActionBar functionality integration
Toolbars now can act in the role of ActionBar with the exception of
navigation modes. Expandable action views are now supported as well as
populating menu items from a host window.
Change-Id: If477db9c7ad9f95723f28cf73cbf03a07ce9d6ad
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindow.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java index 2fea785..6b0095a 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java @@ -3179,7 +3179,9 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { com.android.internal.R.attr.dialogTitleDecorLayout, res, true); layoutResource = res.resourceId; } else if ((features & (1 << FEATURE_ACTION_BAR)) != 0) { - layoutResource = com.android.internal.R.layout.screen_action_bar; + layoutResource = a.getResourceId( + com.android.internal.R.styleable.Window_windowActionBarFullscreenDecorLayout, + com.android.internal.R.layout.screen_action_bar); } else { layoutResource = com.android.internal.R.layout.screen_title; } |