diff options
| author | Winson Chung <winsonc@google.com> | 2011-07-06 20:41:23 -0700 |
|---|---|---|
| committer | Winson Chung <winsonc@google.com> | 2011-07-07 14:10:47 -0700 |
| commit | 649723cfb3d73af16dd02462725700897ca60e38 (patch) | |
| tree | c270e40a9c6e0d155a21ea8f13f56607de8077fe /res | |
| parent | c07918d0053fc7d2a19d7b013565a5d2e7d4af51 (diff) | |
| download | android_packages_apps_Trebuchet-649723cfb3d73af16dd02462725700897ca60e38.tar.gz android_packages_apps_Trebuchet-649723cfb3d73af16dd02462725700897ca60e38.tar.bz2 android_packages_apps_Trebuchet-649723cfb3d73af16dd02462725700897ca60e38.zip | |
Updating assets.
- Tweaking search bar layout.
Change-Id: I9624fa4284135858d3e19b8b8e4710b5dd746042
Diffstat (limited to 'res')
43 files changed, 281 insertions, 206 deletions
diff --git a/res/drawable-hdpi/default_widget_preview_holo.9.png b/res/drawable-hdpi/default_widget_preview_holo.9.png Binary files differindex ecf5deb12..6745e4945 100644 --- a/res/drawable-hdpi/default_widget_preview_holo.9.png +++ b/res/drawable-hdpi/default_widget_preview_holo.9.png diff --git a/res/drawable-hdpi/hotseat_scrubber_holo.9.png b/res/drawable-hdpi/hotseat_scrubber_holo.9.png Binary files differindex 78b540d47..3400050ca 100644 --- a/res/drawable-hdpi/hotseat_scrubber_holo.9.png +++ b/res/drawable-hdpi/hotseat_scrubber_holo.9.png diff --git a/res/drawable-hdpi/hotseat_track_holo.9.png b/res/drawable-hdpi/hotseat_track_holo.9.png Binary files differindex ca495ffac..a058a3a37 100644 --- a/res/drawable-hdpi/hotseat_track_holo.9.png +++ b/res/drawable-hdpi/hotseat_track_holo.9.png diff --git a/res/drawable-hdpi/ic_generic_search.png b/res/drawable-hdpi/ic_generic_search.png Binary files differdeleted file mode 100644 index 67bac5cc8..000000000 --- a/res/drawable-hdpi/ic_generic_search.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_search_normal_holo.png b/res/drawable-hdpi/ic_search_normal_holo.png Binary files differnew file mode 100644 index 000000000..9935f489d --- /dev/null +++ b/res/drawable-hdpi/ic_search_normal_holo.png diff --git a/res/drawable-hdpi/ic_voice_search.png b/res/drawable-hdpi/ic_voice_search.png Binary files differdeleted file mode 100644 index 5d2f341ea..000000000 --- a/res/drawable-hdpi/ic_voice_search.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_voice_search_holo.png b/res/drawable-hdpi/ic_voice_search_holo.png Binary files differnew file mode 100644 index 000000000..e0df1a285 --- /dev/null +++ b/res/drawable-hdpi/ic_voice_search_holo.png diff --git a/res/drawable-hdpi/tab_selected_focused_holo.9.png b/res/drawable-hdpi/tab_selected_focused_holo.9.png Binary files differindex 1ba35d554..5cf75834e 100644 --- a/res/drawable-hdpi/tab_selected_focused_holo.9.png +++ b/res/drawable-hdpi/tab_selected_focused_holo.9.png diff --git a/res/drawable-hdpi/tab_selected_holo.9.png b/res/drawable-hdpi/tab_selected_holo.9.png Binary files differindex ef913cc8e..8da2dee1e 100644 --- a/res/drawable-hdpi/tab_selected_holo.9.png +++ b/res/drawable-hdpi/tab_selected_holo.9.png diff --git a/res/drawable-hdpi/tab_selected_pressed_focused_holo.9.png b/res/drawable-hdpi/tab_selected_pressed_focused_holo.9.png Binary files differindex d7e968806..4b312d9e3 100644 --- a/res/drawable-hdpi/tab_selected_pressed_focused_holo.9.png +++ b/res/drawable-hdpi/tab_selected_pressed_focused_holo.9.png diff --git a/res/drawable-hdpi/tab_selected_pressed_holo.9.png b/res/drawable-hdpi/tab_selected_pressed_holo.9.png Binary files differindex b8b1fcfe2..185a924c1 100644 --- a/res/drawable-hdpi/tab_selected_pressed_holo.9.png +++ b/res/drawable-hdpi/tab_selected_pressed_holo.9.png diff --git a/res/drawable-hdpi/tab_unselected_focused_holo.9.png b/res/drawable-hdpi/tab_unselected_focused_holo.9.png Binary files differindex 256e8e730..acfcaca3f 100644 --- a/res/drawable-hdpi/tab_unselected_focused_holo.9.png +++ b/res/drawable-hdpi/tab_unselected_focused_holo.9.png diff --git a/res/drawable-hdpi/tab_unselected_holo.9.png b/res/drawable-hdpi/tab_unselected_holo.9.png Binary files differindex db6fc144c..fcdf716cb 100644 --- a/res/drawable-hdpi/tab_unselected_holo.9.png +++ b/res/drawable-hdpi/tab_unselected_holo.9.png diff --git a/res/drawable-hdpi/tab_unselected_pressed_focused_holo.9.png b/res/drawable-hdpi/tab_unselected_pressed_focused_holo.9.png Binary files differindex d17b82026..5140b3523 100644 --- a/res/drawable-hdpi/tab_unselected_pressed_focused_holo.9.png +++ b/res/drawable-hdpi/tab_unselected_pressed_focused_holo.9.png diff --git a/res/drawable-hdpi/tab_unselected_pressed_holo.9.png b/res/drawable-hdpi/tab_unselected_pressed_holo.9.png Binary files differindex a344994fb..af85bb7be 100644 --- a/res/drawable-hdpi/tab_unselected_pressed_holo.9.png +++ b/res/drawable-hdpi/tab_unselected_pressed_holo.9.png diff --git a/res/drawable-mdpi/default_widget_preview_holo.9.png b/res/drawable-mdpi/default_widget_preview_holo.9.png Binary files differindex d8e11966f..f9a97263a 100644 --- a/res/drawable-mdpi/default_widget_preview_holo.9.png +++ b/res/drawable-mdpi/default_widget_preview_holo.9.png diff --git a/res/drawable-mdpi/hotseat_scrubber_holo.9.png b/res/drawable-mdpi/hotseat_scrubber_holo.9.png Binary files differindex 8b7e109bd..69f74f731 100644 --- a/res/drawable-mdpi/hotseat_scrubber_holo.9.png +++ b/res/drawable-mdpi/hotseat_scrubber_holo.9.png diff --git a/res/drawable-mdpi/hotseat_track_holo.9.png b/res/drawable-mdpi/hotseat_track_holo.9.png Binary files differindex a542cb7b9..a058a3a37 100644 --- a/res/drawable-mdpi/hotseat_track_holo.9.png +++ b/res/drawable-mdpi/hotseat_track_holo.9.png diff --git a/res/drawable-mdpi/ic_generic_search.png b/res/drawable-mdpi/ic_generic_search.png Binary files differdeleted file mode 100644 index e3fd5a266..000000000 --- a/res/drawable-mdpi/ic_generic_search.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_search_normal_holo.png b/res/drawable-mdpi/ic_search_normal_holo.png Binary files differnew file mode 100644 index 000000000..6acf24bc4 --- /dev/null +++ b/res/drawable-mdpi/ic_search_normal_holo.png diff --git a/res/drawable-mdpi/ic_voice_search_holo.png b/res/drawable-mdpi/ic_voice_search_holo.png Binary files differnew file mode 100644 index 000000000..29533ba3c --- /dev/null +++ b/res/drawable-mdpi/ic_voice_search_holo.png diff --git a/res/drawable-mdpi/tab_selected_focused_holo.9.png b/res/drawable-mdpi/tab_selected_focused_holo.9.png Binary files differindex 9a33cd2d9..d393cde69 100644 --- a/res/drawable-mdpi/tab_selected_focused_holo.9.png +++ b/res/drawable-mdpi/tab_selected_focused_holo.9.png diff --git a/res/drawable-mdpi/tab_selected_holo.9.png b/res/drawable-mdpi/tab_selected_holo.9.png Binary files differindex e029e577a..4035a3229 100644 --- a/res/drawable-mdpi/tab_selected_holo.9.png +++ b/res/drawable-mdpi/tab_selected_holo.9.png diff --git a/res/drawable-mdpi/tab_selected_pressed_focused_holo.9.png b/res/drawable-mdpi/tab_selected_pressed_focused_holo.9.png Binary files differindex 285116e31..284f5344a 100644 --- a/res/drawable-mdpi/tab_selected_pressed_focused_holo.9.png +++ b/res/drawable-mdpi/tab_selected_pressed_focused_holo.9.png diff --git a/res/drawable-mdpi/tab_selected_pressed_holo.9.png b/res/drawable-mdpi/tab_selected_pressed_holo.9.png Binary files differindex dadefa758..7efad5eb8 100644 --- a/res/drawable-mdpi/tab_selected_pressed_holo.9.png +++ b/res/drawable-mdpi/tab_selected_pressed_holo.9.png diff --git a/res/drawable-mdpi/tab_unselected_focused_holo.9.png b/res/drawable-mdpi/tab_unselected_focused_holo.9.png Binary files differindex 032a9921c..d3d19fc56 100644 --- a/res/drawable-mdpi/tab_unselected_focused_holo.9.png +++ b/res/drawable-mdpi/tab_unselected_focused_holo.9.png diff --git a/res/drawable-mdpi/tab_unselected_holo.9.png b/res/drawable-mdpi/tab_unselected_holo.9.png Binary files differindex e62198374..41f998ef2 100644 --- a/res/drawable-mdpi/tab_unselected_holo.9.png +++ b/res/drawable-mdpi/tab_unselected_holo.9.png diff --git a/res/drawable-mdpi/tab_unselected_pressed_focused_holo.9.png b/res/drawable-mdpi/tab_unselected_pressed_focused_holo.9.png Binary files differindex 384513584..f1a2819c5 100644 --- a/res/drawable-mdpi/tab_unselected_pressed_focused_holo.9.png +++ b/res/drawable-mdpi/tab_unselected_pressed_focused_holo.9.png diff --git a/res/drawable-mdpi/tab_unselected_pressed_holo.9.png b/res/drawable-mdpi/tab_unselected_pressed_holo.9.png Binary files differindex 23fd8c9b3..37c921679 100644 --- a/res/drawable-mdpi/tab_unselected_pressed_holo.9.png +++ b/res/drawable-mdpi/tab_unselected_pressed_holo.9.png diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml index d2f52c839..c120de8f9 100644 --- a/res/layout-land/launcher.xml +++ b/res/layout-land/launcher.xml @@ -40,22 +40,18 @@ <include android:id="@+id/cell5" layout="@layout/workspace_screen" /> </com.android.launcher2.Workspace> - <ImageView + <include android:id="@+id/paged_view_indicator_track" + layout="@layout/scroll_indicator_track" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="bottom" - android:scaleType="fitXY" - android:src="@drawable/hotseat_track_holo" /> - <ImageView + android:layout_gravity="bottom" /> + <include android:id="@+id/paged_view_indicator" + layout="@layout/scroll_indicator" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="bottom" - android:visibility="gone" - android:alpha="0" - android:scaleType="fitXY" - android:src="@drawable/hotseat_scrubber_holo" /> + android:layout_gravity="bottom" /> <include layout="@layout/qsb_bar" android:id="@+id/qsb_bar" diff --git a/res/layout-land/search_bar.xml b/res/layout-land/search_bar.xml new file mode 100644 index 000000000..e3f67a1f2 --- /dev/null +++ b/res/layout-land/search_bar.xml @@ -0,0 +1,55 @@ +<?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. +--> +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" + style="@style/SearchDropTargetBar" + android:layout_width="@dimen/qsb_bar_height" + android:layout_height="match_parent"> + <!-- Global search icon --> + <ImageView + style="@style/SearchButton" + android:id="@+id/search_button" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:src="@drawable/ic_search_normal_holo" + 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="match_parent" + android:layout_height="wrap_content" + android:src="@drawable/ic_voice_search_holo" + android:background="@drawable/button_bg" + android:onClick="onClickVoiceButton" + android:focusable="true" + android:clickable="true" + android:contentDescription="@string/accessibility_voice_search_button" /> +</LinearLayout>
\ No newline at end of file diff --git a/res/layout-large/button_bar.xml b/res/layout-large/button_bar.xml index 8d7f5df2e..efe9e138a 100644 --- a/res/layout-large/button_bar.xml +++ b/res/layout-large/button_bar.xml @@ -29,7 +29,7 @@ android:paddingRight="@dimen/toolbar_button_horizontal_padding" android:paddingTop="@dimen/toolbar_button_vertical_padding" android:paddingBottom="@dimen/toolbar_button_vertical_padding" - android:src="@drawable/ic_generic_search" + android:src="@drawable/ic_search_normal_holo" android:background="@drawable/button_bg" android:onClick="onClickSearchButton" @@ -60,7 +60,7 @@ android:paddingRight="@dimen/toolbar_button_horizontal_padding" android:paddingTop="@dimen/toolbar_button_vertical_padding" android:paddingBottom="@dimen/toolbar_button_vertical_padding" - android:src="@drawable/ic_voice_search" + android:src="@drawable/ic_voice_search_holo" android:background="@drawable/button_bg" android:onClick="onClickVoiceButton" diff --git a/res/layout-large/qsb_bar.xml b/res/layout-large/qsb_bar.xml deleted file mode 100644 index b600eda2e..000000000 --- a/res/layout-large/qsb_bar.xml +++ /dev/null @@ -1,131 +0,0 @@ -<?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. ---> -<com.android.launcher2.SearchDropTargetBar - 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 --> - <RelativeLayout - style="@style/SearchDropTargetBar" - android:id="@+id/qsb_search_bar" - android:layout_width="match_parent" - android:layout_height="match_parent"> - <!-- Global search icon --> - <ImageView - style="@style/SearchButton" - android:id="@+id/search_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_alignParentTop="true" - 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:layout_toRightOf="@+id/search_button" - 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:layout_toRightOf="@+id/search_divider" - 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" /> - - <!-- AppsCustomize icon --> - <com.android.launcher2.StrokedTextView - android:id="@+id/all_apps_button" - android:onClick="onClickAllAppsButton" - android:drawableLeft="@drawable/ic_home_all_apps_holo_dark" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_alignParentTop="true" - android:layout_toLeftOf="@+id/all_apps_divider" - android:paddingLeft="@dimen/toolbar_button_horizontal_padding" - android:paddingRight="@dimen/toolbar_button_horizontal_padding" - android:paddingTop="@dimen/all_apps_button_vertical_padding" - android:paddingBottom="@dimen/all_apps_button_vertical_padding" - android:background="@drawable/button_bg" - - android:gravity="center" - android:textColor="#CCFFFFFF" - android:textSize="18sp" - - launcher:strokeColor="#991e3157" - launcher:strokeTextColor="#DDFFFFFF" - launcher:strokeWidth="2.5" - - android:shadowColor="#DA000000" - android:shadowDx="0.0" - android:shadowDy="0.0" - android:shadowRadius="2.5" - - android:focusable="true" - android:clickable="true" - android:contentDescription="@string/accessibility_all_apps_button" /> - </RelativeLayout> - - <!-- Drag specific targets container --> - <LinearLayout - style="@style/SearchDropTargetBar" - android:id="@+id/drag_target_bar" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:alpha="0"> - - <com.android.launcher2.DeleteDropTarget - style="@style/DropTargetButtonContainer" - android:id="@+id/delete_target" - android:layout_weight="1"> - <!-- Delete target --> - <TextView - style="@style/DropTargetButton" - android:id="@+id/delete_target_text" - android:text="@string/delete_zone_label_workspace" - android:drawableLeft="@drawable/delete_target_selector" /> - </com.android.launcher2.DeleteDropTarget> - - <com.android.launcher2.InfoDropTarget - style="@style/DropTargetButtonContainer" - android:id="@+id/info_target" - android:layout_weight="1"> - <!-- Info target --> - <TextView - style="@style/DropTargetButton" - android:id="@+id/info_target_text" - android:text="@string/info_target_label" - android:drawableLeft="@drawable/info_target_selector" /> - </com.android.launcher2.InfoDropTarget> - </LinearLayout> -</com.android.launcher2.SearchDropTargetBar> diff --git a/res/layout-large/search_bar.xml b/res/layout-large/search_bar.xml new file mode 100644 index 000000000..e26a96a48 --- /dev/null +++ b/res/layout-large/search_bar.xml @@ -0,0 +1,92 @@ +<?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. +--> +<RelativeLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" + style="@style/SearchDropTargetBar" + android:layout_width="match_parent" + android:layout_height="match_parent"> + <!-- Global search icon --> + <ImageView + style="@style/SearchButton" + android:id="@+id/search_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_alignParentTop="true" + android:src="@drawable/ic_search_normal_holo" + 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:layout_toRightOf="@+id/search_button" + 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:layout_toRightOf="@+id/search_divider" + android:src="@drawable/ic_voice_search_holo" + android:background="@drawable/button_bg" + android:onClick="onClickVoiceButton" + android:focusable="true" + android:clickable="true" + android:contentDescription="@string/accessibility_voice_search_button" /> + + <!-- AppsCustomize icon --> + <com.android.launcher2.StrokedTextView + android:id="@+id/all_apps_button" + android:onClick="onClickAllAppsButton" + android:drawableLeft="@drawable/ic_home_all_apps_holo_dark" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_alignParentTop="true" + android:layout_toLeftOf="@+id/all_apps_divider" + android:paddingLeft="@dimen/toolbar_button_horizontal_padding" + android:paddingRight="@dimen/toolbar_button_horizontal_padding" + android:paddingTop="@dimen/all_apps_button_vertical_padding" + android:paddingBottom="@dimen/all_apps_button_vertical_padding" + android:background="@drawable/button_bg" + + android:gravity="center" + android:textColor="#CCFFFFFF" + android:textSize="18sp" + + launcher:strokeColor="#991e3157" + launcher:strokeTextColor="#DDFFFFFF" + launcher:strokeWidth="2.5" + + android:shadowColor="#DA000000" + android:shadowDx="0.0" + android:shadowDy="0.0" + android:shadowRadius="2.5" + + android:focusable="true" + android:clickable="true" + android:contentDescription="@string/accessibility_all_apps_button" /> +</RelativeLayout>
\ No newline at end of file diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index acb3b474b..db074d758 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -38,24 +38,20 @@ <include android:id="@+id/cell5" layout="@layout/workspace_screen" /> </com.android.launcher2.Workspace> - <ImageView + <include android:id="@+id/paged_view_indicator_track" + layout="@layout/scroll_indicator_track" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="bottom" - android:layout_marginBottom="@dimen/button_bar_height" - android:scaleType="fitXY" - android:src="@drawable/hotseat_track_holo" /> - <ImageView + android:layout_marginBottom="@dimen/button_bar_height" /> + <include android:id="@+id/paged_view_indicator" + layout="@layout/scroll_indicator" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="bottom" - android:layout_marginBottom="@dimen/button_bar_height" - android:visibility="gone" - android:alpha="0" - android:scaleType="fitXY" - android:src="@drawable/hotseat_scrubber_holo" /> + android:layout_marginBottom="@dimen/button_bar_height" /> <include layout="@layout/qsb_bar" android:id="@+id/qsb_bar" diff --git a/res/layout-port/search_bar.xml b/res/layout-port/search_bar.xml new file mode 100644 index 000000000..7e7673726 --- /dev/null +++ b/res/layout-port/search_bar.xml @@ -0,0 +1,51 @@ +<?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. +--> +<RelativeLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" + style="@style/SearchDropTargetBar" + android:layout_width="match_parent" + android:layout_height="@dimen/qsb_bar_height"> + <!-- Global search icon --> + <ImageView + style="@style/SearchButton" + android:id="@+id/search_button" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_alignParentLeft="true" + android:layout_alignParentTop="true" + android:src="@drawable/ic_search_normal_holo" + android:background="@drawable/button_bg" + android:onClick="onClickSearchButton" + android:focusable="true" + android:clickable="true" + android:contentDescription="@string/accessibility_search_button" /> + + <!-- Voice search icon --> + <ImageView + style="@style/SearchButton" + android:id="@+id/voice_button" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_alignParentRight="true" + android:layout_alignParentTop="true" + android:src="@drawable/ic_voice_search_holo" + android:background="@drawable/button_bg" + android:onClick="onClickVoiceButton" + android:focusable="true" + android:clickable="true" + android:contentDescription="@string/accessibility_voice_search_button" /> +</RelativeLayout> diff --git a/res/layout/apps_customize_pane.xml b/res/layout/apps_customize_pane.xml index a94b6e659..9d86c48d1 100644 --- a/res/layout/apps_customize_pane.xml +++ b/res/layout/apps_customize_pane.xml @@ -42,6 +42,8 @@ android:layout_height="match_parent" android:layout_gravity="right" android:gravity="center" + android:paddingLeft="@dimen/toolbar_button_horizontal_padding" + android:paddingRight="@dimen/toolbar_button_horizontal_padding" android:text="@string/market" android:contentDescription="@string/market" android:textColor="@color/workspace_all_apps_and_delete_zone_text_color" @@ -75,24 +77,19 @@ launcher:widgetCountX="@integer/apps_customize_widget_cell_count_x" launcher:widgetCountY="@integer/apps_customize_widget_cell_count_y" launcher:maxGap="@dimen/workspace_max_gap" /> - <ImageView + + <include android:id="@+id/paged_view_indicator_track" + layout="@layout/scroll_indicator_track" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="bottom" - android:visibility="gone" - android:alpha="0" - android:scaleType="fitXY" - android:src="@drawable/hotseat_track_holo" /> - <ImageView + android:layout_gravity="bottom" /> + <include android:id="@+id/paged_view_indicator" + layout="@layout/scroll_indicator" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="bottom" - android:visibility="gone" - android:alpha="0" - android:scaleType="fitXY" - android:src="@drawable/hotseat_scrubber_holo" /> + android:layout_gravity="bottom" /> </FrameLayout> </LinearLayout> </com.android.launcher2.AppsCustomizeTabHost> diff --git a/res/layout/qsb_bar.xml b/res/layout/qsb_bar.xml index 21043b410..b5b563b59 100644 --- a/res/layout/qsb_bar.xml +++ b/res/layout/qsb_bar.xml @@ -19,45 +19,8 @@ android:focusable="false"> <!-- Search buttons container --> - <LinearLayout - style="@style/SearchDropTargetBar" - android:id="@+id/qsb_search_bar" - android:layout_width="match_parent" - android:layout_height="match_parent"> - <!-- 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> + <include android:id="@+id/qsb_search_bar" + layout="@layout/search_bar" /> <!-- Drag specific targets container --> <LinearLayout diff --git a/res/layout/scroll_indicator.xml b/res/layout/scroll_indicator.xml new file mode 100644 index 000000000..33eed8bc5 --- /dev/null +++ b/res/layout/scroll_indicator.xml @@ -0,0 +1,22 @@ +<?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. +--> +<ImageView + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" + android:visibility="gone" + android:alpha="0" + android:scaleType="fitXY" + android:src="@drawable/hotseat_scrubber_holo" />
\ No newline at end of file diff --git a/res/layout/scroll_indicator_track.xml b/res/layout/scroll_indicator_track.xml new file mode 100644 index 000000000..c0d065a14 --- /dev/null +++ b/res/layout/scroll_indicator_track.xml @@ -0,0 +1,22 @@ +<?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. +--> +<ImageView + xmlns:android="http://schemas.android.com/apk/res/android" +xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" + android:paddingLeft="@dimen/scroll_track_padding" + android:paddingRight="@dimen/scroll_track_padding" + android:scaleType="fitXY" + android:src="@drawable/hotseat_track_holo" />
\ No newline at end of file diff --git a/res/values-large/dimens.xml b/res/values-large/dimens.xml index 90f262b17..7da10db41 100644 --- a/res/values-large/dimens.xml +++ b/res/values-large/dimens.xml @@ -15,6 +15,10 @@ --> <resources> +<!-- QSB --> + <dimen name="toolbar_button_vertical_padding">12dip</dimen> + <dimen name="toolbar_button_horizontal_padding">12dip</dimen> + <!-- Workspace --> <dimen name="qsb_bar_height">56dp</dimen> diff --git a/res/values-large/styles.xml b/res/values-large/styles.xml index 531e2e625..254ecb8d0 100644 --- a/res/values-large/styles.xml +++ b/res/values-large/styles.xml @@ -19,6 +19,11 @@ <resources> <!-- Workspace --> + <style name="ScrollIndicatorTrack"> + <item name="android:visibility">gone</item> + <item name="android:alpha">0</item> + </style> + <style name="WorkspaceIcon.Portrait"> <item name="android:drawablePadding">4dp</item> <item name="android:paddingLeft">4dp</item> @@ -78,6 +83,8 @@ <!-- QSB Search / Drop Target bar --> <style name="SearchDropTargetBar"> <item name="android:orientation">horizontal</item> + <item name="android:layout_width">match_parent</item> + <item name="android:layout_height">match_parent</item> </style> <style name="SearchButton"> <item name="android:layout_gravity">center_vertical</item> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 2a54981c6..7353eda7d 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -22,10 +22,11 @@ <dimen name="workspace_width_gap">-1dp</dimen> <dimen name="workspace_height_gap">-1dp</dimen> <dimen name="workspace_max_gap">8dp</dimen> + <dimen name="scroll_track_padding">10dp</dimen> <!-- QSB --> - <dimen name="toolbar_button_vertical_padding">12dip</dimen> - <dimen name="toolbar_button_horizontal_padding">16dip</dimen> + <dimen name="toolbar_button_vertical_padding">0dip</dimen> + <dimen name="toolbar_button_horizontal_padding">12dip</dimen> <!-- AllApps/Customize/AppsCustomize --> <!-- Size of icons in Workspace/AppsCustomize --> |
