diff options
-rw-r--r-- | res/values-da/strings.xml | 21 | ||||
-rw-r--r-- | res/values-el/strings.xml | 21 | ||||
-rw-r--r-- | res/values-es-rUS/strings.xml | 21 | ||||
-rw-r--r-- | res/values-ko/strings.xml | 21 | ||||
-rw-r--r-- | res/values-nb/strings.xml | 21 | ||||
-rw-r--r-- | res/values-pt-rPT/strings.xml | 21 | ||||
-rw-r--r-- | res/values-pt/strings.xml | 21 | ||||
-rw-r--r-- | res/values-ru/strings.xml | 21 | ||||
-rw-r--r-- | res/values-sv/strings.xml | 21 | ||||
-rw-r--r-- | res/values-tr/strings.xml | 21 | ||||
-rw-r--r-- | res/values-zh-rCN/strings.xml | 21 | ||||
-rw-r--r-- | src/com/android/providers/applications/ApplicationLauncher.java | 7 | ||||
-rw-r--r-- | src/com/android/providers/applications/ApplicationsProvider.java | 9 |
13 files changed, 245 insertions, 2 deletions
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml new file mode 100644 index 0000000..70117b7 --- /dev/null +++ b/res/values-da/strings.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (C) 2009 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. +--> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="search_label" msgid="6182832093760999173">"Apps"</string> + <string name="application_desc" msgid="888412554142684749">"Program"</string> + <string name="settings_description" msgid="966629744054022387">"Navne på installerede programmer"</string> +</resources> diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml new file mode 100644 index 0000000..ec58c6d --- /dev/null +++ b/res/values-el/strings.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (C) 2009 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. +--> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="search_label" msgid="6182832093760999173">"Εφαρμογές"</string> + <string name="application_desc" msgid="888412554142684749">"Εφαρμογή"</string> + <string name="settings_description" msgid="966629744054022387">"Ονόματα εγκατεστημένων εφαρμογών"</string> +</resources> diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml new file mode 100644 index 0000000..9062e21 --- /dev/null +++ b/res/values-es-rUS/strings.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (C) 2009 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. +--> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="search_label" msgid="6182832093760999173">"Apps"</string> + <string name="application_desc" msgid="888412554142684749">"Aplicación"</string> + <string name="settings_description" msgid="966629744054022387">"Nombres de aplicaciones instaladas"</string> +</resources> diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml new file mode 100644 index 0000000..66afbcc --- /dev/null +++ b/res/values-ko/strings.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (C) 2009 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. +--> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="search_label" msgid="6182832093760999173">"응용프로그램"</string> + <string name="application_desc" msgid="888412554142684749">"응용프로그램"</string> + <string name="settings_description" msgid="966629744054022387">"설치된 응용프로그램의 이름"</string> +</resources> diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml new file mode 100644 index 0000000..9ad7ab0 --- /dev/null +++ b/res/values-nb/strings.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (C) 2009 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. +--> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="search_label" msgid="6182832093760999173">"Apps"</string> + <string name="application_desc" msgid="888412554142684749">"Program"</string> + <string name="settings_description" msgid="966629744054022387">"Navn på installerte programmer"</string> +</resources> diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml new file mode 100644 index 0000000..b76d8af --- /dev/null +++ b/res/values-pt-rPT/strings.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (C) 2009 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. +--> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="search_label" msgid="6182832093760999173">"Apps"</string> + <string name="application_desc" msgid="888412554142684749">"Aplicação"</string> + <string name="settings_description" msgid="966629744054022387">"Nomes das aplicações instaladas"</string> +</resources> diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml new file mode 100644 index 0000000..0e1d534 --- /dev/null +++ b/res/values-pt/strings.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (C) 2009 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. +--> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="search_label" msgid="6182832093760999173">"Aplicativos"</string> + <string name="application_desc" msgid="888412554142684749">"Aplicativo"</string> + <string name="settings_description" msgid="966629744054022387">"Nomes dos aplicativos instalados"</string> +</resources> diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml new file mode 100644 index 0000000..a35fd61 --- /dev/null +++ b/res/values-ru/strings.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (C) 2009 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. +--> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="search_label" msgid="6182832093760999173">"Приложения"</string> + <string name="application_desc" msgid="888412554142684749">"Приложение"</string> + <string name="settings_description" msgid="966629744054022387">"Названия установленных приложений"</string> +</resources> diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml new file mode 100644 index 0000000..4e6da0b --- /dev/null +++ b/res/values-sv/strings.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (C) 2009 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. +--> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="search_label" msgid="6182832093760999173">"Program"</string> + <string name="application_desc" msgid="888412554142684749">"Program"</string> + <string name="settings_description" msgid="966629744054022387">"Namn på installerade program"</string> +</resources> diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml new file mode 100644 index 0000000..506dfb0 --- /dev/null +++ b/res/values-tr/strings.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (C) 2009 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. +--> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="search_label" msgid="6182832093760999173">"Uygulamalar"</string> + <string name="application_desc" msgid="888412554142684749">"Uygulama"</string> + <string name="settings_description" msgid="966629744054022387">"Yüklenen uygulamaların adları"</string> +</resources> diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml new file mode 100644 index 0000000..d0e1cac --- /dev/null +++ b/res/values-zh-rCN/strings.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (C) 2009 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. +--> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="search_label" msgid="6182832093760999173">"应用程序"</string> + <string name="application_desc" msgid="888412554142684749">"应用程序"</string> + <string name="settings_description" msgid="966629744054022387">"已安装的应用程序的名称"</string> +</resources> diff --git a/src/com/android/providers/applications/ApplicationLauncher.java b/src/com/android/providers/applications/ApplicationLauncher.java index 8463fb6..830597f 100644 --- a/src/com/android/providers/applications/ApplicationLauncher.java +++ b/src/com/android/providers/applications/ApplicationLauncher.java @@ -17,6 +17,7 @@ package com.android.providers.applications; import android.app.Activity; +import android.content.ActivityNotFoundException; import android.content.ComponentName; import android.content.Intent; import android.net.Uri; @@ -45,7 +46,11 @@ public class ApplicationLauncher extends Activity { launchIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED); launchIntent.setComponent(componentName); - startActivity(launchIntent); + try { + startActivity(launchIntent); + } catch (ActivityNotFoundException ex) { + Log.w(TAG, "Activity not found: " + componentName); + } handled = true; } } diff --git a/src/com/android/providers/applications/ApplicationsProvider.java b/src/com/android/providers/applications/ApplicationsProvider.java index ee18a74..454681d 100644 --- a/src/com/android/providers/applications/ApplicationsProvider.java +++ b/src/com/android/providers/applications/ApplicationsProvider.java @@ -285,7 +285,14 @@ public class ApplicationsProvider extends ContentProvider implements ThreadFacto */ @Override public String getType(Uri uri) { - return SearchManager.SUGGEST_MIME_TYPE; + switch (sURIMatcher.match(uri)) { + case SEARCH_SUGGEST: + return SearchManager.SUGGEST_MIME_TYPE; + case SHORTCUT_REFRESH: + return SearchManager.SHORTCUT_MIME_TYPE; + default: + throw new IllegalArgumentException("Unknown URL " + uri); + } } /** |