commit 6ed4dcae944c8188c7f240affeb8c437cbfd2090
author Leon Scroggins <scroggo@google.com> Mon Sep 27 14:22:23 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 27 14:22:23 2010 -0700
tree a0b17f2859548326ced1ba1629068f8333349f0f
parent bca3b6922f1fc20187689d8ca6ef28ff170c9440
parent 5e8a40f0b4a191735f7f5fcefceb26cc1146e4e5

Merge "Do not show a context menu for folders."

src/com/android/browser/BrowserActivity.java

diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index 9a29357..5406d85 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -195,6 +195,9 @@
 
         mResolver = getContentResolver();
 
+        // Keep a settings instance handy.
+        mSettings = BrowserSettings.getInstance();
+
         // If this was a web search request, pass it on to the default web
         // search provider and finish this activity.
         if (handleWebSearchIntent(getIntent())) {
@@ -248,8 +251,6 @@
         // Open the icon database and retain all the bookmark urls for favicons
         retainIconsOnStartup();
 
-        // Keep a settings instance handy.
-        mSettings = BrowserSettings.getInstance();
         mSettings.setTabControl(mTabControl);
 
         PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);