Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Disable AutoFill in private browsing mode." into honeycomb

Browse Source
This commit is contained in:
Ben Murdoch
2011-01-18 10:07:01 -08:00
committed by Android (Google) Code Review
parent 08dc7ce56f 4bd87d6e47
commit e609241a76
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/webkit/WebSettings.java
View File

@@ -1629,6 +1629,11 @@ public class WebSettings {
/* package */ synchronized void setPrivateBrowsingEnabled(boolean flag) { /* package */ synchronized void setPrivateBrowsingEnabled(boolean flag) {
if (mPrivateBrowsingEnabled != flag) { if (mPrivateBrowsingEnabled != flag) {
mPrivateBrowsingEnabled = flag; mPrivateBrowsingEnabled = flag;
// AutoFill is dependant on private browsing being enabled so
// reset it to take account of the new value of mPrivateBrowsingEnabled.
setAutoFillEnabled(mAutoFillEnabled);
postSync(); postSync();
} }
} }
@@ -1644,8 +1649,10 @@ public class WebSettings {
* @hide * @hide
*/ */
public synchronized void setAutoFillEnabled(boolean enabled) { public synchronized void setAutoFillEnabled(boolean enabled) {
if (mAutoFillEnabled != enabled) { // AutoFill is always disabled in private browsing mode.
mAutoFillEnabled = enabled; boolean autoFillEnabled = enabled && !mPrivateBrowsingEnabled;
if (mAutoFillEnabled != autoFillEnabled) {
mAutoFillEnabled = autoFillEnabled;
postSync(); postSync();
} }
} }