diff options
| author | Ramanan Rajeswaran <> | 2009-03-24 20:41:19 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-24 20:41:19 -0700 |
| commit | dd4f4297c08803b238af28dddb373a1aea06cc1e (patch) | |
| tree | c6e38d548f7afe7fd4693044cd19c7362989ad6b /src/com/android/browser/BrowserSettings.java | |
| parent | 660096250f9a35f890541f7f628717d0c283e084 (diff) | |
| download | packages_apps_Browser-dd4f4297c08803b238af28dddb373a1aea06cc1e.zip packages_apps_Browser-dd4f4297c08803b238af28dddb373a1aea06cc1e.tar.gz packages_apps_Browser-dd4f4297c08803b238af28dddb373a1aea06cc1e.tar.bz2 | |
Automated import from //branches/master/...@141638,141638
Diffstat (limited to 'src/com/android/browser/BrowserSettings.java')
| -rw-r--r-- | src/com/android/browser/BrowserSettings.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java index d8c5186..0e2c5af 100644 --- a/src/com/android/browser/BrowserSettings.java +++ b/src/com/android/browser/BrowserSettings.java @@ -16,6 +16,8 @@ package com.android.browser; +import com.google.android.providers.GoogleSettings.Partner; + import android.app.Activity; import android.content.ContentResolver; import android.content.Context; @@ -65,8 +67,7 @@ class BrowserSettings extends Observable { private boolean saveFormData = true; private boolean openInBackground = false; private String defaultTextEncodingName; - private String homeUrl = "http://www.google.com/m?client=ms-" + - SystemProperties.get("persist.sys.com.google.clientid", "unknown"); + private String homeUrl = "http://www.google.com/m?client=ms-"; private boolean loginInitialized = false; private boolean autoFitPage = true; private boolean showDebugSettings = false; @@ -198,6 +199,8 @@ class BrowserSettings extends Observable { // local directory. pluginsPath = ctx.getDir("plugins", 0).getPath(); + homeUrl += Partner.getString(ctx.getContentResolver(), Partner.CLIENT_ID); + // Load the defaults from the xml // This call is TOO SLOW, need to manually keep the defaults // in sync @@ -206,8 +209,10 @@ class BrowserSettings extends Observable { } /* package */ void syncSharedPreferences(SharedPreferences p) { + homeUrl = p.getString(PREF_HOMEPAGE, homeUrl); + loadsImagesAutomatically = p.getBoolean("load_images", loadsImagesAutomatically); javaScriptEnabled = p.getBoolean("enable_javascript", |