commit 1101521c307cb771131ae213cd79191a0c9e1ce7
author Pankaj Garg <pgarg@codeaurora.org> Mon Jul 06 14:38:43 2015 -0700
committer jrizzoli <joey@cyanogenmoditalia.it> Fri Aug 28 13:15:45 2015 +0200
tree d4becb3738b9e1e63a76a939ea58173b01e653bf
parent 2a675c288d856073ebe4139d2fad5299e483165d

Browesr fixes detected by tests

- Default popup setting
- Clear private data setting

Change-Id: Ie33e8d9cbdc3ccb05759030bd4e90f7ec0725fd6

src/com/android/browser/BrowserBookmarksAdapter.java

diff --git a/src/com/android/browser/BrowserBookmarksAdapter.java b/src/com/android/browser/BrowserBookmarksAdapter.java
index cef6e62..d0930ff 100644
--- a/src/com/android/browser/BrowserBookmarksAdapter.java
+++ b/src/com/android/browser/BrowserBookmarksAdapter.java
@@ -93,6 +93,8 @@
 
         Bitmap b;
 
+        thumb.setFloating(false);
+
         if (item.is_folder) {
             b = BitmapFactory.decodeResource(mContext.getResources(),
                     R.drawable.ic_deco_folder_normal);

src/com/android/browser/BrowserSettings.java

diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index ca5c283..995f84a 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -792,7 +792,8 @@
     }
 
     public boolean blockPopupWindows() {
-        return !mPrefs.getBoolean(PREF_POPUP_WINDOWS, false);
+        return !PermissionsServiceFactory.getDefaultPermissions(
+                PermissionsServiceFactory.PermissionType.POPUP);
     }
 
     public boolean loadImages() {