resolved conflicts for merge of e619f1e5 to master

Change-Id: I04de9e92a91cd66e848d37cbb07f7d36a4edba06

3 files changed, 7 insertions, 9 deletions

diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index c26d850..963f29f 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -85,7 +85,7 @@ public class BrowserActivity extends Activity {
         }
 
         mController = new Controller(this);
-        boolean xlarge = isXlarge(this);
+        boolean xlarge = isTablet(this);
         if (xlarge) {
             mUi = new XLargeUi(this, mController);
         } else {
@@ -102,10 +102,8 @@ public class BrowserActivity extends Activity {
         mController.start(icicle, getIntent());
     }
 
-    public static boolean isXlarge(Context context) {
-        return (context.getResources().getConfiguration().screenLayout
-                & Configuration.SCREENLAYOUT_SIZE_MASK)
-                == Configuration.SCREENLAYOUT_SIZE_XLARGE;
+    public static boolean isTablet(Context context) {
+        return context.getResources().getBoolean(R.bool.isTablet);
     }
 
     @VisibleForTesting
diff --git a/src/com/android/browser/BrowserBookmarksPage.java b/src/com/android/browser/BrowserBookmarksPage.java
index 46197e9..6843dcf 100644
--- a/src/com/android/browser/BrowserBookmarksPage.java
+++ b/src/com/android/browser/BrowserBookmarksPage.java
@@ -257,7 +257,7 @@ public class BrowserBookmarksPage extends Fragment implements View.OnCreateConte
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         inflater.inflate(R.menu.bookmark, menu);
-        if (!BrowserActivity.isXlarge(getActivity())) {
+        if (!BrowserActivity.isTablet(getActivity())) {
             MenuItem item = menu.findItem(R.id.add_bookmark);
             item.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
         }
@@ -362,8 +362,8 @@ public class BrowserBookmarksPage extends Fragment implements View.OnCreateConte
         return mRoot;
     }
 
-    private int getDefaultView() {
-        if (BrowserActivity.isXlarge(getActivity())) {
+     private int getDefaultView() {
+        if (BrowserActivity.isTablet(getActivity())) {
             return VIEW_THUMBNAILS;
         }
         return VIEW_LIST;
diff --git a/src/com/android/browser/CombinedBookmarkHistoryView.java b/src/com/android/browser/CombinedBookmarkHistoryView.java
index af87401..1fdc260 100644
--- a/src/com/android/browser/CombinedBookmarkHistoryView.java
+++ b/src/com/android/browser/CombinedBookmarkHistoryView.java
@@ -157,7 +157,7 @@ public class CombinedBookmarkHistoryView extends LinearLayout
     }
 
     void setupActionBar(int startingFragment) {
-        if (BrowserActivity.isXlarge(mContext)) {
+        if (BrowserActivity.isTablet(mContext)) {
             mActionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_HOME
                     | ActionBar.DISPLAY_USE_LOGO);
         } else {