commit 808e09d24d74a7650ba7b7f1f03444bf8a8538d6
author Romain Guy <romainguy@android.com> Fri Jul 17 02:08:50 2009 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Jul 17 02:08:50 2009 -0700
tree 63d8f7a8ceb0bb2f8800474045d5de3b080b24eb
parent aba68a3dbf190698bee81df4e8b28907aa93d517
parent 6b3f51d373f19711a7fac44f2f6df9dc89110eb1

am 6b3f51d3: More new gestures UI. Adds a back button at the bottom of the settings activity.

Merge commit '6b3f51d373f19711a7fac44f2f6df9dc89110eb1'

* commit '6b3f51d373f19711a7fac44f2f6df9dc89110eb1':
  More new gestures UI. Adds a back button at the bottom of the settings activity.

res/xml/default_workspace.xml

diff --git a/res/xml/default_workspace.xml b/res/xml/default_workspace.xml
index 9197c30..60bfe82 100644
--- a/res/xml/default_workspace.xml
+++ b/res/xml/default_workspace.xml
@@ -42,12 +42,14 @@
         launcher:x="2"
         launcher:y="3" />
 
+<!--
     <favorite
         launcher:packageName="com.google.android.apps.maps"
         launcher:className="com.google.android.maps.MapsActivity"
         launcher:screen="1"
         launcher:x="3"
         launcher:y="3" />
+-->
 
     <favorite
         launcher:packageName="com.android.mms"