diff options
author | Winson Chung <winsonc@google.com> | 2011-07-13 17:25:49 -0700 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2011-07-20 14:12:20 -0700 |
commit | 3d503fbd9468fb2b9fa645f4f7b91e11229edbfa (patch) | |
tree | 38d8bb61f62a47a731b97520a274e07cefbec20c /res/layout-land | |
parent | ec8a2eee50290e7d9c95936041b937b6e94bb152 (diff) | |
download | android_packages_apps_Trebuchet-3d503fbd9468fb2b9fa645f4f7b91e11229edbfa.tar.gz android_packages_apps_Trebuchet-3d503fbd9468fb2b9fa645f4f7b91e11229edbfa.tar.bz2 android_packages_apps_Trebuchet-3d503fbd9468fb2b9fa645f4f7b91e11229edbfa.zip |
Initial changes to add configurable hotseat.
Change-Id: I4c2ed4a1c122c057662fabc70bfef7c5c088460b
Diffstat (limited to 'res/layout-land')
-rw-r--r-- | res/layout-land/hotseat.xml | 33 | ||||
-rw-r--r-- | res/layout-land/launcher.xml | 36 | ||||
-rw-r--r-- | res/layout-land/search_bar.xml | 4 |
3 files changed, 44 insertions, 29 deletions
diff --git a/res/layout-land/hotseat.xml b/res/layout-land/hotseat.xml new file mode 100644 index 000000000..79661a728 --- /dev/null +++ b/res/layout-land/hotseat.xml @@ -0,0 +1,33 @@ +<?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.Hotseat + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" + android:background="@drawable/hotseat_bg_panel" + launcher:cellCountX="1" + launcher:cellCountY="-1"> + <com.android.launcher2.CellLayout + android:id="@+id/layout" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:paddingTop="@dimen/workspace_top_padding" + android:paddingBottom="@dimen/workspace_bottom_padding" + launcher:cellWidth="@dimen/workspace_cell_width" + launcher:cellHeight="@dimen/workspace_cell_height" + launcher:widthGap="-1dp" + launcher:heightGap="-1dp" + launcher:maxGap="@dimen/workspace_max_gap" /> +</com.android.launcher2.Hotseat>
\ No newline at end of file diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml index 428a0a73a..4d40adadc 100644 --- a/res/layout-land/launcher.xml +++ b/res/layout-land/launcher.xml @@ -40,8 +40,8 @@ android:id="@+id/workspace" android:layout_width="match_parent" android:layout_height="match_parent" - android:scrollbars="horizontal" - android:fadeScrollbars="true" + android:paddingLeft="@dimen/qsb_bar_height" + android:paddingRight="@dimen/button_bar_height" launcher:defaultScreen="2" launcher:cellCountX="4" launcher:cellCountY="4" @@ -66,31 +66,11 @@ android:layout_height="match_parent" android:visibility="invisible" /> - <RelativeLayout - android:id="@+id/all_apps_button_cluster" - android:layout_height="fill_parent" - android:layout_width="@dimen/button_bar_height_portrait" - android:layout_gravity="right|center_vertical" - android:layout_marginBottom="@dimen/half_status_bar_height"> - <ImageView - android:id="@+id/hotseat_left" - style="@style/HotseatButton.Left" - android:layout_below="@id/all_apps_button" - android:src="@drawable/hotseat_phone" - android:onClick="launchHotSeat" /> - <com.android.launcher2.HandleView - style="@style/HotseatButton" - android:id="@+id/all_apps_button" - android:layout_centerVertical="true" - android:layout_alignParentRight="true" - android:src="@drawable/all_apps_button" - launcher:direction="vertical" /> - <ImageView - android:id="@+id/hotseat_right" - style="@style/HotseatButton.Right" - android:layout_above="@id/all_apps_button" - android:src="@drawable/hotseat_browser" - android:onClick="launchHotSeat" /> + <include layout="@layout/hotseat" + android:id="@+id/hotseat" + android:layout_width="@dimen/button_bar_height" + android:layout_height="match_parent" + android:layout_gravity="right" /> + - </RelativeLayout> </com.android.launcher2.DragLayer> diff --git a/res/layout-land/search_bar.xml b/res/layout-land/search_bar.xml index e3f67a1f2..0dbfd7b35 100644 --- a/res/layout-land/search_bar.xml +++ b/res/layout-land/search_bar.xml @@ -26,6 +26,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:src="@drawable/ic_search_normal_holo" + android:adjustViewBounds="true" android:background="@drawable/button_bg" android:onClick="onClickSearchButton" android:focusable="true" @@ -47,9 +48,10 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:src="@drawable/ic_voice_search_holo" + android:adjustViewBounds="true" 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 +</LinearLayout> |