diff options
| author | Winson Chung <winsonc@google.com> | 2011-08-05 16:03:32 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-05 16:03:32 -0700 |
| commit | f45f5eba0c8a01dc05ba9ad6a8ef942cb0eaca88 (patch) | |
| tree | 39e8ef58f51b7d7fa18c11aeaa7e488305eda686 /res | |
| parent | 57e0ae249038ed9fda446ae45d0b916110eca50f (diff) | |
| parent | e7a0394ad468748fb4651c74b44b313e1e07cab6 (diff) | |
| download | android_packages_apps_Trebuchet-f45f5eba0c8a01dc05ba9ad6a8ef942cb0eaca88.tar.gz android_packages_apps_Trebuchet-f45f5eba0c8a01dc05ba9ad6a8ef942cb0eaca88.tar.bz2 android_packages_apps_Trebuchet-f45f5eba0c8a01dc05ba9ad6a8ef942cb0eaca88.zip | |
Merge "Fixing crash and updating default layout"
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 3 | ||||
| -rw-r--r-- | res/xml/default_workspace.xml | 50 |
2 files changed, 45 insertions, 8 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 125520e1f..3928fa436 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -194,6 +194,9 @@ s --> <!-- Widgets: --> <skip /> + <!-- The Google Apps folder name --> + <string name="google_apps_folder_name">Google Apps</string> + <!-- Text to show user in place of a gadget when we can't display it properly --> <string name="gadget_error_text">Problem loading widget</string> diff --git a/res/xml/default_workspace.xml b/res/xml/default_workspace.xml index d509490c3..01d243039 100644 --- a/res/xml/default_workspace.xml +++ b/res/xml/default_workspace.xml @@ -26,16 +26,50 @@ launcher:screen="2" launcher:x="0" launcher:y="3" /> + <folder + launcher:screen="2" + launcher:x="3" + launcher:y="3" + launcher:title="Google Apps"> + <favorite + launcher:packageName="com.google.android.apps.plus" + launcher:className="com.google.android.apps.plus.phone.HomeActivity" /> + <favorite + launcher:packageName="com.google.android.gm" + launcher:className="com.google.android.gm.ConversationListActivityGmail" /> + <favorite + launcher:packageName="com.google.android.talk" + launcher:className="com.google.android.talk.SigningInActivity" /> + <favorite + launcher:packageName="com.google.android.apps.maps" + launcher:className="com.google.android.maps.MapsActivity" /> + <favorite + launcher:packageName="com.google.android.youtube" + launcher:className="com.google.android.youtube.app.honeycomb.Shell$HomeActivity" /> + <favorite + launcher:packageName="com.google.android.music" + launcher:className="com.android.music.activitymanagement.TopLevelActivity" /> + <favorite + launcher:packageName="com.google.android.videos" + launcher:className="com.google.android.youtube.videos.honeycomb.VideosActivity" /> + <favorite + launcher:packageName="com.google.android.apps.books" + launcher:className="com.google.android.apps.books.app.BooksActivity" /> + <favorite + launcher:packageName="com.android.vending" + launcher:className="com.android.vending.AssetBrowserActivity" /> + <favorite + launcher:packageName="com.google.android.calendar" + launcher:className="com.android.calendar.AllInOneActivity" /> + <favorite + launcher:packageName="com.google.android.gallery3d" + launcher:className="com.android.gallery3d.app.Gallery" /> + <favorite + launcher:packageName="com.android.settings" + launcher:className="com.android.settings.Settings" /> + </folder> <!-- Right screen [3] --> - <appwidget - launcher:packageName="com.android.music" - launcher:className="com.android.music.MediaAppWidgetProvider" - launcher:screen="3" - launcher:x="0" - launcher:y="0" - launcher:spanX="4" - launcher:spanY="1" /> <!-- Far-right screen [4] --> |