Merge "Asset swap" into honeycomb
diff --git a/res/drawable-hdpi/gardening_crosshairs.png b/res/drawable-hdpi/gardening_crosshairs.png
index fca6036..409bb5d 100644
--- a/res/drawable-hdpi/gardening_crosshairs.png
+++ b/res/drawable-hdpi/gardening_crosshairs.png
Binary files differ
diff --git a/res/drawable-mdpi/gardening_crosshairs.png b/res/drawable-mdpi/gardening_crosshairs.png
index d473044..338c832 100644
--- a/res/drawable-mdpi/gardening_crosshairs.png
+++ b/res/drawable-mdpi/gardening_crosshairs.png
Binary files differ
diff --git a/res/layout-xlarge-port/tab_widget_indicator.xml b/res/layout-xlarge-port/tab_widget_indicator.xml
new file mode 100644
index 0000000..b113b7b
--- /dev/null
+++ b/res/layout-xlarge-port/tab_widget_indicator.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+
+<TextView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ style="@style/TabIndicator.Portrait" />
diff --git a/res/layout-xlarge/tab_widget_indicator.xml b/res/layout-xlarge/tab_widget_indicator.xml
index 1b3f1c0..7794e29 100644
--- a/res/layout-xlarge/tab_widget_indicator.xml
+++ b/res/layout-xlarge/tab_widget_indicator.xml
@@ -16,20 +16,4 @@
<TextView
xmlns:android="http://schemas.android.com/apk/res/android"
-
- android:id="@+id/title"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:gravity="center"
- android:paddingLeft="40dp"
- android:paddingRight="40dp"
- android:paddingTop="15dp"
- android:paddingBottom="20dp"
-
- android:textColor="@color/tab_widget_indicator_color"
- android:background="@drawable/tab_widget_indicator_selector"
- android:textSize="20sp"
- android:shadowColor="#393939"
- android:shadowDx="0.0"
- android:shadowDy="1.0"
- android:shadowRadius="1.0" />
+ style="@style/TabIndicator" />
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 91fe2c9..6c372e3 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -32,7 +32,7 @@
<color name="app_info_filter">#A50000FE</color>
<color name="dimmed_view_color">#FF7F7F7F</color>
- <color name="drag_outline_color">#9DBE12</color>
+ <color name="drag_outline_color">#6595f9</color>
<color name="workspace_item_pressed_outline_color">#6595f9</color>
<color name="workspace_item_pressed_glow_color">#0997ff</color>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0c4aa26..6dcaa57 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -54,7 +54,7 @@
<!-- Title of tab for configuring wallpapers -->
<string name="wallpapers_tab_label">Wallpapers</string>
<!-- Title of tab for configuring applications -->
- <string name="applications_tab_label">App Shortcuts</string>
+ <string name="applications_tab_label">App shortcuts</string>
<!-- Placeholder text, will be removed -->
<string name="wallpapers_temp_tab_text">This will be the wallpapers tab</string>
<!-- Labels for the tabs in All Apps -->
@@ -65,7 +65,7 @@
<!-- Title of the tab for applications labeled as games [CHAR_LIMIT=24] -->
<string name="all_apps_tab_games">Games</string>
<!-- Tile of the tab for applications that were downloaded from market [CHAR_LIMIT=24] -->
- <string name="all_apps_tab_downloaded">My Apps</string>
+ <string name="all_apps_tab_downloaded">My apps</string>
<!-- All Apps pane -->
<!-- Message to show when there are no games [CHAR_LIMIT=25] -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 7592a15..0c74a6a 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -68,6 +68,28 @@
<item name="android:layout_marginRight">10dip</item>
</style>
+ <style name="TabIndicator">
+ <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">40dp</item>
+ <item name="android:paddingRight">40dp</item>
+ <item name="android:paddingTop">15dp</item>
+ <item name="android:paddingBottom">20dp</item>
+ <item name="android:textColor">@color/tab_widget_indicator_color</item>
+ <item name="android:background">@drawable/tab_widget_indicator_selector</item>
+ <item name="android:textSize">20sp</item>
+ <item name="android:shadowColor">#393939</item>
+ <item name="android:shadowDx">0.0</item>
+ <item name="android:shadowDy">1.0</item>
+ <item name="android:shadowRadius">1.0</item>
+ </style>
+
+ <style name="TabIndicator.Portrait">
+ <item name="android:paddingLeft">20dp</item>
+ <item name="android:paddingRight">20dp</item>
+ </style>
+
<style name="SearchButton" parent="@android:style/Widget.Button.Small">
<item name="android:paddingTop">7dip</item>
<item name="android:paddingBottom">9dip</item>
