diff options
| author | John Reck <jreck@google.com> | 2011-05-18 09:03:36 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2011-05-18 09:03:36 -0700 |
| commit | fba541e7ca1ae088bf612d2d98fe4ce60b7c1e01 (patch) | |
| tree | fcab178478150890e8a7403ca0ab91e722b4851a /src/com/android/browser/BrowserBookmarksPage.java | |
| parent | 9320ab5b395e2c47514e94dc4a8db7cb5dc8d66d (diff) | |
| parent | e619f1e55fe312b5b4ad451e56dd12f73ea66a49 (diff) | |
| download | packages_apps_Browser-fba541e7ca1ae088bf612d2d98fe4ce60b7c1e01.tar.gz packages_apps_Browser-fba541e7ca1ae088bf612d2d98fe4ce60b7c1e01.tar.bz2 packages_apps_Browser-fba541e7ca1ae088bf612d2d98fe4ce60b7c1e01.zip | |
resolved conflicts for merge of e619f1e5 to master
Change-Id: I04de9e92a91cd66e848d37cbb07f7d36a4edba06
Diffstat (limited to 'src/com/android/browser/BrowserBookmarksPage.java')
| -rw-r--r-- | src/com/android/browser/BrowserBookmarksPage.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/browser/BrowserBookmarksPage.java b/src/com/android/browser/BrowserBookmarksPage.java index 46197e915..6843dcf9e 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; |