diff options
| author | John Reck <jreck@android.com> | 2014-05-13 16:35:26 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-13 16:35:26 +0000 |
| commit | f6b6a1c69074801f8f4429cb22bc389e63f27de9 (patch) | |
| tree | e9f4a1ad9a125f05b24e268d0722742e8c9b205b /src | |
| parent | 638657c9cc2000c4db6c8e6f7450b1a327644e11 (diff) | |
| parent | 0e867eb98c456248bd2a1e121c6d8e096ec69c35 (diff) | |
| download | Browser-f6b6a1c69074801f8f4429cb22bc389e63f27de9.tar.gz | |
am 0e867eb9: am fe408351: am ac497b63: Merge "Fix Incognito mode crash in AOSP browser"
* commit '0e867eb98c456248bd2a1e121c6d8e096ec69c35':
Fix Incognito mode crash in AOSP browser
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/browser/Controller.java | 4 | ||||
| -rw-r--r-- | src/com/android/browser/PhoneUi.java | 5 |
2 files changed, 0 insertions, 9 deletions
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java index 2d716a8d..70f4383d 100644 --- a/src/com/android/browser/Controller.java +++ b/src/com/android/browser/Controller.java @@ -1554,10 +1554,6 @@ public class Controller openTabToHomePage(); break; - case R.id.incognito_menu_id: - openIncognitoTab(); - break; - case R.id.close_other_tabs_id: closeOtherTabs(); break; diff --git a/src/com/android/browser/PhoneUi.java b/src/com/android/browser/PhoneUi.java index e5c45df1..7b6da079 100644 --- a/src/com/android/browser/PhoneUi.java +++ b/src/com/android/browser/PhoneUi.java @@ -188,11 +188,6 @@ public class PhoneUi extends BaseUi { if (newtab != null && !mUseQuickControls) { newtab.setVisible(false); } - MenuItem incognito = menu.findItem(R.id.incognito_menu_id); - if (incognito != null) { - incognito.setVisible(!(Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) - && (showingNavScreen() || mUseQuickControls)); - } MenuItem closeOthers = menu.findItem(R.id.close_other_tabs_id); if (closeOthers != null) { boolean isLastTab = true; |