Merge change 26459 into eclair

* changes:
  New fasttrack assets.

core/res/res/drawable/fasttrack_badge.xml

@@ -19,10 +19,10 @@
         android:state_focused="false"
         android:state_selected="false"
         android:state_pressed="false"
-        android:drawable="@drawable/fasttrack_badge_dark_normal" />
+        android:drawable="@drawable/fasttrack_badge" />
 
     <item
         android:state_pressed="true"
-        android:drawable="@drawable/fasttrack_badge_dark_pressed" />
+        android:drawable="@drawable/fasttrack_badge_pressed" />
 
 </selector>

core/res/res/drawable/fasttrack_badge_middle_large.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:state_focused="false"
-        android:state_selected="false"
-        android:state_pressed="false"
-        android:drawable="@drawable/fasttrack_badge_middle_large_normal" />
-
-    <item
-        android:state_pressed="true"
-        android:drawable="@drawable/fasttrack_badge_middle_large_pressed" />
-
-</selector>

core/res/res/drawable/fasttrack_badge_small.xml

@@ -19,10 +19,10 @@
         android:state_focused="false"
         android:state_selected="false"
         android:state_pressed="false"
-        android:drawable="@drawable/fasttrack_badge_light_normal" />
+        android:drawable="@drawable/fasttrack_badge_small" />
 
     <item
         android:state_pressed="true"
-        android:drawable="@drawable/fasttrack_badge_light_pressed" />
+        android:drawable="@drawable/fasttrack_badge_small_pressed" />
 
 </selector>

core/res/res/values/attrs.xml

@@ -396,14 +396,20 @@
         <attr name="spinnerItemStyle" format="reference" />
         <!-- Default MapView style. -->
         <attr name="mapViewStyle" format="reference" />
-        <!-- Dark Fasttrack badge style. -->
+        <!-- Default Fasttrack badge style. -->
         <attr name="fasttrackBadgeWidgetStyle" format="reference" />
-        <!-- Dark Fasttrack badge style with small fasttrack window. -->
+        <!-- Default Fasttrack badge style with small fasttrack window. -->
         <attr name="fasttrackBadgeWidgetStyleWindowSmall" format="reference" />
-        <!-- Dark Fasttrack badge style with medium fasttrack window. -->
+        <!-- Default Fasttrack badge style with medium fasttrack window. -->
         <attr name="fasttrackBadgeWidgetStyleWindowMedium" format="reference" />
-        <!-- Dark Fasttrack badge style with large fasttrack window. -->
+        <!-- Default Fasttrack badge style with large fasttrack window. -->
         <attr name="fasttrackBadgeWidgetStyleWindowLarge" format="reference" />
+        <!-- Default Fasttrack badge style with small fasttrack window. -->
+        <attr name="fasttrackBadgeWidgetStyleSmallWindowSmall" format="reference" />
+        <!-- Default Fasttrack badge style with medium fasttrack window. -->
+        <attr name="fasttrackBadgeWidgetStyleSmallWindowMedium" format="reference" />
+        <!-- Default Fasttrack badge style with large fasttrack window. -->
+        <attr name="fasttrackBadgeWidgetStyleSmallWindowLarge" format="reference" />
 
         <!-- =================== -->
         <!-- Preference styles   -->

core/res/res/values/styles.xml

@@ -538,9 +538,17 @@
     </style>
 
     <style name="Widget.FasttrackBadgeWidget">
-        <item name="android:layout_width">48dip</item>
-        <item name="android:layout_height">52dip</item>
-        <item name="android:background">@android:drawable/fasttrack_badge_dark</item>
+        <item name="android:layout_width">50dip</item>
+        <item name="android:layout_height">56dip</item>
+        <item name="android:background">@android:drawable/fasttrack_badge</item>
+        <item name="android:clickable">true</item>
+        <item name="android:scaleType">fitCenter</item>
+    </style>
+    
+    <style name="Widget.FasttrackBadgeWidgetSmall">
+        <item name="android:layout_width">39dip</item>
+        <item name="android:layout_height">42dip</item>
+        <item name="android:background">@android:drawable/fasttrack_badge_small</item>
         <item name="android:clickable">true</item>
         <item name="android:scaleType">fitCenter</item>
     </style>
@@ -556,6 +564,18 @@
     <style name="Widget.FasttrackBadgeWidget.WindowLarge">
         <item name="android:fasttrackWindowSize">modeLarge</item>
     </style>
+    
+    <style name="Widget.FasttrackBadgeWidgetSmall.WindowSmall">
+        <item name="android:fasttrackWindowSize">modeSmall</item>
+    </style>
+
+    <style name="Widget.FasttrackBadgeWidgetSmall.WindowMedium">
+        <item name="android:fasttrackWindowSize">modeMedium</item>
+    </style>
+
+    <style name="Widget.FasttrackBadgeWidgetSmall.WindowLarge">
+        <item name="android:fasttrackWindowSize">modeLarge</item>
+    </style>
 
     <!-- Text Appearances -->
     <eat-comment />

core/res/res/values/themes.xml

@@ -175,6 +175,9 @@
         <item name="fasttrackBadgeWidgetStyleWindowSmall">@android:style/Widget.FasttrackBadgeWidget.WindowSmall</item>
         <item name="fasttrackBadgeWidgetStyleWindowMedium">@android:style/Widget.FasttrackBadgeWidget.WindowMedium</item>
         <item name="fasttrackBadgeWidgetStyleWindowLarge">@android:style/Widget.FasttrackBadgeWidget.WindowLarge</item>
+        <item name="fasttrackBadgeWidgetStyleSmallWindowSmall">@android:style/Widget.FasttrackBadgeWidgetSmall.WindowSmall</item>
+        <item name="fasttrackBadgeWidgetStyleSmallWindowMedium">@android:style/Widget.FasttrackBadgeWidgetSmall.WindowMedium</item>
+        <item name="fasttrackBadgeWidgetStyleSmallWindowLarge">@android:style/Widget.FasttrackBadgeWidgetSmall.WindowLarge</item>
         
         <!-- Preference styles -->
         <item name="preferenceScreenStyle">@android:style/Preference.PreferenceScreen</item>