diff options
| author | John Reck <jreck@google.com> | 2011-05-17 13:20:15 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-17 13:20:15 -0700 |
| commit | 275932ff17bcb44712ef07a1e143c3f3b0d8df8a (patch) | |
| tree | dd405435f48638af8ecaea14dc4d304fee25604a /src/com/android | |
| parent | a94de4fc1f36aa329690519fa87d2f5a785ad8e7 (diff) | |
| parent | a5176f3e20d7bc0f07b1434f35c9458f40477644 (diff) | |
| download | packages_apps_Browser-275932ff17bcb44712ef07a1e143c3f3b0d8df8a.tar.gz packages_apps_Browser-275932ff17bcb44712ef07a1e143c3f3b0d8df8a.tar.bz2 packages_apps_Browser-275932ff17bcb44712ef07a1e143c3f3b0d8df8a.zip | |
Merge "Use tablet UI for large" into honeycomb-mr2
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/browser/BrowserActivity.java | 8 | ||||
| -rw-r--r-- | src/com/android/browser/BrowserBookmarksPage.java | 4 | ||||
| -rw-r--r-- | src/com/android/browser/CombinedBookmarkHistoryView.java | 2 |
3 files changed, 6 insertions, 8 deletions
diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java index 3c025d204..a9b65fd03 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 de28d0dfa..a3cb9fc2e 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 793f7a200..febf75b33 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 { |