diff options
| author | Pankaj Garg <pgarg@codeaurora.org> | 2015-07-06 14:38:43 -0700 |
|---|---|---|
| committer | jrizzoli <joey@cyanogenmoditalia.it> | 2015-08-28 13:15:45 +0200 |
| commit | 1101521c307cb771131ae213cd79191a0c9e1ce7 (patch) | |
| tree | d4becb3738b9e1e63a76a939ea58173b01e653bf | |
| parent | 2a675c288d856073ebe4139d2fad5299e483165d (diff) | |
| download | android_packages_apps_Gello-1101521c307cb771131ae213cd79191a0c9e1ce7.tar.gz android_packages_apps_Gello-1101521c307cb771131ae213cd79191a0c9e1ce7.tar.bz2 android_packages_apps_Gello-1101521c307cb771131ae213cd79191a0c9e1ce7.zip | |
Browesr fixes detected by tests
- Default popup setting
- Clear private data setting
Change-Id: Ie33e8d9cbdc3ccb05759030bd4e90f7ec0725fd6
| -rw-r--r-- | res/xml/privacy_and_security_preferences.xml | 1 | ||||
| -rw-r--r-- | src/com/android/browser/BrowserBookmarksAdapter.java | 2 | ||||
| -rw-r--r-- | src/com/android/browser/BrowserSettings.java | 3 |
3 files changed, 5 insertions, 1 deletions
diff --git a/res/xml/privacy_and_security_preferences.xml b/res/xml/privacy_and_security_preferences.xml index b15509fe..d543498c 100644 --- a/res/xml/privacy_and_security_preferences.xml +++ b/res/xml/privacy_and_security_preferences.xml @@ -66,6 +66,7 @@ <PreferenceScreen android:title="@string/webstorage_private_data_title" android:layout="@layout/swe_preference" + android:key="clear_private_data" android:widgetLayout="@layout/swe_preference_storage_widget" > <CheckBoxPreference diff --git a/src/com/android/browser/BrowserBookmarksAdapter.java b/src/com/android/browser/BrowserBookmarksAdapter.java index cef6e626..d0930ff6 100644 --- a/src/com/android/browser/BrowserBookmarksAdapter.java +++ b/src/com/android/browser/BrowserBookmarksAdapter.java @@ -93,6 +93,8 @@ public class BrowserBookmarksAdapter extends Bitmap b; + thumb.setFloating(false); + if (item.is_folder) { b = BitmapFactory.decodeResource(mContext.getResources(), R.drawable.ic_deco_folder_normal); diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java index ca5c283b..995f84a2 100644 --- a/src/com/android/browser/BrowserSettings.java +++ b/src/com/android/browser/BrowserSettings.java @@ -792,7 +792,8 @@ public class BrowserSettings implements OnSharedPreferenceChangeListener, } public boolean blockPopupWindows() { - return !mPrefs.getBoolean(PREF_POPUP_WINDOWS, false); + return !PermissionsServiceFactory.getDefaultPermissions( + PermissionsServiceFactory.PermissionType.POPUP); } public boolean loadImages() { |