diff options
author | Winson Chung <winsonc@google.com> | 2013-08-12 16:19:28 -0700 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2013-08-20 10:56:05 -0700 |
commit | 5f8afe6280eae34620067696173e71943e1a30a3 (patch) | |
tree | eb0ebdf56f2ad0950894424a49de9d1e8dc832e0 /res/layout | |
parent | 8a6870101c3d99257fc050d11bb69f50f5240622 (diff) | |
download | android_packages_apps_Trebuchet-5f8afe6280eae34620067696173e71943e1a30a3.tar.gz android_packages_apps_Trebuchet-5f8afe6280eae34620067696173e71943e1a30a3.tar.bz2 android_packages_apps_Trebuchet-5f8afe6280eae34620067696173e71943e1a30a3.zip |
Initial Changes for Dynamic Grid
Change-Id: I9e6f1e5167791cf8dc140778dfa447f86424e9bf
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/application.xml | 20 | ||||
-rw-r--r-- | res/layout/custom_content_page_indicator_marker.xml (renamed from res/layout/now_page_indicator_marker.xml) | 7 | ||||
-rw-r--r-- | res/layout/folder_icon.xml | 33 | ||||
-rw-r--r-- | res/layout/hotseat.xml (renamed from res/layout/workspace_divider.xml) | 15 | ||||
-rw-r--r-- | res/layout/page_indicator_marker.xml | 3 | ||||
-rw-r--r-- | res/layout/qsb_bar.xml | 14 | ||||
-rw-r--r-- | res/layout/user_folder.xml | 10 | ||||
-rw-r--r-- | res/layout/workspace_screen.xml | 8 |
8 files changed, 79 insertions, 31 deletions
diff --git a/res/layout/application.xml b/res/layout/application.xml new file mode 100644 index 000000000..e4909ddad --- /dev/null +++ b/res/layout/application.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2008 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.launcher3.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android" + style="@style/WorkspaceIcon" + android:focusable="true" + android:background="@drawable/focusable_view_bg" /> diff --git a/res/layout/now_page_indicator_marker.xml b/res/layout/custom_content_page_indicator_marker.xml index 7d0562743..168599266 100644 --- a/res/layout/now_page_indicator_marker.xml +++ b/res/layout/custom_content_page_indicator_marker.xml @@ -17,18 +17,19 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" android:layout_width="wrap_content" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + android:layout_gravity="center_vertical"> <ImageView android:id="@+id/inactive" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/now_page" + android:src="@drawable/custom_content_page" /> <ImageView android:id="@+id/active" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/now_page" + android:src="@drawable/custom_content_page" android:alpha="0" /> </com.android.launcher3.PageIndicatorMarker> diff --git a/res/layout/folder_icon.xml b/res/layout/folder_icon.xml new file mode 100644 index 000000000..5a9a83415 --- /dev/null +++ b/res/layout/folder_icon.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2008 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.launcher3.FolderIcon + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:focusable="true" + android:background="@drawable/focusable_view_bg"> + <ImageView + android:id="@+id/preview_background" + android:layout_gravity="center_horizontal" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/portal_ring_inner_holo"/> + <com.android.launcher3.BubbleTextView + android:id="@+id/folder_icon_name" + style="@style/WorkspaceIcon"/> +</com.android.launcher3.FolderIcon> diff --git a/res/layout/workspace_divider.xml b/res/layout/hotseat.xml index 304e53297..dc9ed2a6f 100644 --- a/res/layout/workspace_divider.xml +++ b/res/layout/hotseat.xml @@ -13,11 +13,12 @@ See the License for the specific language governing permissions and limitations under the License. --> -<ImageView +<com.android.launcher3.Hotseat xmlns:android="http://schemas.android.com/apk/res/android" - android:paddingStart="@dimen/workspace_divider_padding_left" - android:paddingEnd="@dimen/workspace_divider_padding_right" - android:paddingTop="@dimen/workspace_divider_padding_top" - android:paddingBottom="@dimen/workspace_divider_padding_bottom" - android:scaleType="fitXY" - android:src="@drawable/hotseat_track_holo" /> + xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3"> + <com.android.launcher3.CellLayout + android:id="@+id/layout" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_gravity="center" /> +</com.android.launcher3.Hotseat> diff --git a/res/layout/page_indicator_marker.xml b/res/layout/page_indicator_marker.xml index 0260e7e4e..496f3bdc9 100644 --- a/res/layout/page_indicator_marker.xml +++ b/res/layout/page_indicator_marker.xml @@ -17,7 +17,8 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" android:layout_width="wrap_content" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + android:layout_gravity="center_vertical"> <ImageView android:id="@+id/inactive" android:layout_width="wrap_content" diff --git a/res/layout/qsb_bar.xml b/res/layout/qsb_bar.xml index 56e052346..f0e3bbfce 100644 --- a/res/layout/qsb_bar.xml +++ b/res/layout/qsb_bar.xml @@ -16,16 +16,24 @@ <com.android.launcher3.SearchDropTargetBar xmlns:android="http://schemas.android.com/apk/res/android" style="@style/QSBBar" - android:focusable="false"> + android:focusable="false" + android:layout_width="match_parent" + android:layout_height="match_parent"> <!-- Search buttons container --> <include android:id="@+id/qsb_search_bar" - layout="@layout/search_bar" /> + layout="@layout/search_bar" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_gravity="center" /> <!-- Drag specific targets container --> <LinearLayout style="@style/SearchDropTargetBar" - android:id="@+id/drag_target_bar"> + android:id="@+id/drag_target_bar" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_gravity="center"> <include layout="@layout/drop_target_bar" /> diff --git a/res/layout/user_folder.xml b/res/layout/user_folder.xml index 3eeec35a2..d790c5388 100644 --- a/res/layout/user_folder.xml +++ b/res/layout/user_folder.xml @@ -30,16 +30,8 @@ android:id="@+id/folder_content" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:paddingStart="@dimen/folder_padding" - android:paddingEnd="@dimen/folder_padding" - android:paddingTop="@dimen/folder_padding" - android:paddingBottom="@dimen/folder_padding" android:cacheColorHint="#ff333333" - android:hapticFeedbackEnabled="false" - launcher:widthGap="@dimen/folder_width_gap" - launcher:heightGap="@dimen/folder_height_gap" - launcher:cellWidth="@dimen/folder_cell_width" - launcher:cellHeight="@dimen/folder_cell_height" /> + android:hapticFeedbackEnabled="false" /> </ScrollView> <com.android.launcher3.FolderEditText diff --git a/res/layout/workspace_screen.xml b/res/layout/workspace_screen.xml index acc9f6651..855cf39f5 100644 --- a/res/layout/workspace_screen.xml +++ b/res/layout/workspace_screen.xml @@ -20,14 +20,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" - android:paddingStart="@dimen/cell_layout_left_padding" - android:paddingEnd="@dimen/cell_layout_right_padding" - android:paddingTop="@dimen/cell_layout_top_padding" - android:paddingBottom="@dimen/cell_layout_bottom_padding" android:hapticFeedbackEnabled="false" - launcher:cellWidth="@dimen/workspace_cell_width" - launcher:cellHeight="@dimen/workspace_cell_height" - launcher:widthGap="@dimen/workspace_width_gap" - launcher:heightGap="@dimen/workspace_height_gap" launcher:maxGap="@dimen/workspace_max_gap" /> |