summaryrefslogtreecommitdiffstats
path: root/src/com/android/browser
diff options
context:
space:
mode:
authorJohn Reck <jreck@android.com>2014-03-06 02:57:13 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-06 02:57:13 +0000
commit6e2d7aa3d15dda7e3516a53411fef7c219419702 (patch)
tree1c64358b38adbb577ecd9db725f6f66063e66621 /src/com/android/browser
parentf5ebe8954db6ad51fd3f0e785426f6508ceb29cd (diff)
parentc12c0653861a95cd2987d702a70226f0c29ab201 (diff)
downloadpackages_apps_Browser-6e2d7aa3d15dda7e3516a53411fef7c219419702.zip
packages_apps_Browser-6e2d7aa3d15dda7e3516a53411fef7c219419702.tar.gz
packages_apps_Browser-6e2d7aa3d15dda7e3516a53411fef7c219419702.tar.bz2
am c12c0653: am 10c97303: Merge "Fix a crash when creating an incognito tab in the quick controls mode."
* commit 'c12c0653861a95cd2987d702a70226f0c29ab201': Fix a crash when creating an incognito tab in the quick controls mode.
Diffstat (limited to 'src/com/android/browser')
-rw-r--r--src/com/android/browser/PieControl.java10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/com/android/browser/PieControl.java b/src/com/android/browser/PieControl.java
index a33f8c6..d853808 100644
--- a/src/com/android/browser/PieControl.java
+++ b/src/com/android/browser/PieControl.java
@@ -19,6 +19,7 @@ package com.android.browser;
import android.app.Activity;
import android.content.Context;
import android.graphics.Bitmap;
+import android.os.Build;
import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;
@@ -182,8 +183,13 @@ public class PieControl implements PieMenu.PieController, OnClickListener {
mUrl.addItem(makeFiller());
mUrl.addItem(makeFiller());
mPie.addItem(mShowTabs);
- mShowTabs.addItem(mClose);
- mShowTabs.addItem(mIncognito);
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+ mShowTabs.addItem(makeFiller());
+ mShowTabs.addItem(mClose);
+ } else {
+ mShowTabs.addItem(mClose);
+ mShowTabs.addItem(mIncognito);
+ }
mShowTabs.addItem(mNewTab);
mShowTabs.addItem(makeFiller());
mPie.addItem(mBookmarks);