diff options
| author | Daniel Sandler <dsandler@android.com> | 2010-04-28 13:32:44 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-04-28 13:32:44 -0700 |
| commit | 0554b74917e847088e031aa1a9a34463fc3d1ebf (patch) | |
| tree | af7ea43615e262ed0158c833cce2c54d18a451e2 /res | |
| parent | 993d2efb7406675dbb1882cd287dc972366d5251 (diff) | |
| parent | ab1ebd7e6f10a352867d4e38ce6421a38b0f50d2 (diff) | |
| download | android_packages_apps_Trebuchet-0554b74917e847088e031aa1a9a34463fc3d1ebf.tar.gz android_packages_apps_Trebuchet-0554b74917e847088e031aa1a9a34463fc3d1ebf.tar.bz2 android_packages_apps_Trebuchet-0554b74917e847088e031aa1a9a34463fc3d1ebf.zip | |
Merge "Hotseats: better strategy for finding the default browser." into froyo
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/arrays.xml | 11 | ||||
| -rw-r--r-- | res/values/strings.xml | 6 |
2 files changed, 17 insertions, 0 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml new file mode 100644 index 000000000..1fcabb2f9 --- /dev/null +++ b/res/values/arrays.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string-array name="hotseats" translatable="false"> + <item>intent:#Intent;action=android.intent.action.MAIN;component=com.android.contacts/.ContactsLaunchActivity;end</item> + <item>*BROWSER*</item> + </string-array> + <array name="hotseat_icons" translatable="false"> + <item>@drawable/hotseat_phone</item> + <item>@drawable/hotseat_browser</item> + </array> +</resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 73c6a8ae8..86c1b3c1f 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -141,4 +141,10 @@ <!-- 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> + <!-- URL to use when detecting the current default browser. + Attempts to mimic homepage_base in Browser; {CID} should be replaced + by the client-id, e.g. "android-google". --> + <string name="default_browser_url" translatable="false"> + http://www.google.com/m?client=ms-{CID}&source=android-home-hotseat</string> + </resources> |