diff options
| author | Joe Onorato <joeo@android.com> | 2009-08-04 16:04:30 -0400 |
|---|---|---|
| committer | Joe Onorato <joeo@android.com> | 2009-08-06 12:45:43 -0700 |
| commit | 00acb123c5100f06b8e89e8ec8978ebafc6f6d26 (patch) | |
| tree | 77c09f4bcd3174e687ce4d5f31a0f89a55e52bb8 /res | |
| parent | 17721426111214db82ea00abd8bfafc66e65fe71 (diff) | |
| download | android_packages_apps_Trebuchet-00acb123c5100f06b8e89e8ec8978ebafc6f6d26.tar.gz android_packages_apps_Trebuchet-00acb123c5100f06b8e89e8ec8978ebafc6f6d26.tar.bz2 android_packages_apps_Trebuchet-00acb123c5100f06b8e89e8ec8978ebafc6f6d26.zip | |
Move the drag thing into its own window that goes around on top of everything else.
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout-port/all_apps.xml | 23 | ||||
| -rw-r--r-- | res/layout-port/launcher.xml | 18 | ||||
| -rw-r--r-- | res/values/strings.xml | 2 |
3 files changed, 28 insertions, 15 deletions
diff --git a/res/layout-port/all_apps.xml b/res/layout-port/all_apps.xml index c954685c4..a076df019 100644 --- a/res/layout-port/all_apps.xml +++ b/res/layout-port/all_apps.xml @@ -14,20 +14,25 @@ limitations under the License. --> -<com.android.launcher2.AllAppsGridView +<com.android.launcher2.DragLayer 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:id="@+id/drag_layer" android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_height="fill_parent"> - android:scrollbarStyle="outsideInset" - android:drawSelectorOnTop="false" - android:listSelector="@drawable/grid_selector" + <com.android.launcher2.AllAppsGridView + android:id="@+id/all_apps" + android:layout_width="fill_parent" + android:layout_height="fill_parent" - android:verticalSpacing="10dip" - android:numColumns="4" /> + android:scrollbarStyle="outsideInset" + android:drawSelectorOnTop="false" + android:listSelector="@drawable/grid_selector" + + android:verticalSpacing="10dip" + android:numColumns="4" /> <!-- android:nextFocusLeft="@id/content" @@ -35,3 +40,5 @@ android:nextFocusUp="@id/all_apps" android:nextFocusRight="@id/content" --> + +</com.android.launcher2.DragLayer> diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index 462fe5296..893a430ec 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -14,18 +14,22 @@ limitations under the License. --> -<com.android.launcher2.DragLayer +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher2" - android:id="@+id/drag_layer" android:layout_width="fill_parent" android:layout_height="fill_parent"> - <com.android.launcher2.WallpaperView - android:id="@+id/wallpaper" - android:layout_width="fill_parent" - android:layout_height="fill_parent" /> +<com.android.launcher2.WallpaperView + android:id="@+id/wallpaper" + android:layout_width="fill_parent" + android:layout_height="fill_parent" /> + +<com.android.launcher2.DragLayer + android:id="@+id/drag_layer" + android:layout_width="fill_parent" + android:layout_height="fill_parent"> <!-- The workspace contains 3 screens of cells --> <com.android.launcher2.Workspace @@ -72,3 +76,5 @@ launcher:direction="horizontal" /> </com.android.launcher2.DragLayer> + +</FrameLayout> diff --git a/res/values/strings.xml b/res/values/strings.xml index f971f7cae..f286fa11e 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -21,7 +21,7 @@ <!-- General --> <skip /> <!-- Application name --> - <string name="application_name">Launcher2</string> + <string name="application_name">_Launcher2</string> <!-- Name for all applications running as this uid. --> <string name="uid_name">Android Core Apps</string> <!-- Default folder name --> |