diff options
author | Panos Thomas <panos@codeaurora.org> | 2014-11-13 16:20:11 -0800 |
---|---|---|
committer | WebTech Code Review <code-review@localhost> | 2014-12-10 10:21:22 -0800 |
commit | 4bdb5257fa56ebfda99f5fca1d9dbfafbdd59339 (patch) | |
tree | c14e8b73bbe7a85df46dd0849925594e659a9fc1 /src/com/android/browser/BrowserSettings.java | |
parent | 8f1c99a8ff9cd9157e6ed3c94bbbbebd4b2aff3d (diff) | |
download | android_packages_apps_Gello-4bdb5257fa56ebfda99f5fca1d9dbfafbdd59339.tar.gz android_packages_apps_Gello-4bdb5257fa56ebfda99f5fca1d9dbfafbdd59339.tar.bz2 android_packages_apps_Gello-4bdb5257fa56ebfda99f5fca1d9dbfafbdd59339.zip |
Add more switches to enable/disable carrier features
Add bools to enable/disable the following carrier specific features:
- Exit menu item with 'Minimize or quit' dialog
- Display page title instead of URL in URL bar
- Allow users to provide custom download path
Add method to detect if a carrier specific feature is enabled.
Change-Id: I9db1b16afd14e476de474e8c86bd60ba1a450aba
Diffstat (limited to 'src/com/android/browser/BrowserSettings.java')
-rw-r--r-- | src/com/android/browser/BrowserSettings.java | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java index 7e07721d..4d7bc556 100644 --- a/src/com/android/browser/BrowserSettings.java +++ b/src/com/android/browser/BrowserSettings.java @@ -734,18 +734,23 @@ public class BrowserSettings implements OnSharedPreferenceChangeListener, } public boolean allowMediaDownloads() { - boolean enableMediaDownloads = mController.getContext().getResources().getBoolean( - R.bool.def_enable_media_downloads); - boolean shouldAllowMediaDownloads = mPrefs.getBoolean( - PREF_ALLOW_MEDIA_DOWNLOADS, enableMediaDownloads); + // Return false if preference is not exposed to user + if (!BrowserConfig.getInstance(mContext) + .hasFeature(BrowserConfig.Feature.ALLOW_MEDIA_DOWNLOADS)) + return false; + + // Otherwise, look at default value + boolean defaultAllowMediaDownloadsValue = mController.getContext() + .getResources().getBoolean(R.bool.def_allow_media_downloads); - if(!mPrefs.contains(PREF_ALLOW_MEDIA_DOWNLOADS)){ + // If preference is not saved, save default value + if (!mPrefs.contains(PREF_ALLOW_MEDIA_DOWNLOADS)){ Editor edit = mPrefs.edit(); - edit.putBoolean(PREF_ALLOW_MEDIA_DOWNLOADS, shouldAllowMediaDownloads); + edit.putBoolean(PREF_ALLOW_MEDIA_DOWNLOADS, defaultAllowMediaDownloadsValue); edit.apply(); } - return shouldAllowMediaDownloads; + return mPrefs.getBoolean(PREF_ALLOW_MEDIA_DOWNLOADS, defaultAllowMediaDownloadsValue); } // TODO: Cache |