diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2009-02-19 10:57:35 -0800 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2009-02-19 10:57:35 -0800 |
commit | 233a0136ea1fe86c61f02eb7b60dd2a9e3af4d91 (patch) | |
tree | ddbf0fb42445915d6573a41d09eb01035c6a60a1 | |
parent | 98baae654dc6e69eecb5ffab2f86c5ab217a762c (diff) | |
download | android_packages_apps_Trebuchet-233a0136ea1fe86c61f02eb7b60dd2a9e3af4d91.tar.gz android_packages_apps_Trebuchet-233a0136ea1fe86c61f02eb7b60dd2a9e3af4d91.tar.bz2 android_packages_apps_Trebuchet-233a0136ea1fe86c61f02eb7b60dd2a9e3af4d91.zip |
auto import from //branches/cupcake/...@132276
-rw-r--r-- | AndroidManifest.xml | 3 | ||||
-rw-r--r-- | res/drawable/wallpaper_lake.jpg | bin | 28946 -> 0 bytes | |||
-rw-r--r-- | res/values-cs/strings.xml | 18 | ||||
-rw-r--r-- | res/values-de/strings.xml | 18 | ||||
-rw-r--r-- | res/values-es/strings.xml | 30 | ||||
-rw-r--r-- | res/values-fr/strings.xml | 18 | ||||
-rw-r--r-- | res/values-it/strings.xml | 18 | ||||
-rw-r--r-- | res/values-ja/strings.xml | 26 | ||||
-rw-r--r-- | res/values-ko/strings.xml | 18 | ||||
-rw-r--r-- | res/values-nl/strings.xml | 18 | ||||
-rw-r--r-- | res/values-pl/strings.xml | 18 | ||||
-rw-r--r-- | res/values-ru/strings.xml | 18 | ||||
-rw-r--r-- | res/values-zh-rCN/strings.xml | 18 | ||||
-rw-r--r-- | res/values-zh-rTW/strings.xml | 18 | ||||
-rw-r--r-- | src/com/android/launcher/Launcher.java | 18 | ||||
-rw-r--r-- | src/com/android/launcher/Search.java | 4 | ||||
-rw-r--r-- | src/com/android/launcher/WallpaperChooser.java | 2 |
17 files changed, 102 insertions, 161 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 966848321..e81c4c96a 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -20,7 +20,8 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.launcher" - android:sharedUserId="android.uid.shared"> + android:sharedUserId="android.uid.shared" + android:sharedUserLabel="@string/application_name"> <permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" diff --git a/res/drawable/wallpaper_lake.jpg b/res/drawable/wallpaper_lake.jpg Binary files differdeleted file mode 100644 index 5ba522f57..000000000 --- a/res/drawable/wallpaper_lake.jpg +++ /dev/null diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index d7d98e9ef..ad5a30575 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -28,24 +28,19 @@ <string name="menu_item_add_item">"Přidat na plochu"</string> <string name="group_applications">"Aplikace"</string> <string name="group_shortcuts">"Zástupce"</string> - <!-- no translation found for group_search (5905328940867162196) --> - <skip /> - <!-- no translation found for group_folder (236213814675135523) --> - <skip /> + <string name="group_search">"Hledat"</string> + <string name="group_folder">"Složka"</string> <string name="group_live_folders">"Složka Live"</string> <string name="group_widgets">"Miniaplikace"</string> - <!-- no translation found for group_gadgets (7795333306847768497) --> - <skip /> + <string name="group_gadgets">"Gadget"</string> <string name="group_wallpapers">"Tapeta"</string> <string name="add_folder">"Složka"</string> <string name="add_clock">"Hodiny"</string> <string name="add_photo_frame">"Rámeček fotografie"</string> <string name="add_search">"Vyhledávání"</string> <string name="out_of_space">"Na této ploše již není místo."</string> - <!-- no translation found for title_select_shortcut (2858897527672831763) --> - <skip /> - <!-- no translation found for title_select_live_folder (441136484932944782) --> - <skip /> + <string name="title_select_shortcut">"Vyberte zástupce"</string> + <string name="title_select_live_folder">"Vyberte složku Live"</string> <string name="menu_add">"Přidat"</string> <string name="menu_wallpaper">"Tapeta"</string> <string name="menu_search">"Hledat"</string> @@ -60,6 +55,5 @@ <string name="permlab_write_settings">"zápis nastavení a odkazů plochy"</string> <string name="permdesc_write_settings">"Povoluje aplikaci změnit nastavení a odkazy plochy."</string> <string name="search_hint">"Vyhledávání Google"</string> - <!-- no translation found for gadget_error_text (7654995305187314446) --> - <skip /> + <string name="gadget_error_text">"Při načítání gadgetu došlo k problému"</string> </resources> diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index f8c4b6119..2b144da99 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -28,24 +28,19 @@ <string name="menu_item_add_item">"Zur Startseite hinzufügen"</string> <string name="group_applications">"Anwendung"</string> <string name="group_shortcuts">"Verknüpfung"</string> - <!-- no translation found for group_search (5905328940867162196) --> - <skip /> - <!-- no translation found for group_folder (236213814675135523) --> - <skip /> + <string name="group_search">"Suchen"</string> + <string name="group_folder">"Ordner"</string> <string name="group_live_folders">"Live-Ordner"</string> <string name="group_widgets">"Widget"</string> - <!-- no translation found for group_gadgets (7795333306847768497) --> - <skip /> + <string name="group_gadgets">"Gadget"</string> <string name="group_wallpapers">"Hintergrund"</string> <string name="add_folder">"Ordner"</string> <string name="add_clock">"Uhr"</string> <string name="add_photo_frame">"Bildrahmen"</string> <string name="add_search">"Suchen"</string> <string name="out_of_space">"Auf der Startseite ist kein Platz mehr vorhanden."</string> - <!-- no translation found for title_select_shortcut (2858897527672831763) --> - <skip /> - <!-- no translation found for title_select_live_folder (441136484932944782) --> - <skip /> + <string name="title_select_shortcut">"Tastenkürzel auswählen"</string> + <string name="title_select_live_folder">"Live-Ordner auswählen"</string> <string name="menu_add">"Hinzufügen"</string> <string name="menu_wallpaper">"Hintergrund"</string> <string name="menu_search">"Suchen"</string> @@ -60,6 +55,5 @@ <string name="permlab_write_settings">"Einstellungen und Shortcuts für Startseite schreiben"</string> <string name="permdesc_write_settings">"Ermöglicht einer Anwendung, die Einstellungen und Shortcuts auf der Startseite zu ändern."</string> <string name="search_hint">"Google-Suche"</string> - <!-- no translation found for gadget_error_text (7654995305187314446) --> - <skip /> + <string name="gadget_error_text">"Problem beim Laden von Gadget"</string> </resources> diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 96dbfa23d..0cacbdafd 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -17,9 +17,9 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="application_name">"Página principal"</string> <string name="folder_name">"Carpeta"</string> - <string name="chooser_wallpaper">"Seleccionar papel tapiz de"</string> - <string name="wallpaper_instructions">"Establecer papel tapiz"</string> - <string name="pick_wallpaper">"Galería de papel tapiz"</string> + <string name="chooser_wallpaper">"Seleccionar fondo de pantalla de"</string> + <string name="wallpaper_instructions">"Establecer fondo de pantalla"</string> + <string name="pick_wallpaper">"Galería de fondo de pantalla"</string> <string name="activity_not_found">"La aplicación no está instalada en el teléfono."</string> <string name="rename_folder_label">"Nombre de carpeta"</string> <string name="rename_folder_title">"Cambiar nombre de carpeta"</string> @@ -28,29 +28,24 @@ <string name="menu_item_add_item">"Añadir a pantalla de página principal"</string> <string name="group_applications">"Aplicación"</string> <string name="group_shortcuts">"Acceso directo"</string> - <!-- no translation found for group_search (5905328940867162196) --> - <skip /> - <!-- no translation found for group_folder (236213814675135523) --> - <skip /> + <string name="group_search">"Buscar"</string> + <string name="group_folder">"Carpeta"</string> <string name="group_live_folders">"Carpeta activa"</string> <string name="group_widgets">"Widget"</string> - <!-- no translation found for group_gadgets (7795333306847768497) --> - <skip /> - <string name="group_wallpapers">"Papel tapiz"</string> + <string name="group_gadgets">"Gadget"</string> + <string name="group_wallpapers">"Fondo de pantalla"</string> <string name="add_folder">"Carpeta"</string> <string name="add_clock">"Reloj"</string> <string name="add_photo_frame">"Picture frame"</string> <string name="add_search">"Búsqueda de Google"</string> <string name="out_of_space">"No queda espacio en esta pantalla de página principal."</string> - <!-- no translation found for title_select_shortcut (2858897527672831763) --> - <skip /> - <!-- no translation found for title_select_live_folder (441136484932944782) --> - <skip /> + <string name="title_select_shortcut">"Seleccionar acceso directo"</string> + <string name="title_select_live_folder">"Seleccionar carpeta activa"</string> <string name="menu_add">"Añadir"</string> - <string name="menu_wallpaper">"Papel tapiz"</string> + <string name="menu_wallpaper">"Fondo de pantalla"</string> <string name="menu_search">"Búsqueda de Google"</string> <string name="menu_notifications">"Notificaciones"</string> - <string name="menu_settings">"Configuración"</string> + <string name="menu_settings">"Ajustes"</string> <string name="permlab_install_shortcut">"instalar accesos directos"</string> <string name="permdesc_install_shortcut">"Permite que una aplicación añada accesos directos sin intervención del usuario."</string> <string name="permlab_uninstall_shortcut">"desinstalar accesos directos"</string> @@ -60,6 +55,5 @@ <string name="permlab_write_settings">"escribir información de accesos directos y de configuración de la página principal"</string> <string name="permdesc_write_settings">"Permite que una aplicación modifique la configuración y los accesos directos de la página principal."</string> <string name="search_hint">"Búsqueda de Google"</string> - <!-- no translation found for gadget_error_text (7654995305187314446) --> - <skip /> + <string name="gadget_error_text">"Problema la cargar gadget"</string> </resources> diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 3d14a22a9..c25610922 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -28,24 +28,19 @@ <string name="menu_item_add_item">"Ajouter à l\'écran d\'accueil"</string> <string name="group_applications">"Application"</string> <string name="group_shortcuts">"Raccourci"</string> - <!-- no translation found for group_search (5905328940867162196) --> - <skip /> - <!-- no translation found for group_folder (236213814675135523) --> - <skip /> + <string name="group_search">"Recherche"</string> + <string name="group_folder">"Dossier"</string> <string name="group_live_folders">"Dossier live"</string> <string name="group_widgets">"Widget"</string> - <!-- no translation found for group_gadgets (7795333306847768497) --> - <skip /> + <string name="group_gadgets">"Gadgets"</string> <string name="group_wallpapers">"Arrière-plan"</string> <string name="add_folder">"Dossier"</string> <string name="add_clock">"Horloge"</string> <string name="add_photo_frame">"Cadre d\'image"</string> <string name="add_search">"Rechercher"</string> <string name="out_of_space">"Plus d\'espace libre sur l\'écran Accueil."</string> - <!-- no translation found for title_select_shortcut (2858897527672831763) --> - <skip /> - <!-- no translation found for title_select_live_folder (441136484932944782) --> - <skip /> + <string name="title_select_shortcut">"Sélectionner un raccourci"</string> + <string name="title_select_live_folder">"Sélectionner Live Folder"</string> <string name="menu_add">"Ajouter"</string> <string name="menu_wallpaper">"Arrière-plan"</string> <string name="menu_search">"Rechercher"</string> @@ -60,6 +55,5 @@ <string name="permlab_write_settings">"écrire les paramètres de la page d\'accueil et des raccourcis"</string> <string name="permdesc_write_settings">"Permet à une application de modifier les paramètres et les raccourcis de la page d\'accueil."</string> <string name="search_hint">"Recherche Google"</string> - <!-- no translation found for gadget_error_text (7654995305187314446) --> - <skip /> + <string name="gadget_error_text">"Problème lors du chargement du gadget"</string> </resources> diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 8c79d13c3..a6895f993 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -28,24 +28,19 @@ <string name="menu_item_add_item">"Aggiungi a schermata Home"</string> <string name="group_applications">"Applicazione"</string> <string name="group_shortcuts">"Collegamento"</string> - <!-- no translation found for group_search (5905328940867162196) --> - <skip /> - <!-- no translation found for group_folder (236213814675135523) --> - <skip /> + <string name="group_search">"Cerca"</string> + <string name="group_folder">"Cartella"</string> <string name="group_live_folders">"Cartella dinamica"</string> <string name="group_widgets">"Widget"</string> - <!-- no translation found for group_gadgets (7795333306847768497) --> - <skip /> + <string name="group_gadgets">"Gadget"</string> <string name="group_wallpapers">"Sfondo"</string> <string name="add_folder">"Cartella"</string> <string name="add_clock">"Orologio"</string> <string name="add_photo_frame">"Cornice immagini"</string> <string name="add_search">"Ricerca"</string> <string name="out_of_space">"Spazio nella schermata Home esaurito."</string> - <!-- no translation found for title_select_shortcut (2858897527672831763) --> - <skip /> - <!-- no translation found for title_select_live_folder (441136484932944782) --> - <skip /> + <string name="title_select_shortcut">"Seleziona collegamento"</string> + <string name="title_select_live_folder">"Seleziona cartella dinamica"</string> <string name="menu_add">"Aggiungi"</string> <string name="menu_wallpaper">"Sfondo"</string> <string name="menu_search">"Cerca"</string> @@ -60,6 +55,5 @@ <string name="permlab_write_settings">"creare impostazioni e collegamenti in Home"</string> <string name="permdesc_write_settings">"Consente a un\'applicazione di modificare le impostazioni e i collegamenti in Home."</string> <string name="search_hint">"Ricerca Google"</string> - <!-- no translation found for gadget_error_text (7654995305187314446) --> - <skip /> + <string name="gadget_error_text">"Errore durante caricamento del gadget"</string> </resources> diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 0e7531408..4c848828d 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -28,38 +28,32 @@ <string name="menu_item_add_item">"ホーム画面に追加"</string> <string name="group_applications">"アプリケーション"</string> <string name="group_shortcuts">"ショートカット"</string> - <!-- no translation found for group_search (5905328940867162196) --> - <skip /> - <!-- no translation found for group_folder (236213814675135523) --> - <skip /> + <string name="group_search">"検索"</string> + <string name="group_folder">"フォルダ"</string> <string name="group_live_folders">"ライブフォルダ"</string> <string name="group_widgets">"ウィジェット"</string> - <!-- no translation found for group_gadgets (7795333306847768497) --> - <skip /> + <string name="group_gadgets">"ガジェット"</string> <string name="group_wallpapers">"壁紙"</string> <string name="add_folder">"フォルダ"</string> <string name="add_clock">"時計"</string> <string name="add_photo_frame">"写真フレーム"</string> <string name="add_search">"検索"</string> - <string name="out_of_space">"このホーム画面には空きスペースがありません。"</string> - <!-- no translation found for title_select_shortcut (2858897527672831763) --> - <skip /> - <!-- no translation found for title_select_live_folder (441136484932944782) --> - <skip /> + <string name="out_of_space">"ホーム画面に空きスペースがありません。"</string> + <string name="title_select_shortcut">"ショートカットを選択"</string> + <string name="title_select_live_folder">"ライブフォルダを選択"</string> <string name="menu_add">"追加"</string> <string name="menu_wallpaper">"壁紙"</string> <string name="menu_search">"検索"</string> <string name="menu_notifications">"通知"</string> <string name="menu_settings">"設定"</string> <string name="permlab_install_shortcut">"ショートカットのインストール"</string> - <string name="permdesc_install_shortcut">"ユーザー操作なしで、ショートカットをアプリケーションで追加できるようにします。"</string> + <string name="permdesc_install_shortcut">"ユーザー操作なしでショートカットの追加をアプリケーションに許可します。"</string> <string name="permlab_uninstall_shortcut">"ショートカットのアンインストール"</string> - <string name="permdesc_uninstall_shortcut">"ユーザー操作なしで、ショートカットをアプリケーションで削除できるようにします。"</string> - <string name="permlab_read_settings">"ホームの設定とショートカットの読み取り"</string> + <string name="permdesc_uninstall_shortcut">"ユーザー操作なしでショートカットの削除をアプリケーションに許可します。"</string> + <string name="permlab_read_settings">"ホーム設定とショートカットの読み取り"</string> <string name="permdesc_read_settings">"ホームの設定とショートカットの読み取りをアプリケーションに許可します。"</string> <string name="permlab_write_settings">"ホームの設定とショートカットの書き込み"</string> <string name="permdesc_write_settings">"ホームの設定とショートカットの変更をアプリケーションに許可します。"</string> <string name="search_hint">"Google検索"</string> - <!-- no translation found for gadget_error_text (7654995305187314446) --> - <skip /> + <string name="gadget_error_text">"ガジェットをロードできません"</string> </resources> diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 29cb53a24..65f207972 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -28,24 +28,19 @@ <string name="menu_item_add_item">"홈 화면에 추가"</string> <string name="group_applications">"응용프로그램"</string> <string name="group_shortcuts">"바로가기"</string> - <!-- no translation found for group_search (5905328940867162196) --> - <skip /> - <!-- no translation found for group_folder (236213814675135523) --> - <skip /> + <string name="group_search">"검색"</string> + <string name="group_folder">"폴더"</string> <string name="group_live_folders">"라이브 폴더"</string> <string name="group_widgets">"위젯"</string> - <!-- no translation found for group_gadgets (7795333306847768497) --> - <skip /> + <string name="group_gadgets">"가젯"</string> <string name="group_wallpapers">"배경화면"</string> <string name="add_folder">"폴더"</string> <string name="add_clock">"시계"</string> <string name="add_photo_frame">"사진 프레임"</string> <string name="add_search">"검색"</string> <string name="out_of_space">"홈 화면에 더 이상 공간이 없습니다."</string> - <!-- no translation found for title_select_shortcut (2858897527672831763) --> - <skip /> - <!-- no translation found for title_select_live_folder (441136484932944782) --> - <skip /> + <string name="title_select_shortcut">"바로가기 선택"</string> + <string name="title_select_live_folder">"라이브 폴더 선택"</string> <string name="menu_add">"추가"</string> <string name="menu_wallpaper">"배경화면"</string> <string name="menu_search">"검색"</string> @@ -60,6 +55,5 @@ <string name="permlab_write_settings">"홈 설정 및 바로가기 쓰기"</string> <string name="permdesc_write_settings">"응용프로그램이 홈에 있는 설정 및 바로가기를 변경할 수 있습니다."</string> <string name="search_hint">"Google 검색"</string> - <!-- no translation found for gadget_error_text (7654995305187314446) --> - <skip /> + <string name="gadget_error_text">"가젯 로드 중 문제 발생"</string> </resources> diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index bcb13ee41..301d2747e 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -28,24 +28,19 @@ <string name="menu_item_add_item">"Toevoegen aan startpagina"</string> <string name="group_applications">"Toepassing"</string> <string name="group_shortcuts">"Snelkoppeling"</string> - <!-- no translation found for group_search (5905328940867162196) --> - <skip /> - <!-- no translation found for group_folder (236213814675135523) --> - <skip /> + <string name="group_search">"Zoeken"</string> + <string name="group_folder">"Map"</string> <string name="group_live_folders">"Live map"</string> <string name="group_widgets">"Widget"</string> - <!-- no translation found for group_gadgets (7795333306847768497) --> - <skip /> + <string name="group_gadgets">"Gadget"</string> <string name="group_wallpapers">"Achtergrond"</string> <string name="add_folder">"Map"</string> <string name="add_clock">"Klok"</string> <string name="add_photo_frame">"Fotolijstje"</string> <string name="add_search">"Zoeken"</string> <string name="out_of_space">"Er is geen ruimte meer op dit startscherm."</string> - <!-- no translation found for title_select_shortcut (2858897527672831763) --> - <skip /> - <!-- no translation found for title_select_live_folder (441136484932944782) --> - <skip /> + <string name="title_select_shortcut">"Snelkoppeling selecteren"</string> + <string name="title_select_live_folder">"Live map selecteren"</string> <string name="menu_add">"Toevoegen"</string> <string name="menu_wallpaper">"Achtergrond"</string> <string name="menu_search">"Zoeken"</string> @@ -60,6 +55,5 @@ <string name="permlab_write_settings">"instellingen en snelkoppelingen voor de startpagina schrijven"</string> <string name="permdesc_write_settings">"Hiermee kan een toepassing de instellingen en snelkoppelingen op de startpagina wijzigen."</string> <string name="search_hint">"Zoeken met Google"</string> - <!-- no translation found for gadget_error_text (7654995305187314446) --> - <skip /> + <string name="gadget_error_text">"Probleem bij het laden van gadget"</string> </resources> diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index f5d4ca9d0..adb5785a2 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -28,24 +28,19 @@ <string name="menu_item_add_item">"Dodaj do strony głównej"</string> <string name="group_applications">"Aplikacja"</string> <string name="group_shortcuts">"Skrót"</string> - <!-- no translation found for group_search (5905328940867162196) --> - <skip /> - <!-- no translation found for group_folder (236213814675135523) --> - <skip /> + <string name="group_search">"Szukaj"</string> + <string name="group_folder">"Folder"</string> <string name="group_live_folders">"Folder Live"</string> <string name="group_widgets">"Widget"</string> - <!-- no translation found for group_gadgets (7795333306847768497) --> - <skip /> + <string name="group_gadgets">"Gadżet"</string> <string name="group_wallpapers">"Tapeta"</string> <string name="add_folder">"Folder"</string> <string name="add_clock">"Zegar"</string> <string name="add_photo_frame">"Ramka obrazu"</string> <string name="add_search">"Szukaj"</string> <string name="out_of_space">"Brak miejsca na tej stronie głównej"</string> - <!-- no translation found for title_select_shortcut (2858897527672831763) --> - <skip /> - <!-- no translation found for title_select_live_folder (441136484932944782) --> - <skip /> + <string name="title_select_shortcut">"Wybierz skrót"</string> + <string name="title_select_live_folder">"Wybierz folder aktywny"</string> <string name="menu_add">"Dodaj"</string> <string name="menu_wallpaper">"Tapeta"</string> <string name="menu_search">"Szukaj"</string> @@ -60,6 +55,5 @@ <string name="permlab_write_settings">"zapisywanie ustawień i skrótów strony głównej"</string> <string name="permdesc_write_settings">"Umożliwia aplikacji zmianę ustawień i skrótów strony głównej."</string> <string name="search_hint">"Szukaj w Google"</string> - <!-- no translation found for gadget_error_text (7654995305187314446) --> - <skip /> + <string name="gadget_error_text">"Wystąpił problem podczas ładowania gadżetu"</string> </resources> diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index d720e3b40..d2ac07dcc 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -28,24 +28,19 @@ <string name="menu_item_add_item">"Добавление на главный экран"</string> <string name="group_applications">"Приложение"</string> <string name="group_shortcuts">"Ярлык"</string> - <!-- no translation found for group_search (5905328940867162196) --> - <skip /> - <!-- no translation found for group_folder (236213814675135523) --> - <skip /> + <string name="group_search">"Поиск"</string> + <string name="group_folder">"Папка"</string> <string name="group_live_folders">"Динамическая папка"</string> <string name="group_widgets">"Виджет"</string> - <!-- no translation found for group_gadgets (7795333306847768497) --> - <skip /> + <string name="group_gadgets">"Гаджет"</string> <string name="group_wallpapers">"Фоновый рисунок"</string> <string name="add_folder">"Папка"</string> <string name="add_clock">"Часы"</string> <string name="add_photo_frame">"Рамка для картинки"</string> <string name="add_search">"Поиск"</string> <string name="out_of_space">"На главном экране больше нет места."</string> - <!-- no translation found for title_select_shortcut (2858897527672831763) --> - <skip /> - <!-- no translation found for title_select_live_folder (441136484932944782) --> - <skip /> + <string name="title_select_shortcut">"Выберите ярлык"</string> + <string name="title_select_live_folder">"Выберите активную папку"</string> <string name="menu_add">"Добавить"</string> <string name="menu_wallpaper">"Фоновый рисунок"</string> <string name="menu_search">"Искать"</string> @@ -60,6 +55,5 @@ <string name="permlab_write_settings">"записывать ярлыки и настройки главного экрана"</string> <string name="permdesc_write_settings">"Позволяет приложению изменять настройки и ярлыки на главном экране."</string> <string name="search_hint">"Поиск Google"</string> - <!-- no translation found for gadget_error_text (7654995305187314446) --> - <skip /> + <string name="gadget_error_text">"Проблема загрузки гаджета"</string> </resources> diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index ec751399e..8ea7b3f6b 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -28,24 +28,19 @@ <string name="menu_item_add_item">"添加到“主页”屏幕"</string> <string name="group_applications">"应用程序"</string> <string name="group_shortcuts">"快捷键"</string> - <!-- no translation found for group_search (5905328940867162196) --> - <skip /> - <!-- no translation found for group_folder (236213814675135523) --> - <skip /> + <string name="group_search">"搜索"</string> + <string name="group_folder">"文件夹"</string> <string name="group_live_folders">"活动的文件夹"</string> <string name="group_widgets">"小工具"</string> - <!-- no translation found for group_gadgets (7795333306847768497) --> - <skip /> + <string name="group_gadgets">"小工具"</string> <string name="group_wallpapers">"壁纸"</string> <string name="add_folder">"文件夹"</string> <string name="add_clock">"时钟"</string> <string name="add_photo_frame">"相框"</string> <string name="add_search">"搜索"</string> <string name="out_of_space">"该“主页”屏幕上没有多余空间。"</string> - <!-- no translation found for title_select_shortcut (2858897527672831763) --> - <skip /> - <!-- no translation found for title_select_live_folder (441136484932944782) --> - <skip /> + <string name="title_select_shortcut">"选择快捷键"</string> + <string name="title_select_live_folder">"选择活动文件夹"</string> <string name="menu_add">"添加"</string> <string name="menu_wallpaper">"壁纸"</string> <string name="menu_search">"搜索"</string> @@ -60,6 +55,5 @@ <string name="permlab_write_settings">"写入“主页”设置和快捷键"</string> <string name="permdesc_write_settings">"允许应用程序更改“主页”中的设置和快捷键。"</string> <string name="search_hint">"Google 搜索"</string> - <!-- no translation found for gadget_error_text (7654995305187314446) --> - <skip /> + <string name="gadget_error_text">"载入小工具时出现问题"</string> </resources> diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index aa4f951fa..b6559ffd6 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -28,24 +28,19 @@ <string name="menu_item_add_item">"新增至首頁畫面"</string> <string name="group_applications">"應用程式"</string> <string name="group_shortcuts">"捷徑"</string> - <!-- no translation found for group_search (5905328940867162196) --> - <skip /> - <!-- no translation found for group_folder (236213814675135523) --> - <skip /> + <string name="group_search">"搜尋"</string> + <string name="group_folder">"資料夾"</string> <string name="group_live_folders">"使用中的資料夾"</string> <string name="group_widgets">"Widget"</string> - <!-- no translation found for group_gadgets (7795333306847768497) --> - <skip /> + <string name="group_gadgets">"小工具"</string> <string name="group_wallpapers">"桌布"</string> <string name="add_folder">"資料夾"</string> <string name="add_clock">"時鐘"</string> <string name="add_photo_frame">"相框"</string> <string name="add_search">"搜尋"</string> <string name="out_of_space">"首頁已無空間"</string> - <!-- no translation found for title_select_shortcut (2858897527672831763) --> - <skip /> - <!-- no translation found for title_select_live_folder (441136484932944782) --> - <skip /> + <string name="title_select_shortcut">"選取捷徑"</string> + <string name="title_select_live_folder">"選取作用中資料夾"</string> <string name="menu_add">"新增"</string> <string name="menu_wallpaper">"桌布"</string> <string name="menu_search">"搜尋"</string> @@ -60,6 +55,5 @@ <string name="permlab_write_settings">"寫入首頁設定和捷徑"</string> <string name="permdesc_write_settings">"允許應用程式變更首頁中的設定和捷徑。"</string> <string name="search_hint">"Google 搜尋"</string> - <!-- no translation found for gadget_error_text (7654995305187314446) --> - <skip /> + <string name="gadget_error_text">"載入小工具時發生問題"</string> </resources> diff --git a/src/com/android/launcher/Launcher.java b/src/com/android/launcher/Launcher.java index 4252daecf..58fcd5a28 100644 --- a/src/com/android/launcher/Launcher.java +++ b/src/com/android/launcher/Launcher.java @@ -355,11 +355,21 @@ public final class Launcher extends Activity implements View.OnClickListener, On } return handled; } + private boolean acceptFilter() { + final Configuration configuration = getResources().getConfiguration(); + final boolean keyboardShowing = configuration.keyboardHidden != + Configuration.KEYBOARDHIDDEN_YES; + final boolean hasKeyboard = configuration.keyboard != Configuration.KEYBOARD_NOKEYS; + final InputMethodManager inputManager = (InputMethodManager) + getSystemService(Context.INPUT_METHOD_SERVICE); + return (hasKeyboard && keyboardShowing) || + (!hasKeyboard && !inputManager.isFullscreenMode()); + } @Override public boolean onKeyDown(int keyCode, KeyEvent event) { boolean handled = super.onKeyDown(keyCode, event); - if (!handled && keyCode != KeyEvent.KEYCODE_ENTER) { + if (!handled && acceptFilter() && keyCode != KeyEvent.KEYCODE_ENTER) { boolean gotKey = TextKeyListener.getInstance().onKeyDown(mWorkspace, mDefaultKeySsb, keyCode, event); if (gotKey && mDefaultKeySsb != null && mDefaultKeySsb.length() > 0) { @@ -861,8 +871,10 @@ public final class Launcher extends Activity implements View.OnClickListener, On startWallpaper(); return true; case MENU_SEARCH: - if (!mWorkspace.snapToSearch()) { - onSearchRequested(); + if (mWorkspace.snapToSearch()) { + closeDrawer(true); // search gadget: get drawer out of the way + } else { + onSearchRequested(); // no search gadget: use system search UI } return true; case MENU_NOTIFICATIONS: diff --git a/src/com/android/launcher/Search.java b/src/com/android/launcher/Search.java index 449caf997..d33fd69fa 100644 --- a/src/com/android/launcher/Search.java +++ b/src/com/android/launcher/Search.java @@ -343,9 +343,9 @@ public class Search extends LinearLayout implements OnClickListener, OnKeyListen if (mSearchable.getVoiceSearchEnabled() && mSearchable.getVoiceSearchLaunchWebSearch()) { // Enable the voice search button if there is an activity that can handle it PackageManager pm = getContext().getPackageManager(); - List<ResolveInfo> list = pm.queryIntentActivities(mVoiceSearchIntent, + ResolveInfo ri = pm.resolveActivity(mVoiceSearchIntent, PackageManager.MATCH_DEFAULT_ONLY); - voiceSearchVisible = list.size() > 0; + voiceSearchVisible = ri != null; } // finally, set visible state of voice search button, as appropriate diff --git a/src/com/android/launcher/WallpaperChooser.java b/src/com/android/launcher/WallpaperChooser.java index c88a02a61..9ac922cba 100644 --- a/src/com/android/launcher/WallpaperChooser.java +++ b/src/com/android/launcher/WallpaperChooser.java @@ -60,7 +60,7 @@ public class WallpaperChooser extends Activity implements AdapterView.OnItemSele }; private static final Integer[] IMAGE_IDS = { - R.drawable.wallpaper_lake, + com.android.internal.R.drawable.default_wallpaper, R.drawable.wallpaper_sunset, R.drawable.wallpaper_beach, R.drawable.wallpaper_snow_leopard, |