summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2011-06-13 16:55:12 -0700
committerAdam Cohen <adamcohen@google.com>2011-06-13 16:55:12 -0700
commitbfbfd26c627a18f8e1e3e6d0e53e78feab360203 (patch)
tree0f823f053dcd28e303d19733e73f8215e0598b3d /res
parent61fa4197c4316bb0f9b05fcefb676f86197a2273 (diff)
downloadandroid_packages_apps_Trebuchet-bfbfd26c627a18f8e1e3e6d0e53e78feab360203.tar.gz
android_packages_apps_Trebuchet-bfbfd26c627a18f8e1e3e6d0e53e78feab360203.tar.bz2
android_packages_apps_Trebuchet-bfbfd26c627a18f8e1e3e6d0e53e78feab360203.zip
Initial implementation of folder reordering
Change-Id: I9f700e71f46e3b91afa96742d9e3890d519c391d
Diffstat (limited to 'res')
-rw-r--r--res/layout-land/user_folder.xml40
-rw-r--r--res/layout/user_folder.xml (renamed from res/layout-port/user_folder.xml)5
2 files changed, 2 insertions, 43 deletions
diff --git a/res/layout-land/user_folder.xml b/res/layout-land/user_folder.xml
deleted file mode 100644
index 87499e71e..000000000
--- a/res/layout-land/user_folder.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?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.launcher2.Folder
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
- android:orientation="vertical"
- android:background="@drawable/portal_container_holo">
-
- <com.android.launcher2.CellLayout
- android:id="@id/folder_content"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
-
- android:cacheColorHint="#ff333333"
-
- android:hapticFeedbackEnabled="false"
- launcher:widthGap="@dimen/workspace_width_gap"
- launcher:heightGap="@dimen/workspace_height_gap"
- launcher:cellWidth="@dimen/workspace_cell_width"
- launcher:cellHeight="@dimen/workspace_cell_height"
- launcher:xAxisStartPadding="0dip"
- launcher:xAxisEndPadding="0dip"
- launcher:yAxisStartPadding="8dip"
- launcher:yAxisEndPadding="8dip"/>
-
-</com.android.launcher2.Folder>
diff --git a/res/layout-port/user_folder.xml b/res/layout/user_folder.xml
index 0d383c177..5ef959d71 100644
--- a/res/layout-port/user_folder.xml
+++ b/res/layout/user_folder.xml
@@ -4,9 +4,9 @@
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.
@@ -36,5 +36,4 @@
launcher:xAxisEndPadding="0dip"
launcher:yAxisStartPadding="8dip"
launcher:yAxisEndPadding="8dip"/>
-
</com.android.launcher2.Folder>