From 7f9b90542e05b350d14bd63c16446c8ce2baf407 Mon Sep 17 00:00:00 2001
From: Adam Powell <adamp@google.com>
Date: Tue, 19 Oct 2010 16:56:07 -0700
Subject: [PATCH] Add ActionBar tab callback method onTabReselected

onTabReselected is called if an already-selected tab is chosen again.
For many apps this will be a no-op, but some may treat it as a signal
to return to the top level of a given navigation category.

Change-Id: Ic51fbe477b979562f2d848c4070b2016b217a90f
---
 api/current.xml                               | 15 +++++++++++
 core/java/android/app/ActionBar.java          | 10 ++++++++
 .../android/internal/app/ActionBarImpl.java   | 25 +++++++++++--------
 3 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/api/current.xml b/api/current.xml
index baa5631e1d2ee..6da4a3397a199 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -19972,6 +19972,21 @@
  deprecated="not deprecated"
  visibility="public"
 >
+<method name="onTabReselected"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="tab" type="android.app.ActionBar.Tab">
+</parameter>
+<parameter name="ft" type="android.app.FragmentTransaction">
+</parameter>
+</method>
 <method name="onTabSelected"
  return="void"
  abstract="true"
diff --git a/core/java/android/app/ActionBar.java b/core/java/android/app/ActionBar.java
index 29f2e3088c0ad..7df9295c012ec 100644
--- a/core/java/android/app/ActionBar.java
+++ b/core/java/android/app/ActionBar.java
@@ -470,5 +470,15 @@ public abstract class ActionBar {
          *        will be executed in a single transaction.
          */
         public void onTabUnselected(Tab tab, FragmentTransaction ft);
+
+        /**
+         * Called when a tab that is already selected is chosen again by the user.
+         * Some applications may use this action to return to the top level of a category.
+         *
+         * @param tab The tab that was reselected.
+         * @param ft A {@link FragmentTransaction} for queuing fragment operations to execute
+         *        once this method returns.
+         */
+        public void onTabReselected(Tab tab, FragmentTransaction ft);
     }
 }
diff --git a/core/java/com/android/internal/app/ActionBarImpl.java b/core/java/com/android/internal/app/ActionBarImpl.java
index cf029d23874b2..3015363e72a8c 100644
--- a/core/java/com/android/internal/app/ActionBarImpl.java
+++ b/core/java/com/android/internal/app/ActionBarImpl.java
@@ -326,18 +326,21 @@ public class ActionBarImpl extends ActionBar {
 
     @Override
     public void selectTab(Tab tab) {
-        if (mSelectedTab == tab) {
-            return;
-        }
-
-        mActionView.setTabSelected(tab != null ? tab.getPosition() : Tab.INVALID_POSITION);
         final FragmentTransaction trans = mActivity.getFragmentManager().openTransaction();
-        if (mSelectedTab != null) {
-            mSelectedTab.getCallback().onTabUnselected(mSelectedTab, trans);
-        }
-        mSelectedTab = (TabImpl) tab;
-        if (mSelectedTab != null) {
-            mSelectedTab.getCallback().onTabSelected(mSelectedTab, trans);
+
+        if (mSelectedTab == tab) {
+            if (mSelectedTab != null) {
+                mSelectedTab.getCallback().onTabReselected(mSelectedTab, trans);
+            }
+        } else {
+            mActionView.setTabSelected(tab != null ? tab.getPosition() : Tab.INVALID_POSITION);
+            if (mSelectedTab != null) {
+                mSelectedTab.getCallback().onTabUnselected(mSelectedTab, trans);
+            }
+            mSelectedTab = (TabImpl) tab;
+            if (mSelectedTab != null) {
+                mSelectedTab.getCallback().onTabSelected(mSelectedTab, trans);
+            }
         }
 
         if (!trans.isEmpty()) {