diff options
author | nebkat <nebkat@gmail.com> | 2011-12-17 12:30:11 +0000 |
---|---|---|
committer | nebkat <nebkat@gmail.com> | 2011-12-17 20:41:08 +0000 |
commit | d8d3f65a0bbc2846691eda40f62db1402f08d796 (patch) | |
tree | 6d649b762d2659423322badc0699b86a6b5d4466 /res/xml | |
parent | 54436fb44f3ea661de4176ed8a8a402746f7a154 (diff) | |
parent | 81304325161a14e9f9908def807114b33b13dce6 (diff) | |
download | android_packages_apps_Trebuchet-d8d3f65a0bbc2846691eda40f62db1402f08d796.tar.gz android_packages_apps_Trebuchet-d8d3f65a0bbc2846691eda40f62db1402f08d796.tar.bz2 android_packages_apps_Trebuchet-d8d3f65a0bbc2846691eda40f62db1402f08d796.zip |
Merge 4.0.3
Conflicts:
res/values/strings.xml
src/com/android/launcher2/AppsCustomizePagedView.java
src/com/android/launcher2/AppsCustomizeTabHost.java
src/com/android/launcher2/Launcher.java
src/com/android/launcher2/PagedView.java
src/com/android/launcher2/SearchDropTargetBar.java
src/com/android/launcher2/Workspace.java
Change-Id: Ia26c63bbf28b790c06f298c65fb48c79f49dc897
Diffstat (limited to 'res/xml')
-rw-r--r-- | res/xml/update_workspace.xml | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/res/xml/update_workspace.xml b/res/xml/update_workspace.xml new file mode 100644 index 000000000..44a3f9efa --- /dev/null +++ b/res/xml/update_workspace.xml @@ -0,0 +1,49 @@ +<?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. +--> + +<favorites xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"> + <!-- Update the db with new hotseat items. Note that we reference the browser's original + package name. --> + <!-- Hotseat (We use the screen as the position of the item in the hotseat) --> + <favorite + launcher:packageName="com.android.contacts" + launcher:className="com.android.contacts.activities.DialtactsActivity" + launcher:container="-101" + launcher:screen="0" + launcher:x="0" + launcher:y="0" /> + <favorite + launcher:packageName="com.android.contacts" + launcher:className="com.android.contacts.activities.PeopleActivity" + launcher:container="-101" + launcher:screen="1" + launcher:x="1" + launcher:y="0" /> + <favorite + launcher:packageName="com.android.mms" + launcher:className="com.android.mms.ui.ConversationList" + launcher:container="-101" + launcher:screen="3" + launcher:x="3" + launcher:y="0" /> + <favorite + launcher:packageName="com.android.browser" + launcher:className="com.android.browser.BrowserActivity" + launcher:container="-101" + launcher:screen="4" + launcher:x="4" + launcher:y="0" /> +</favorites> |