summaryrefslogtreecommitdiffstats
path: root/policy
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2010-06-23 20:24:52 -0700
committerAdam Powell <adamp@google.com>2010-06-29 14:04:58 -0700
commit89e0645b4157961e8c465eb9c819f965fdb453d8 (patch)
treeeb174c070624026930067c8472f5425cfc4034ab /policy
parent6443de56f3bb9609698b41fc5de04559de039f63 (diff)
downloadframeworks_base-89e0645b4157961e8c465eb9c819f965fdb453d8.zip
frameworks_base-89e0645b4157961e8c465eb9c819f965fdb453d8.tar.gz
frameworks_base-89e0645b4157961e8c465eb9c819f965fdb453d8.tar.bz2
Added context modes to ActionBar API.
Change-Id: I7c3e782cbf01be7bc671b377fb4d706040888833
Diffstat (limited to 'policy')
-rw-r--r--policy/src/com/android/internal/policy/impl/PhoneWindow.java10
1 files changed, 8 insertions, 2 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
index e7511e0..5c56d3c 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
@@ -29,6 +29,7 @@ import com.android.internal.view.menu.MenuBuilder;
import com.android.internal.view.menu.MenuDialogHelper;
import com.android.internal.view.menu.MenuView;
import com.android.internal.view.menu.SubMenuBuilder;
+import com.android.internal.widget.ActionBarView;
import android.app.KeyguardManager;
import android.app.SearchManager;
@@ -53,7 +54,6 @@ import android.util.Config;
import android.util.EventLog;
import android.util.Log;
import android.util.SparseArray;
-import android.view.ActionBarView;
import android.view.Gravity;
import android.view.HapticFeedbackConstants;
import android.view.InputQueue;
@@ -2224,7 +2224,13 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
if (mIsFloating) {
layoutResource = com.android.internal.R.layout.dialog_title;
} else if ((features & (1 << FEATURE_ACTION_BAR)) != 0) {
- layoutResource = com.android.internal.R.layout.screen_action_bar;
+ Configuration config = getContext().getResources().getConfiguration();
+ if ((config.screenLayout & Configuration.SCREENLAYOUT_SIZE_XLARGE) ==
+ Configuration.SCREENLAYOUT_SIZE_XLARGE) {
+ layoutResource = com.android.internal.R.layout.screen_xlarge_action_bar;
+ } else {
+ layoutResource = com.android.internal.R.layout.screen_action_bar;
+ }
} else {
layoutResource = com.android.internal.R.layout.screen_title;
}