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

am e609241a: Merge "Disable AutoFill in private browsing mode." into honeycomb

Browse Source 
* commit 'e609241a76005cf09ed62b2cf99bf1a7a523bb99':
  Disable AutoFill in private browsing mode.
This commit is contained in:
Ben Murdoch
2011-01-18 10:14:10 -08:00
committed by Android Git Automerger
parent dec3867252 e609241a76
commit 5ad8c70d69
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) {
if (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();
}
}
@@ -1644,8 +1649,10 @@ public class WebSettings {
* @hide
*/
public synchronized void setAutoFillEnabled(boolean enabled) {
if (mAutoFillEnabled != enabled) {
mAutoFillEnabled = enabled;
// AutoFill is always disabled in private browsing mode.
boolean autoFillEnabled = enabled && !mPrivateBrowsingEnabled;
if (mAutoFillEnabled != autoFillEnabled) {
mAutoFillEnabled = autoFillEnabled;
postSync();
}
}