diff options
| author | Jason Monk <jmonk@google.com> | 2014-03-10 18:29:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-10 18:29:38 +0000 |
| commit | 9364986c83d275509229e5f24ff2b1a27c7842b7 (patch) | |
| tree | 2a95e2cdfbe5e8d76a1d705354f4306fe9da92d6 /res | |
| parent | bfbd52a5e618a86dc7a13bb5e4866759e181a7cb (diff) | |
| parent | 41314973b44202fd0d1daea3e67bdc92e9110989 (diff) | |
| download | android_packages_apps_Trebuchet-9364986c83d275509229e5f24ff2b1a27c7842b7.tar.gz android_packages_apps_Trebuchet-9364986c83d275509229e5f24ff2b1a27c7842b7.tar.bz2 android_packages_apps_Trebuchet-9364986c83d275509229e5f24ff2b1a27c7842b7.zip | |
Merge "Add support for uri favorites and resolve groups" into ub-now-mister-ugly
Diffstat (limited to 'res')
| -rw-r--r-- | res/xml-sw600dp/default_workspace.xml | 48 | ||||
| -rw-r--r-- | res/xml/default_workspace.xml | 49 |
2 files changed, 73 insertions, 24 deletions
diff --git a/res/xml-sw600dp/default_workspace.xml b/res/xml-sw600dp/default_workspace.xml index 090c7a7af..d42a93a6a 100644 --- a/res/xml-sw600dp/default_workspace.xml +++ b/res/xml-sw600dp/default_workspace.xml @@ -60,13 +60,21 @@ <!-- Far-right screen [4] --> <!-- Hotseat (We use the screen as the position of the item in the hotseat) --> - <favorite - launcher:packageName="com.android.dialer" - launcher:className="com.android.dialer.DialtactsActivity" + <!-- Dialer, Contacts, [All Apps], Messaging, Browser --> + <resolve launcher:container="-101" launcher:screen="1" launcher:x="1" - launcher:y="0" /> + launcher:y="0" > + <favorite launcher:uri="#Intent;action=android.intent.action.DIAL;end" /> + <favorite launcher:uri="tel:123" /> + <favorite launcher:uri="#Intent;action=android.intent.action.CALL_BUTTON;end" /> + + <favorite + launcher:packageName="com.android.dialer" + launcher:className="com.android.dialer.DialtactsActivity" /> + </resolve> + <favorite launcher:packageName="com.android.contacts" launcher:className="com.android.contacts.activities.PeopleActivity" @@ -74,18 +82,34 @@ launcher:screen="2" launcher:x="2" launcher:y="0" /> - <favorite - launcher:packageName="com.android.mms" - launcher:className="com.android.mms.ui.ConversationList" + + <resolve launcher:container="-101" launcher:screen="4" launcher:x="4" - launcher:y="0" /> - <favorite - launcher:packageName="com.android.browser" - launcher:className="com.android.browser.BrowserActivity" + launcher:y="0" > + <favorite + launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_MESSAGING;end" /> + <favorite launcher:uri="sms:" /> + <favorite launcher:uri="smsto:" /> + <favorite launcher:uri="mms:" /> + <favorite launcher:uri="mmsto:" /> + + <favorite + launcher:packageName="com.android.mms" + launcher:className="com.android.mms.ui.ConversationList" /> + </resolve> + <resolve launcher:container="-101" launcher:screen="5" launcher:x="5" - launcher:y="0" /> + launcher:y="0" > + <favorite + launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_BROWSER;end" /> + <favorite launcher:uri="http://www.example.com/" /> + + <favorite + launcher:packageName="com.android.browser" + launcher:className="com.android.browser.BrowserActivity" /> + </resolve> </favorites> diff --git a/res/xml/default_workspace.xml b/res/xml/default_workspace.xml index 26fc504f0..9bec86aa8 100644 --- a/res/xml/default_workspace.xml +++ b/res/xml/default_workspace.xml @@ -60,13 +60,21 @@ <!-- Far-right screen [4] --> <!-- Hotseat (We use the screen as the position of the item in the hotseat) --> - <favorite - launcher:packageName="com.android.dialer" - launcher:className="com.android.dialer.DialtactsActivity" + <!-- Dialer, Contacts, [All Apps], Messaging, Browser --> + <resolve launcher:container="-101" launcher:screen="0" launcher:x="0" - launcher:y="0" /> + launcher:y="0" > + <favorite launcher:uri="#Intent;action=android.intent.action.DIAL;end" /> + <favorite launcher:uri="tel:123" /> + <favorite launcher:uri="#Intent;action=android.intent.action.CALL_BUTTON;end" /> + + <favorite + launcher:packageName="com.android.dialer" + launcher:className="com.android.dialer.DialtactsActivity" /> + </resolve> + <favorite launcher:packageName="com.android.contacts" launcher:className="com.android.contacts.activities.PeopleActivity" @@ -74,18 +82,35 @@ launcher:screen="1" launcher:x="1" launcher:y="0" /> - <favorite - launcher:packageName="com.android.mms" - launcher:className="com.android.mms.ui.ConversationList" + + <resolve 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:y="0" > + <favorite + launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_MESSAGING;end" /> + <favorite launcher:uri="sms:" /> + <favorite launcher:uri="smsto:" /> + <favorite launcher:uri="mms:" /> + <favorite launcher:uri="mmsto:" /> + + <favorite + launcher:packageName="com.android.mms" + launcher:className="com.android.mms.ui.ConversationList" /> + </resolve> + <resolve launcher:container="-101" launcher:screen="4" launcher:x="4" - launcher:y="0" /> + launcher:y="0" > + <favorite + launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_BROWSER;end" /> + <favorite launcher:uri="http://www.example.com/" /> + + <favorite + launcher:packageName="com.android.browser" + launcher:className="com.android.browser.BrowserActivity" /> + </resolve> + </favorites> |