am 8774c667: Remove "Show web suggestions" from browser settings

Merge commit '8774c667dd446346dca5f5d3c89092fbc86448d0' into gingerbread

* commit '8774c667dd446346dca5f5d3c89092fbc86448d0':
  Remove "Show web suggestions" from browser settings

diff --combined res/values/strings.xml
index acf8d3d,3eb9a7e..9b7093c
--- 1/res/values/strings.xml
--- 2/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -309,12 -309,6 +309,6 @@@
      <string name="pref_content_search_engine">Set search engine</string>
      <!-- Settings summary -->
      <string name="pref_content_search_engine_summary">Select a search engine</string>
-     <!-- Settings label -->
-     <string name="pref_content_show_search_suggestions">Show web suggestions</string>
-     <!-- Settings summary -->
-     <string name="pref_content_show_web_suggestions_summary_on">Show web suggestions as you type</string>
-     <!-- Settings summary -->
-     <string name="pref_content_show_web_suggestions_summary_off">Don\'t show web suggestions as you type</string>
      <!-- Settings button label -->
      <string name="pref_use_current">Use current page</string>
      <!-- Settings label -->
@@@ -460,16 -454,12 +454,16 @@@
          <item>Android</item>
          <item>Desktop</item>
          <item>iPhone</item>
 +        <item>iPad</item>
 +        <item>Froyo-N1</item>
      </string-array>
      <!-- Do not tranlsate.  Development option -->
      <string-array name="pref_development_ua_values" translatable="false">
          <item>0</item>
          <item>1</item>
          <item>2</item>
 +        <item>3</item>
 +        <item>4</item>
      </string-array>
      <string name="pref_development_error_console" translatable="false">Show JavaScript Console</string>
      <!-- Settings screen, setting option name -->

diff --combined src/com/android/browser/BrowserProvider.java
index a7da246,6c9a769..f8574ed
--- 1/src/com/android/browser/BrowserProvider.java
--- 2/src/com/android/browser/BrowserProvider.java
+++ b/src/com/android/browser/BrowserProvider.java
@@@ -356,7 -356,7 +356,7 @@@ public class BrowserProvider extends Co
                  fixPicasaBookmark();
                  Editor ed = p.edit();
                  ed.putBoolean("fix_picasa", false);
 -                ed.commit();
 +                ed.apply();
              }
          }
          mSettings = BrowserSettings.getInstance();
@@@ -821,7 -821,6 +821,6 @@@
              } else {
                  // get search suggestions if there is still space in the list
                  if (myArgs != null && myArgs.length > 1
-                         && mSettings.getShowSearchSuggestions()
                          && c.getCount() < (MAX_SUGGESTION_SHORT_ENTRIES - 1)) {
                      SearchEngine searchEngine = mSettings.getSearchEngine();
                      if (searchEngine != null && searchEngine.supportsSuggestions()) {

diff --combined src/com/android/browser/BrowserSettings.java
index 56d3b6f,71777d6..3791eb0
--- 1/src/com/android/browser/BrowserSettings.java
--- 2/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@@ -80,7 -80,6 +80,6 @@@ class BrowserSettings extends Observabl
      private String defaultTextEncodingName;
      private String homeUrl = "";
      private SearchEngine searchEngine;
-     private boolean showSearchSuggestions;
      private boolean autoFitPage;
      private boolean landscapeOnly;
      private boolean loadsPageInOverviewMode;
@@@ -132,7 -131,6 +131,6 @@@
      public final static String PREF_CLEAR_HISTORY = "privacy_clear_history";
      public final static String PREF_HOMEPAGE = "homepage";
      public final static String PREF_SEARCH_ENGINE = "search_engine";
-     public final static String PREF_SHOW_SEARCH_SUGGESTIONS = "show_search_suggestions";
      public final static String PREF_CLEAR_FORM_DATA =
              "privacy_clear_form_data";
      public final static String PREF_CLEAR_PASSWORDS =
@@@ -149,20 -147,12 +147,20 @@@
              "privacy_clear_geolocation_access";
  
      private static final String DESKTOP_USERAGENT = "Mozilla/5.0 (Macintosh; " +
 -            "U; Intel Mac OS X 10_5_7; en-us) AppleWebKit/530.17 (KHTML, " +
 -            "like Gecko) Version/4.0 Safari/530.17";
 +            "U; Intel Mac OS X 10_6_3; en-us) AppleWebKit/533.16 (KHTML, " +
 +            "like Gecko) Version/5.0 Safari/533.16";
  
      private static final String IPHONE_USERAGENT = "Mozilla/5.0 (iPhone; U; " +
 -            "CPU iPhone OS 3_0 like Mac OS X; en-us) AppleWebKit/528.18 " +
 -            "(KHTML, like Gecko) Version/4.0 Mobile/7A341 Safari/528.16";
 +            "CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 " +
 +            "(KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7";
 +
 +    private static final String IPAD_USERAGENT = "Mozilla/5.0 (iPad; U; " +
 +            "CPU OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 " +
 +            "(KHTML, like Gecko) Version/4.0.4 Mobile/7B367 Safari/531.21.10";
 +
 +    private static final String FROYO_USERAGENT = "Mozilla/5.0 (Linux; U; " +
 +            "Android 2.2; en-us; Nexus One Build/FRF91) AppleWebKit/533.1 " +
 +            "(KHTML, like Gecko) Version/4.0 Mobile Safari/533.1";
  
      // Value to truncate strings when adding them to a TextView within
      // a ListView
@@@ -202,10 -192,6 +200,10 @@@
                  s.setUserAgentString(DESKTOP_USERAGENT);
              } else if (b.userAgent == 2) {
                  s.setUserAgentString(IPHONE_USERAGENT);
 +            } else if (b.userAgent == 3) {
 +                s.setUserAgentString(IPAD_USERAGENT);
 +            } else if (b.userAgent == 4) {
 +                s.setUserAgentString(FROYO_USERAGENT);
              }
              s.setUseWideViewPort(b.useWideViewPort);
              s.setLoadsImagesAutomatically(b.loadsImagesAutomatically);
@@@ -290,19 -276,6 +288,6 @@@
              pageCacheCapacity = 1;
          }
  
-         final ContentResolver cr = ctx.getContentResolver();
-         cr.registerContentObserver(
-                 Settings.System.getUriFor(Settings.System.SHOW_WEB_SUGGESTIONS), false,
-                 new ContentObserver(new Handler()) {
-                         @Override
-                         public void onChange(boolean selfChange) {
-                             SharedPreferences p =
-                                     PreferenceManager.getDefaultSharedPreferences(ctx);
-                             updateShowWebSuggestions(cr, p);
-                         }
-                 });
-         updateShowWebSuggestions(cr, p);
- 
      // Load the defaults from the xml
          // This call is TOO SLOW, need to manually keep the defaults
          // in sync
@@@ -331,9 -304,6 +316,6 @@@
              searchEngine = SearchEngines.get(ctx, searchEngineName);
          }
          Log.i(TAG, "Selected search engine: " + searchEngine);
-         showSearchSuggestions = p.getBoolean(PREF_SHOW_SEARCH_SUGGESTIONS, true);
-         // Persist to system settings
-         saveShowWebSuggestions(ctx.getContentResolver());
  
          loadsImagesAutomatically = p.getBoolean("load_images",
                  loadsImagesAutomatically);
@@@ -422,18 -392,6 +404,6 @@@
          update();
      }
  
-     private void saveShowWebSuggestions(ContentResolver cr) {
-         int value = showSearchSuggestions ? 1 : 0;
-         Settings.System.putInt(cr, Settings.System.SHOW_WEB_SUGGESTIONS, value);
-     }
- 
-     private void updateShowWebSuggestions(ContentResolver cr, SharedPreferences p) {
-         showSearchSuggestions =
-                 Settings.System.getInt(cr,
-                         Settings.System.SHOW_WEB_SUGGESTIONS, 1) == 1;
-         p.edit().putBoolean(PREF_SHOW_SEARCH_SUGGESTIONS, showSearchSuggestions).commit();
-     }
- 
      public String getHomePage() {
          return homeUrl;
      }
@@@ -442,10 -400,6 +412,6 @@@
          return searchEngine;
      }
  
-     public boolean getShowSearchSuggestions() {
-         return showSearchSuggestions;
-     }
- 
      public String getJsFlags() {
          return jsFlags;
      }
@@@ -458,7 -412,7 +424,7 @@@
          Editor ed = PreferenceManager.
                  getDefaultSharedPreferences(context).edit();
          ed.putString(PREF_HOMEPAGE, url);
 -        ed.commit();
 +        ed.apply();
          homeUrl = url;
      }
  
@@@ -580,10 -534,7 +546,10 @@@
      /* package */ void clearFormData(Context context) {
          WebViewDatabase.getInstance(context).clearFormData();
          if (mTabControl != null) {
 -            mTabControl.getCurrentTopWebView().clearFormData();
 +            WebView currentTopView = mTabControl.getCurrentTopWebView();
 +            if (currentTopView != null) {
 +                currentTopView.clearFormData();
 +            }
          }
      }
  
@@@ -638,7 -589,7 +604,7 @@@
          reset();
          SharedPreferences p =
              PreferenceManager.getDefaultSharedPreferences(ctx);
 -        p.edit().clear().commit();
 +        p.edit().clear().apply();
          PreferenceManager.setDefaultValues(ctx, R.xml.browser_preferences,
                  true);
          // reset homeUrl