diff options
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/apps_customize_pane.xml | 21 | ||||
-rw-r--r-- | res/layout/qsb_bar.xml | 41 | ||||
-rw-r--r-- | res/layout/scroll_indicator.xml | 22 | ||||
-rw-r--r-- | res/layout/scroll_indicator_track.xml | 22 |
4 files changed, 55 insertions, 51 deletions
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 |