From 1cad91e625386885a4b5f82a7fa3f05c5e575750 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Wed, 25 May 2011 17:41:01 -0700
Subject: Adding QSB

- Also changing AppsCustomize bg to black.

Change-Id: Iadd1a34dda56b02191e00502714296a1a3c8ee88
---
 res/drawable-hdpi/divider_launcher_holo.9.png      | Bin 0 -> 199 bytes
 res/drawable-hdpi/ic_generic_search.png            | Bin 0 -> 6099 bytes
 res/drawable-hdpi/ic_voice_search.png              | Bin 0 -> 4969 bytes
 res/drawable-land-hdpi/divider_launcher_holo.9.png | Bin 0 -> 2886 bytes
 res/drawable-land-mdpi/divider_launcher_holo.9.png | Bin 0 -> 2877 bytes
 .../divider_launcher_holo.9.png                    | Bin 199 -> 0 bytes
 res/drawable-large-hdpi/ic_generic_search.png      | Bin 6099 -> 0 bytes
 res/drawable-large-hdpi/ic_voice_search.png        | Bin 4969 -> 0 bytes
 .../divider_launcher_holo.9.png                    | Bin 1078 -> 0 bytes
 res/drawable-large-mdpi/ic_generic_search.png      | Bin 4885 -> 0 bytes
 res/drawable-large-mdpi/ic_voice_search.png        | Bin 4171 -> 0 bytes
 res/drawable-mdpi/divider_launcher_holo.9.png      | Bin 0 -> 1078 bytes
 res/drawable-mdpi/ic_generic_search.png            | Bin 0 -> 4885 bytes
 res/drawable-mdpi/ic_voice_search.png              | Bin 0 -> 4171 bytes
 res/layout-land/launcher.xml                       |   6 ++
 res/layout-land/workspace_screen.xml               |   2 +-
 res/layout-port/launcher.xml                       |   7 ++-
 res/layout-port/workspace_screen.xml               |   2 +-
 res/layout/apps_customize_pane.xml                 |   2 +-
 res/layout/qsb_bar.xml                             |  70 +++++++++++++++++++++
 res/values-land/dimens.xml                         |   6 +-
 res/values-land/styles.xml                         |  17 +++++
 res/values-large/dimens.xml                        |   3 -
 res/values/dimens.xml                              |   7 +++
 res/values/styles.xml                              |  24 ++++---
 25 files changed, 131 insertions(+), 15 deletions(-)
 create mode 100644 res/drawable-hdpi/divider_launcher_holo.9.png
 create mode 100644 res/drawable-hdpi/ic_generic_search.png
 create mode 100644 res/drawable-hdpi/ic_voice_search.png
 create mode 100644 res/drawable-land-hdpi/divider_launcher_holo.9.png
 create mode 100644 res/drawable-land-mdpi/divider_launcher_holo.9.png
 delete mode 100644 res/drawable-large-hdpi/divider_launcher_holo.9.png
 delete mode 100644 res/drawable-large-hdpi/ic_generic_search.png
 delete mode 100644 res/drawable-large-hdpi/ic_voice_search.png
 delete mode 100644 res/drawable-large-mdpi/divider_launcher_holo.9.png
 delete mode 100644 res/drawable-large-mdpi/ic_generic_search.png
 delete mode 100644 res/drawable-large-mdpi/ic_voice_search.png
 create mode 100644 res/drawable-mdpi/divider_launcher_holo.9.png
 create mode 100644 res/drawable-mdpi/ic_generic_search.png
 create mode 100644 res/drawable-mdpi/ic_voice_search.png
 create mode 100644 res/layout/qsb_bar.xml

(limited to 'res')

diff --git a/res/drawable-hdpi/divider_launcher_holo.9.png b/res/drawable-hdpi/divider_launcher_holo.9.png
new file mode 100644
index 000000000..0a1bd2a26
Binary files /dev/null and b/res/drawable-hdpi/divider_launcher_holo.9.png differ
diff --git a/res/drawable-hdpi/ic_generic_search.png b/res/drawable-hdpi/ic_generic_search.png
new file mode 100644
index 000000000..67bac5cc8
Binary files /dev/null and b/res/drawable-hdpi/ic_generic_search.png differ
diff --git a/res/drawable-hdpi/ic_voice_search.png b/res/drawable-hdpi/ic_voice_search.png
new file mode 100644
index 000000000..5d2f341ea
Binary files /dev/null and b/res/drawable-hdpi/ic_voice_search.png differ
diff --git a/res/drawable-land-hdpi/divider_launcher_holo.9.png b/res/drawable-land-hdpi/divider_launcher_holo.9.png
new file mode 100644
index 000000000..f07f6c4b9
Binary files /dev/null and b/res/drawable-land-hdpi/divider_launcher_holo.9.png differ
diff --git a/res/drawable-land-mdpi/divider_launcher_holo.9.png b/res/drawable-land-mdpi/divider_launcher_holo.9.png
new file mode 100644
index 000000000..ae7734045
Binary files /dev/null and b/res/drawable-land-mdpi/divider_launcher_holo.9.png differ
diff --git a/res/drawable-large-hdpi/divider_launcher_holo.9.png b/res/drawable-large-hdpi/divider_launcher_holo.9.png
deleted file mode 100644
index 0a1bd2a26..000000000
Binary files a/res/drawable-large-hdpi/divider_launcher_holo.9.png and /dev/null differ
diff --git a/res/drawable-large-hdpi/ic_generic_search.png b/res/drawable-large-hdpi/ic_generic_search.png
deleted file mode 100644
index 67bac5cc8..000000000
Binary files a/res/drawable-large-hdpi/ic_generic_search.png and /dev/null differ
diff --git a/res/drawable-large-hdpi/ic_voice_search.png b/res/drawable-large-hdpi/ic_voice_search.png
deleted file mode 100644
index 5d2f341ea..000000000
Binary files a/res/drawable-large-hdpi/ic_voice_search.png and /dev/null differ
diff --git a/res/drawable-large-mdpi/divider_launcher_holo.9.png b/res/drawable-large-mdpi/divider_launcher_holo.9.png
deleted file mode 100644
index 6d101f4ce..000000000
Binary files a/res/drawable-large-mdpi/divider_launcher_holo.9.png and /dev/null differ
diff --git a/res/drawable-large-mdpi/ic_generic_search.png b/res/drawable-large-mdpi/ic_generic_search.png
deleted file mode 100644
index e3fd5a266..000000000
Binary files a/res/drawable-large-mdpi/ic_generic_search.png and /dev/null differ
diff --git a/res/drawable-large-mdpi/ic_voice_search.png b/res/drawable-large-mdpi/ic_voice_search.png
deleted file mode 100644
index 3c52e2ad8..000000000
Binary files a/res/drawable-large-mdpi/ic_voice_search.png and /dev/null differ
diff --git a/res/drawable-mdpi/divider_launcher_holo.9.png b/res/drawable-mdpi/divider_launcher_holo.9.png
new file mode 100644
index 000000000..6d101f4ce
Binary files /dev/null and b/res/drawable-mdpi/divider_launcher_holo.9.png differ
diff --git a/res/drawable-mdpi/ic_generic_search.png b/res/drawable-mdpi/ic_generic_search.png
new file mode 100644
index 000000000..e3fd5a266
Binary files /dev/null and b/res/drawable-mdpi/ic_generic_search.png differ
diff --git a/res/drawable-mdpi/ic_voice_search.png b/res/drawable-mdpi/ic_voice_search.png
new file mode 100644
index 000000000..3c52e2ad8
Binary files /dev/null and b/res/drawable-mdpi/ic_voice_search.png differ
diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml
index b2b2c9f70..c8a82e69d 100644
--- a/res/layout-land/launcher.xml
+++ b/res/layout-land/launcher.xml
@@ -41,6 +41,12 @@
 
     </com.android.launcher2.Workspace>
 
+    <include layout="@layout/qsb_bar"
+        android:id="@+id/qsb_bar"
+        android:layout_width="@dimen/qsb_bar_height"
+        android:layout_height="match_parent"
+        android:layout_gravity="left" />
+
     <include layout="@layout/apps_customize_pane"
         android:id="@+id/apps_customize_pane"
         android:layout_width="match_parent"
diff --git a/res/layout-land/workspace_screen.xml b/res/layout-land/workspace_screen.xml
index f2bac599e..a9faf892f 100644
--- a/res/layout-land/workspace_screen.xml
+++ b/res/layout-land/workspace_screen.xml
@@ -24,7 +24,7 @@
 
     launcher:cellWidth="@dimen/workspace_cell_width"
     launcher:cellHeight="@dimen/workspace_cell_height"
-    launcher:xAxisStartPadding="48dip"
+    launcher:xAxisStartPadding="@dimen/qsb_bar_height"
     launcher:xAxisEndPadding="0dip"
     launcher:yAxisStartPadding="0dip"
     launcher:yAxisEndPadding="0dip"/>
diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml
index c7bcbb026..f05f9b68e 100644
--- a/res/layout-port/launcher.xml
+++ b/res/layout-port/launcher.xml
@@ -36,9 +36,14 @@
         <include android:id="@+id/cell3" layout="@layout/workspace_screen" />
         <include android:id="@+id/cell4" layout="@layout/workspace_screen" />
         <include android:id="@+id/cell5" layout="@layout/workspace_screen" />
-                
     </com.android.launcher2.Workspace>
 
+    <include layout="@layout/qsb_bar"
+        android:id="@+id/qsb_bar"
+        android:layout_width="fill_parent"
+        android:layout_height="@dimen/qsb_bar_height"
+        android:layout_gravity="top" />
+
     <include layout="@layout/apps_customize_pane"
         android:id="@+id/apps_customize_pane"
         android:layout_width="match_parent"
diff --git a/res/layout-port/workspace_screen.xml b/res/layout-port/workspace_screen.xml
index f400c40b1..7a6714fe0 100644
--- a/res/layout-port/workspace_screen.xml
+++ b/res/layout-port/workspace_screen.xml
@@ -24,7 +24,7 @@
 
     launcher:cellWidth="@dimen/workspace_cell_width"
     launcher:cellHeight="@dimen/workspace_cell_height"
-    launcher:yAxisStartPadding="8dip"
+    launcher:yAxisStartPadding="@dimen/qsb_bar_height"
     launcher:yAxisEndPadding="@dimen/button_bar_height"
     launcher:xAxisStartPadding="0dip"
     launcher:xAxisEndPadding="0dip" />
diff --git a/res/layout/apps_customize_pane.xml b/res/layout/apps_customize_pane.xml
index 05884ef73..e22ba12c6 100644
--- a/res/layout/apps_customize_pane.xml
+++ b/res/layout/apps_customize_pane.xml
@@ -20,7 +20,7 @@
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@drawable/apps_customize_bg_gradient">
+        android:background="#FF000000">
         <!-- The layout_width of the tab bar gets overriden to align the content
              with the text in the tabs in AppsCustomizeTabHost. -->
         <FrameLayout
diff --git a/res/layout/qsb_bar.xml b/res/layout/qsb_bar.xml
new file mode 100644
index 000000000..54692249a
--- /dev/null
+++ b/res/layout/qsb_bar.xml
@@ -0,0 +1,70 @@
+<?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.
+-->
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+    android:focusable="false">
+
+    <!-- Search buttons container -->
+    <LinearLayout
+        android:id="@+id/qsb_search_bar"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        style="@style/SearchBar">
+       <!-- Global search icon -->
+       <ImageView
+            style="@style/SearchButton"
+            android:id="@+id/search_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/ic_generic_search"
+            android:background="@drawable/button_bg"
+            android:onClick="onClickSearchButton"
+            android:focusable="true"
+            android:clickable="true"
+            android:contentDescription="@string/accessibility_search_button" />
+
+        <ImageView
+            style="@style/SearchButtonDivider"
+            android:id="@+id/search_divider"
+            android:src="@drawable/divider_launcher_holo"
+            android:onClick="onClickSearchButton"
+            android:focusable="false"
+            android:clickable="true" />
+
+        <!-- Voice search icon -->
+        <ImageView
+            style="@style/SearchButton"
+            android:id="@+id/voice_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/ic_voice_search"
+            android:background="@drawable/button_bg"
+            android:onClick="onClickVoiceButton"
+            android:focusable="true"
+            android:clickable="true"
+            android:contentDescription="@string/accessibility_voice_search_button" />
+    </LinearLayout>
+
+    <!-- Drag specific targets container -->
+    <LinearLayout
+        android:id="@+id/drag_target_bar"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#FF00FF00"
+        android:visibility="gone">
+    </LinearLayout>
+</FrameLayout>
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
index b3d0b2e81..13519e568 100644
--- a/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
@@ -15,7 +15,11 @@
 -->
 
 <resources>
-    <dimen name="workspace_cell_width">96dip</dimen>
+<!-- QSB -->
+    <dimen name="toolbar_button_vertical_padding">12dip</dimen>
+    <dimen name="toolbar_button_horizontal_padding">12dip</dimen>
+
+    <dimen name="workspace_cell_width">106dip</dimen>
     <dimen name="workspace_cell_height">74dip</dimen>
     <dimen name="folder_cell_width">100dip</dimen>
     <dimen name="folder_cell_height">74dip</dimen>
diff --git a/res/values-land/styles.xml b/res/values-land/styles.xml
index 251c717e1..50aba0949 100644
--- a/res/values-land/styles.xml
+++ b/res/values-land/styles.xml
@@ -18,6 +18,23 @@
 -->
 
 <resources>
+<!-- Search Bar -->
+    <style name="SearchBar">
+        <item name="android:orientation">vertical</item>
+    </style>
+    <style name="SearchButton">
+        <item name="android:layout_gravity">center_horizontal</item>
+        <item name="android:paddingTop">@dimen/toolbar_button_vertical_padding</item>
+        <item name="android:paddingBottom">@dimen/toolbar_button_vertical_padding</item>
+        <item name="android:paddingLeft">@dimen/toolbar_button_horizontal_padding</item>
+        <item name="android:paddingRight">@dimen/toolbar_button_horizontal_padding</item>
+    </style>
+    <style name="SearchButtonDivider">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_gravity">center_horizontal</item>
+    </style>
+
     <style name="HotseatButton">
         <item name="android:paddingTop">12dip</item>
         <item name="android:paddingBottom">12dip</item>
diff --git a/res/values-large/dimens.xml b/res/values-large/dimens.xml
index 10836b944..fa660e595 100644
--- a/res/values-large/dimens.xml
+++ b/res/values-large/dimens.xml
@@ -62,9 +62,6 @@
     <integer name="land_all_apps_view_cellCountX">7</integer>
     <integer name="land_all_apps_view_cellCountY">5</integer>
 
-    <dimen name="toolbar_button_vertical_padding">12dip</dimen>
-    <dimen name="toolbar_button_horizontal_padding">16dip</dimen>
-
     <!-- height & width of the drop rectangle for the trash icon -->
     <dimen name="delete_zone_vertical_drag_padding">20dip</dimen>
     <dimen name="delete_zone_horizontal_drag_padding">20dip</dimen>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 99b124097..9d159f92b 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -15,6 +15,13 @@
 -->
 
 <resources>
+<!-- Workspace -->
+    <dimen name="qsb_bar_height">56dp</dimen>
+
+<!-- QSB -->
+    <dimen name="toolbar_button_vertical_padding">12dip</dimen>
+    <dimen name="toolbar_button_horizontal_padding">16dip</dimen>
+
 <!-- AllApps/Customize/AppsCustomize -->
     <!-- Size of icons in Workspace/AppsCustomize -->
     <dimen name="app_icon_size">50dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index abe6ac4c6..c3e6ce97a 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -68,6 +68,23 @@
         <item name="android:layout_marginRight">10dip</item>
     </style>
 
+    <style name="SearchBar">
+        <item name="android:orientation">horizontal</item>
+    </style>
+    <style name="SearchButton">
+        <item name="android:layout_gravity">center_vertical</item>
+        <item name="android:paddingTop">@dimen/toolbar_button_vertical_padding</item>
+        <item name="android:paddingBottom">@dimen/toolbar_button_vertical_padding</item>
+        <item name="android:paddingLeft">@dimen/toolbar_button_horizontal_padding</item>
+        <item name="android:paddingRight">@dimen/toolbar_button_horizontal_padding</item>
+    </style>
+    <style name="SearchButtonDivider">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:layout_gravity">center_vertical</item>
+    </style>
+
+
     <style name="TabIndicator">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">match_parent</item>
@@ -85,13 +102,6 @@
         <item name="android:shadowRadius">1.0</item>
     </style>
 
-    <style name="SearchButton" parent="@android:style/Widget.Button.Small">
-        <item name="android:paddingTop">7dip</item>
-        <item name="android:paddingBottom">9dip</item>
-        <item name="android:paddingLeft">10dip</item>
-        <item name="android:paddingRight">10dip</item>
-    </style>
-
     <style name="MarketButton">
         <item name="android:paddingRight">20dp</item>
         <item name="android:text">@string/market</item>
-- 
cgit v1.2.3