diff options
| author | John Reck <jreck@android.com> | 2014-02-28 17:38:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-28 17:38:04 +0000 |
| commit | f5ebe8954db6ad51fd3f0e785426f6508ceb29cd (patch) | |
| tree | 20b94c0fbf89c1e782ebb84fc55c337495d8b78a | |
| parent | 08d346549686bdb6443853d93e6582b12287bff3 (diff) | |
| parent | 487d451a6831fff2dae55b59d91cb9305cac701c (diff) | |
| download | packages_apps_Browser-f5ebe8954db6ad51fd3f0e785426f6508ceb29cd.zip packages_apps_Browser-f5ebe8954db6ad51fd3f0e785426f6508ceb29cd.tar.gz packages_apps_Browser-f5ebe8954db6ad51fd3f0e785426f6508ceb29cd.tar.bz2 | |
am 487d451a: am dbad7252: Merge "Fix a crash when creating an incognito tab."
* commit '487d451a6831fff2dae55b59d91cb9305cac701c':
Fix a crash when creating an incognito tab.
| -rw-r--r-- | src/com/android/browser/PhoneUi.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/browser/PhoneUi.java b/src/com/android/browser/PhoneUi.java index 89eae70..e5c45df 100644 --- a/src/com/android/browser/PhoneUi.java +++ b/src/com/android/browser/PhoneUi.java @@ -25,6 +25,7 @@ import android.content.Context; import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.Matrix; +import android.os.Build; import android.os.Message; import android.util.Log; import android.util.TypedValue; @@ -189,7 +190,8 @@ public class PhoneUi extends BaseUi { } MenuItem incognito = menu.findItem(R.id.incognito_menu_id); if (incognito != null) { - incognito.setVisible(showingNavScreen() || mUseQuickControls); + 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) { |