From d5a37933744f893901bb68fd8d6982e8f563682d Mon Sep 17 00:00:00 2001
From: Sriram Ramasubramanian <sriram@mozilla.com>
Date: Tue, 18 Dec 2012 16:44:37 -0800
Subject: [PATCH] Bug 817706: Enhance tabs-tray to show either normal or
 private tabs only. [r=mfinkle]

---
 mobile/android/base/TabsTray.java             | 20 ++++++++++++++-----
 .../android/base/resources/values/attrs.xml   |  7 +++++++
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/mobile/android/base/TabsTray.java b/mobile/android/base/TabsTray.java
index e4970955d933..e262fb48a952 100644
--- a/mobile/android/base/TabsTray.java
+++ b/mobile/android/base/TabsTray.java
@@ -8,6 +8,7 @@ package org.mozilla.gecko;
 import org.mozilla.gecko.PropertyAnimator.Property;
 
 import android.content.Context;
+import android.content.res.TypedArray;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.text.TextUtils;
@@ -63,7 +64,11 @@ public class TabsTray extends LinearLayout
         mList = (ListView) findViewById(R.id.list);
         mList.setItemsCanFocus(true);
 
-        mTabsAdapter = new TabsAdapter(mContext);
+        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.TabsTray);
+        boolean isPrivate = (a.getInt(R.styleable.TabsTray_tabs, 0x0) == 1);
+        a.recycle();
+
+        mTabsAdapter = new TabsAdapter(mContext, isPrivate);
         mList.setAdapter(mTabsAdapter);
 
         mSwipeListener = new TabSwipeGestureListener(mList);
@@ -126,13 +131,15 @@ public class TabsTray extends LinearLayout
     // Adapter to bind tabs into a list
     private class TabsAdapter extends BaseAdapter implements Tabs.OnTabsChangedListener {
         private Context mContext;
+        private boolean mIsPrivate;
         private ArrayList<Tab> mTabs;
         private LayoutInflater mInflater;
         private Button.OnClickListener mOnCloseClickListener;
 
-        public TabsAdapter(Context context) {
+        public TabsAdapter(Context context, boolean isPrivate) {
             mContext = context;
             mInflater = LayoutInflater.from(mContext);
+            mIsPrivate = isPrivate;
 
             mOnCloseClickListener = new Button.OnClickListener() {
                 public void onClick(View v) {
@@ -177,7 +184,8 @@ public class TabsTray extends LinearLayout
 
             Iterable<Tab> tabs = Tabs.getInstance().getTabsInOrder();
             for (Tab tab : tabs) {
-                mTabs.add(tab);
+                if (tab.isPrivate() == mIsPrivate)
+                    mTabs.add(tab);
             }
 
             notifyDataSetChanged(); // Be sure to call this whenever mTabs changes.
@@ -218,8 +226,10 @@ public class TabsTray extends LinearLayout
         }
 
         private void removeTab(Tab tab) {
-            mTabs.remove(tab);
-            notifyDataSetChanged(); // Be sure to call this whenever mTabs changes.
+            if (tab.isPrivate() == mIsPrivate) {
+                mTabs.remove(tab);
+                notifyDataSetChanged(); // Be sure to call this whenever mTabs changes.
+            }
         }
 
         private void assignValues(TabRow row, Tab tab) {
diff --git a/mobile/android/base/resources/values/attrs.xml b/mobile/android/base/resources/values/attrs.xml
index 2d9ba24b873e..f028ace3f1db 100644
--- a/mobile/android/base/resources/values/attrs.xml
+++ b/mobile/android/base/resources/values/attrs.xml
@@ -49,6 +49,13 @@
         <attr name="sidebar" format="boolean"/>
     </declare-styleable>
 
+    <declare-styleable name="TabsTray">
+        <attr name="tabs">
+            <flag name="tabs_normal" value="0x00" />
+            <flag name="tabs_private" value ="0x01" />
+        </attr>
+    </declare-styleable>
+
     <declare-styleable name="TextSelectionHandle">
         <attr name="handleType">
             <flag name="start" value="0x01" />