summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/browser/BrowserActivity.java8
-rw-r--r--src/com/android/browser/BrowserBookmarksPage.java4
-rw-r--r--src/com/android/browser/CombinedBookmarkHistoryView.java2
3 files changed, 6 insertions, 8 deletions
diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index 3c025d2..a9b65fd 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -96,7 +96,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 {
@@ -113,10 +113,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 de28d0d..a3cb9fc 100644
--- a/src/com/android/browser/BrowserBookmarksPage.java
+++ b/src/com/android/browser/BrowserBookmarksPage.java
@@ -262,7 +262,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);
}
@@ -387,7 +387,7 @@ public class BrowserBookmarksPage extends Fragment implements View.OnCreateConte
}
private int getDefaultView() {
- if (BrowserActivity.isXlarge(getActivity())) {
+ 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 793f7a2..febf75b 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 {