diff options
author | Joe Onorato <joeo@android.com> | 2009-07-31 11:54:44 -0700 |
---|---|---|
committer | Joe Onorato <joeo@android.com> | 2009-07-31 16:24:15 -0700 |
commit | 7404ee4a16e03dba9f026ac8c78d7cea3886260f (patch) | |
tree | e847d6f56dcd61d93e3bc7c9fea320b69a0d0481 /res | |
parent | a5902524d4403885eb4c50360bf3465c6be796ef (diff) | |
download | android_packages_apps_Trebuchet-7404ee4a16e03dba9f026ac8c78d7cea3886260f.tar.gz android_packages_apps_Trebuchet-7404ee4a16e03dba9f026ac8c78d7cea3886260f.tar.bz2 android_packages_apps_Trebuchet-7404ee4a16e03dba9f026ac8c78d7cea3886260f.zip |
Checkpoint launcher2 - all apps is in a 2nd window.
Lots is still broken.
Diffstat (limited to 'res')
-rw-r--r-- | res/layout-land/all_apps.xml | 41 | ||||
-rw-r--r-- | res/layout-land/launcher.xml | 49 | ||||
-rw-r--r-- | res/layout-land/live_folder_grid.xml | 2 | ||||
-rw-r--r-- | res/layout-land/user_folder.xml | 2 | ||||
-rw-r--r-- | res/layout-port/all_apps.xml | 39 | ||||
-rw-r--r-- | res/layout-port/launcher.xml | 50 | ||||
-rw-r--r-- | res/layout/live_folder_list.xml | 2 |
7 files changed, 102 insertions, 83 deletions
diff --git a/res/layout-land/all_apps.xml b/res/layout-land/all_apps.xml new file mode 100644 index 000000000..1927394ae --- /dev/null +++ b/res/layout-land/all_apps.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2007 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.AllAppsGridView + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher2" + + android:id="@+id/all_apps" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + + launcher:texture="@drawable/pattern_carbon_fiber_dark" + + android:scrollbarStyle="outsideInset" + android:drawSelectorOnTop="false" + android:listSelector="@drawable/grid_selector" + + android:verticalSpacing="10dip" + android:numColumns="5" /> + +<!-- + android:nextFocusLeft="@id/all_apps" + android:nextFocusDown="@id/content" + android:nextFocusUp="@id/content" + android:nextFocusRight="@id/content" +--> + + diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml index 3af51ec55..ef1623101 100644 --- a/res/layout-land/launcher.xml +++ b/res/layout-land/launcher.xml @@ -36,51 +36,20 @@ </com.android.launcher2.Workspace> - <SlidingDrawer - android:id="@+id/drawer" - android:layout_width="fill_parent" + <com.android.launcher2.HandleView + android:id="@id/all_apps" + android:layout_width="56dip" android:layout_height="fill_parent" - android:orientation="horizontal" - android:bottomOffset="7dip" - android:handle="@+id/all_apps" - android:content="@+id/content"> - - <com.android.launcher2.HandleView - android:id="@id/all_apps" - android:layout_width="56dip" - android:layout_height="fill_parent" - - android:background="@drawable/handle" - - android:focusable="true" - android:clickable="true" - - android:scaleType="center" - android:src="@drawable/handle_icon" - - launcher:direction="vertical" /> + android:background="@drawable/handle" - <com.android.launcher2.AllAppsGridView - android:id="@id/content" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:focusable="true" + android:clickable="true" - launcher:texture="@drawable/pattern_carbon_fiber_dark" - - android:scrollbarStyle="outsideInset" - android:drawSelectorOnTop="false" - android:listSelector="@drawable/grid_selector" - - android:nextFocusLeft="@id/all_apps" - android:nextFocusDown="@id/content" - android:nextFocusUp="@id/content" - android:nextFocusRight="@id/content" - - android:verticalSpacing="10dip" - android:numColumns="5" /> + android:scaleType="center" + android:src="@drawable/handle_icon" - </SlidingDrawer> + launcher:direction="vertical" /> <com.android.launcher2.DeleteZone android:id="@+id/delete_zone" diff --git a/res/layout-land/live_folder_grid.xml b/res/layout-land/live_folder_grid.xml index 8905cf330..9a87628c7 100644 --- a/res/layout-land/live_folder_grid.xml +++ b/res/layout-land/live_folder_grid.xml @@ -31,7 +31,7 @@ android:layout_height="wrap_content" /> <GridView - android:id="@id/content" + android:id="@+id/content" android:layout_width="fill_parent" android:layout_height="0dip" android:layout_weight="1" diff --git a/res/layout-land/user_folder.xml b/res/layout-land/user_folder.xml index b27c94b08..9d419f5e9 100644 --- a/res/layout-land/user_folder.xml +++ b/res/layout-land/user_folder.xml @@ -28,7 +28,7 @@ android:layout_height="wrap_content" /> <GridView - android:id="@id/content" + android:id="@+id/content" android:layout_width="fill_parent" android:layout_height="0dip" android:layout_weight="1" diff --git a/res/layout-port/all_apps.xml b/res/layout-port/all_apps.xml new file mode 100644 index 000000000..92ca0f658 --- /dev/null +++ b/res/layout-port/all_apps.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2007 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.AllAppsGridView + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher2" + + android:id="@+id/all_apps" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + + launcher:texture="@drawable/pattern_carbon_fiber_dark" + + android:scrollbarStyle="outsideInset" + android:drawSelectorOnTop="false" + android:listSelector="@drawable/grid_selector" + + android:verticalSpacing="10dip" + android:numColumns="4" /> + +<!-- + android:nextFocusLeft="@id/content" + android:nextFocusDown="@id/content" + android:nextFocusUp="@id/all_apps" + android:nextFocusRight="@id/content" +--> diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index 6ed605b00..e77a01e98 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -36,51 +36,21 @@ </com.android.launcher2.Workspace> - <SlidingDrawer - android:id="@+id/drawer" + <com.android.launcher2.HandleView + android:id="@id/all_apps" android:layout_width="fill_parent" - android:layout_height="fill_parent" - - android:topOffset="5dip" - android:bottomOffset="7dip" - android:handle="@+id/all_apps" - android:content="@+id/content"> - - <com.android.launcher2.HandleView - android:id="@id/all_apps" - android:layout_width="fill_parent" - android:layout_height="56dip" - - android:background="@drawable/handle" - - android:focusable="true" - android:clickable="true" - - android:scaleType="center" - android:src="@drawable/handle_icon" + android:layout_height="56dip" + android:layout_gravity="bottom" - launcher:direction="horizontal" /> + android:background="@drawable/handle" - <com.android.launcher2.AllAppsGridView - android:id="@id/content" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:focusable="true" + android:clickable="true" - launcher:texture="@drawable/pattern_carbon_fiber_dark" - - android:scrollbarStyle="outsideInset" - android:drawSelectorOnTop="false" - android:listSelector="@drawable/grid_selector" - - android:nextFocusLeft="@id/content" - android:nextFocusDown="@id/content" - android:nextFocusUp="@id/all_apps" - android:nextFocusRight="@id/content" - - android:verticalSpacing="10dip" - android:numColumns="4" /> + android:scaleType="center" + android:src="@drawable/handle_icon" - </SlidingDrawer> + launcher:direction="horizontal" /> <com.android.launcher2.DeleteZone android:id="@+id/delete_zone" diff --git a/res/layout/live_folder_list.xml b/res/layout/live_folder_list.xml index 00f191e3f..cf2f836f2 100644 --- a/res/layout/live_folder_list.xml +++ b/res/layout/live_folder_list.xml @@ -31,7 +31,7 @@ android:layout_height="wrap_content" /> <ListView - android:id="@id/content" + android:id="@+id/content" android:layout_width="fill_parent" android:layout_height="0dip" android:layout_weight="1" |