summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2011-03-18 16:04:47 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-03-18 16:04:47 -0700
commitc86ee9f12759b29b1c126776330e5d12fde20d02 (patch)
tree8f72fddbde9e2c096b623cd07793d480d8797fd6 /src/com/android
parent6cda7b14ac7a19f49cb3d169b9c23ad52eb0bc52 (diff)
parent8f295d12fca05149753b4b0c127e1ec6c2e27d2f (diff)
downloadpackages_apps_Browser-c86ee9f12759b29b1c126776330e5d12fde20d02.zip
packages_apps_Browser-c86ee9f12759b29b1c126776330e5d12fde20d02.tar.gz
packages_apps_Browser-c86ee9f12759b29b1c126776330e5d12fde20d02.tar.bz2
Merge "Add missing menu icons"
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/browser/BrowserBookmarksPage.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/com/android/browser/BrowserBookmarksPage.java b/src/com/android/browser/BrowserBookmarksPage.java
index de28d0d..88b8979 100644
--- a/src/com/android/browser/BrowserBookmarksPage.java
+++ b/src/com/android/browser/BrowserBookmarksPage.java
@@ -331,10 +331,15 @@ public class BrowserBookmarksPage extends Fragment implements View.OnCreateConte
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
- setHasOptionsMenu(true);
+ SharedPreferences prefs = PreferenceManager
+ .getDefaultSharedPreferences(getActivity());
+ prefs.registerOnSharedPreferenceChangeListener(this);
+ mCurrentView = prefs.getInt(PREF_SELECTED_VIEW, getDefaultView());
Bundle args = getArguments();
mDisableNewWindow = args == null ? false : args.getBoolean(EXTRA_DISABLE_WINDOW, false);
+
+ setHasOptionsMenu(true);
}
@Override
@@ -372,11 +377,6 @@ public class BrowserBookmarksPage extends Fragment implements View.OnCreateConte
}
// Start the loaders
LoaderManager lm = getLoaderManager();
- SharedPreferences prefs = PreferenceManager
- .getDefaultSharedPreferences(getActivity());
- prefs.registerOnSharedPreferenceChangeListener(this);
- mCurrentView =
- prefs.getInt(PREF_SELECTED_VIEW, getDefaultView());
mAdapter = new BrowserBookmarksAdapter(getActivity(), mCurrentView);
lm.restartLoader(LOADER_BOOKMARKS, null, this);