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.

1 files changed, 8 insertions, 2 deletions

diff --git a/src/com/android/browser/PieControl.java b/src/com/android/browser/PieControl.java
index a33f8c66..d853808b 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);