diff options
author | Winson Chung <winsonc@google.com> | 2011-11-28 18:04:17 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-28 18:04:17 -0800 |
commit | 4a22568d492361e5118b0a01b9c4ec52017adc31 (patch) | |
tree | ed3c17cecb93ddb61c13f5b0ff84ce12533e7fa0 | |
parent | e96e5cb768fcc6f1211c8c31fa2da4dcd4e465cc (diff) | |
parent | 19cd4b9b5b04c894493d440cda59dca543a566dd (diff) | |
download | android_packages_apps_Trebuchet-4a22568d492361e5118b0a01b9c4ec52017adc31.tar.gz android_packages_apps_Trebuchet-4a22568d492361e5118b0a01b9c4ec52017adc31.tar.bz2 android_packages_apps_Trebuchet-4a22568d492361e5118b0a01b9c4ec52017adc31.zip |
Merge "Forcing tabs to be single line and width bound (Bug 5646142)" into ics-mr1
-rw-r--r-- | res/values-land/styles.xml | 6 | ||||
-rw-r--r-- | res/values-port/styles.xml | 5 | ||||
-rw-r--r-- | res/values-sw340dp-port/styles.xml | 3 | ||||
-rw-r--r-- | res/values-sw600dp-port/styles.xml | 24 | ||||
-rw-r--r-- | res/values-sw600dp/styles.xml | 1 | ||||
-rw-r--r-- | res/values/styles.xml | 6 |
6 files changed, 43 insertions, 2 deletions
diff --git a/res/values-land/styles.xml b/res/values-land/styles.xml index 7949d2d34..71ab65859 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 d631d1e17..20369c916 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 9a4224988..b309d85d0 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 000000000..57f07acaf --- /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 e0542ba98..87110da9f 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 502a8368c..909887c44 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 --> |