From 19cd4b9b5b04c894493d440cda59dca543a566dd Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Mon, 28 Nov 2011 13:50:35 -0800
Subject: [PATCH] Forcing tabs to be single line and width bound (Bug 5646142)

Change-Id: Ia84bde47c5e4b254b636b2697c4f4889ce4f8b95
---
 res/values-land/styles.xml         |  6 ++++++
 res/values-port/styles.xml         |  5 +++++
 res/values-sw340dp-port/styles.xml |  3 +++
 res/values-sw600dp-port/styles.xml | 24 ++++++++++++++++++++++++
 res/values-sw600dp/styles.xml      |  1 +
 res/values/styles.xml              |  6 ++++--
 6 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 res/values-sw600dp-port/styles.xml

diff --git a/res/values-land/styles.xml b/res/values-land/styles.xml
index 7949d2d347..71ab658596 100644
--- a/res/values-land/styles.xml
+++ b/res/values-land/styles.xml
@@ -23,6 +23,7 @@
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
     </style>
+
 <!-- Search Bar -->
     <style name="QSBBar">
         <item name="android:orientation">vertical</item>
@@ -65,5 +66,10 @@
         <item name="android:shadowDy">1.0</item>
         <item name="android:shadowRadius">4.0</item>
     </style>
+
+<!-- AppsCustomize -->
+    <style name="TabIndicator.AppsCustomize">
+        <item name="android:maxWidth">200dp</item>
+    </style>
 </resources>
 
diff --git a/res/values-port/styles.xml b/res/values-port/styles.xml
index d631d1e171..20369c916b 100644
--- a/res/values-port/styles.xml
+++ b/res/values-port/styles.xml
@@ -29,4 +29,9 @@
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
     </style>
+
+<!-- AppsCustomize -->
+    <style name="TabIndicator.AppsCustomize">
+        <item name="android:maxWidth">130dp</item>
+    </style>
 </resources>
diff --git a/res/values-sw340dp-port/styles.xml b/res/values-sw340dp-port/styles.xml
index 9a42249882..b309d85d0c 100644
--- a/res/values-sw340dp-port/styles.xml
+++ b/res/values-sw340dp-port/styles.xml
@@ -26,6 +26,9 @@
     </style>
 
 <!-- AppsCustomize -->
+    <style name="TabIndicator.AppsCustomize">
+        <item name="android:maxWidth">150dp</item>
+    </style>
     <style name="WorkspaceIcon.Portrait.AppsCustomize">
         <item name="android:singleLine">false</item>
         <item name="android:maxLines">2</item>
diff --git a/res/values-sw600dp-port/styles.xml b/res/values-sw600dp-port/styles.xml
new file mode 100644
index 0000000000..57f07acaf7
--- /dev/null
+++ b/res/values-sw600dp-port/styles.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+* Copyright (C) 2011 The Android Open Source Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+-->
+
+<resources>
+    <style name="TabIndicator.AppsCustomize">
+        <item name="android:maxWidth">180dp</item>
+    </style>
+</resources>
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
index e0542ba988..87110da9f8 100644
--- a/res/values-sw600dp/styles.xml
+++ b/res/values-sw600dp/styles.xml
@@ -114,6 +114,7 @@
         <item name="android:paddingLeft">32dp</item>
         <item name="android:paddingRight">32dp</item>
         <item name="android:textSize">14sp</item>
+        <item name="android:maxWidth">240dp</item>
     </style>
 
     <!-- QSB Search / Drop Target bar -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 502a8368c3..909887c44e 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -161,13 +161,15 @@
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">match_parent</item>
         <item name="android:gravity">center</item>
-        <item name="android:paddingLeft">24dp</item>
-        <item name="android:paddingRight">24dp</item>
+        <item name="android:paddingLeft">20dp</item>
+        <item name="android:paddingRight">20dp</item>
         <item name="android:background">@drawable/tab_widget_indicator_selector</item>
         <item name="android:textColor">?android:attr/textColorPrimary</item>
         <item name="android:textSize">12sp</item>
         <item name="android:textStyle">bold</item>
         <item name="android:textAllCaps">true</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:ellipsize">end</item>
     </style>
     <style name="TabIndicator.AppsCustomize">
         <!-- Overridden in values-land -->