diff options
| author | John Reck <jreck@android.com> | 2014-02-28 17:25:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-02-28 17:25:29 +0000 |
| commit | dbad7252e6e64f19f584e9f66596fe9d4eb95586 (patch) | |
| tree | 4211b785fedddff9520f7dd7709162ec1236030e /src/com | |
| parent | c34de1799596e1659c5edea61f89e807c8119705 (diff) | |
| parent | 9ab7cb7dae990a6530087c0a6bd0413f04c4eaa5 (diff) | |
| download | packages_apps_Browser-dbad7252e6e64f19f584e9f66596fe9d4eb95586.tar.gz packages_apps_Browser-dbad7252e6e64f19f584e9f66596fe9d4eb95586.tar.bz2 packages_apps_Browser-dbad7252e6e64f19f584e9f66596fe9d4eb95586.zip | |
Merge "Fix a crash when creating an incognito tab."
Diffstat (limited to 'src/com')
| -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 89eae708c..e5c45df15 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) { |