From f5261da39d50e722587772e5c230c4cc19f8decc Mon Sep 17 00:00:00 2001
From: Michael Kolb <kolby@google.com>
Date: Thu, 15 Dec 2011 15:07:35 -0800
Subject: Make Ctl-Tab and Shift-Ctl-Tab cycle tabs

    Bug: 5731975

Change-Id: I1dd44b25f718a2270d5965a8f3f5dab096398856
---
 src/com/android/browser/Controller.java | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index 9683a47..c395935 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -2569,8 +2569,11 @@ public class Controller
      * returns the current tab if it can't advance
      */
     private Tab getNextTab() {
-        return mTabControl.getTab(Math.min(mTabControl.getTabCount() - 1,
-                mTabControl.getCurrentPosition() + 1));
+        int pos = mTabControl.getCurrentPosition() + 1;
+        if (pos >= mTabControl.getTabCount()) {
+            pos = 0;
+        }
+        return mTabControl.getTab(pos);
     }
 
     /**
@@ -2578,8 +2581,11 @@ public class Controller
      * returns the current tab if it can't advance
      */
     private Tab getPrevTab() {
-        return  mTabControl.getTab(Math.max(0,
-                mTabControl.getCurrentPosition() - 1));
+        int pos  = mTabControl.getCurrentPosition() - 1;
+        if ( pos < 0) {
+            pos = mTabControl.getTabCount() - 1;
+        }
+        return  mTabControl.getTab(pos);
     }
 
     /**
-- 
cgit v1.1