summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--res/values-da/strings.xml6
-rw-r--r--res/values-de/strings.xml6
-rw-r--r--res/values-ko/strings.xml4
-rw-r--r--res/values-nb/strings.xml6
-rw-r--r--res/values-ru/strings.xml6
-rw-r--r--res/values/strings.xml36
-rw-r--r--src/com/android/launcher2/Launcher.java3
-rw-r--r--src/com/android/launcher2/SearchDropTargetBar.java19
8 files changed, 53 insertions, 33 deletions
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 8682bc778..6f9f6fe6a 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -36,7 +36,7 @@
<string name="rename_action" msgid="6016003384693240896">"OK"</string>
<string name="cancel_action" msgid="3811860427489435048">"Annuller"</string>
<string name="menu_item_add_item" msgid="6233177331075781114">"Føj til Startskærm"</string>
- <string name="group_applications" msgid="4118484163419674240">"Applikationer"</string>
+ <string name="group_applications" msgid="4118484163419674240">"Programmer"</string>
<string name="group_shortcuts" msgid="9133529424900391877">"Genveje"</string>
<string name="group_widgets" msgid="6704978494073105844">"Widgets"</string>
<string name="group_wallpapers" msgid="1568191644272224858">"Tapeter"</string>
@@ -47,7 +47,7 @@
<string name="shortcut_duplicate" msgid="4757756326465060694">"Genvejen \"<xliff:g id="NAME">%s</xliff:g>\" findes allerede."</string>
<string name="title_select_shortcut" msgid="2858897527672831763">"Vælg genvej"</string>
<string name="title_select_application" msgid="8031072293115454221">"Vælg applikation"</string>
- <string name="all_apps_button_label" msgid="2578400570124163469">"Applikationer"</string>
+ <string name="all_apps_button_label" msgid="2578400570124163469">"Programmer"</string>
<string name="all_apps_home_button_label" msgid="1022222300329398558">"Start"</string>
<string name="delete_zone_label_workspace" msgid="7153615831493049150">"Fjern"</string>
<string name="delete_zone_label_all_apps" msgid="6664588234817475108">"Afinstaller"</string>
@@ -56,7 +56,7 @@
<string name="info_target_label" msgid="4019495079517426980">"Oplysninger om appen"</string>
<string name="accessibility_search_button" msgid="816822994629942611">"Søg"</string>
<string name="accessibility_voice_search_button" msgid="3938249215065842475">"Stemmesøgning"</string>
- <string name="accessibility_all_apps_button" msgid="1595097919145716305">"Applikationer"</string>
+ <string name="accessibility_all_apps_button" msgid="1595097919145716305">"Programmer"</string>
<string name="accessibility_delete_button" msgid="3628162007991023603">"Fjern"</string>
<string name="delete_zone_label_all_apps_system_app" msgid="3683920959591819044">"Afinstaller opdatering"</string>
<string name="menu_add" msgid="3065046628354640854">"Tilføj"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 1ce7c3ffa..b0845acf5 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -80,15 +80,15 @@
<string name="permdesc_read_settings" msgid="8377434937176025492">"Ermöglicht einer App, die Einstellungen und Shortcuts auf der Startseite zu lesen."</string>
<string name="permlab_write_settings" msgid="1360567537236705628">"Einstellungen und Shortcuts für Startseite schreiben"</string>
<string name="permdesc_write_settings" msgid="1098648778383349818">"Ermöglicht einer App, die Einstellungen und Shortcuts auf der Startseite zu ändern."</string>
- <string name="gadget_error_text" msgid="8359351016167075858">"Fehler beim Laden des Widgets"</string>
+ <string name="gadget_error_text" msgid="8359351016167075858">"Problem beim Laden des Widgets"</string>
<string name="uninstall_system_app_text" msgid="7488523163288397451">"Dies ist eine Systemanwendung, die nicht deinstalliert werden kann."</string>
<string name="dream_name" msgid="2847171357608437154">"Raketenstartgerät"</string>
<string name="folder_hint_text" msgid="8633351560105748141">"Unbenannter Ordner"</string>
<string name="workspace_cling_title" msgid="738396473989890567">"Fühlen Sie sich wie zu Hause"</string>
<string name="workspace_cling_move_item" msgid="791013895761065070">"Hier können Sie Ihre Lieblings-Apps ablegen."</string>
- <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Berühren Sie den Kreis für eine Übersicht aller Apps."</string>
+ <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Berühren Sie zum Anzeigen aller Ihrer Apps den Kreis."</string>
<string name="all_apps_cling_title" msgid="2559734712581447107">"Einige Apps auswählen"</string>
- <string name="all_apps_cling_add_item" msgid="7404588523183860170">"Berühren und halten Sie eine App, um sie zum Startbildschirm hinzuzufügen."</string>
+ <string name="all_apps_cling_add_item" msgid="7404588523183860170">"Zum Hinzufügen einer App zu Ihrem Startbildschirm berühren und halten Sie diese."</string>
<string name="folder_cling_title" msgid="4308949882377840953">"Apps mit Ordnern organisieren"</string>
<string name="folder_cling_move_item" msgid="270598675060435169">"Berühren und halten Sie eine App, um sie zu verschieben."</string>
<string name="folder_cling_create_folder" msgid="289412698047625601">"Stapeln Sie Apps übereinander, um einen neuen Ordner auf Ihrem Startbildschirm zu erstellen."</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index e0f0bf517..916b64112 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -84,8 +84,8 @@
<string name="uninstall_system_app_text" msgid="7488523163288397451">"시스템 애플리케이션은 제거할 수 없습니다."</string>
<string name="dream_name" msgid="2847171357608437154">"로켓 실행기"</string>
<string name="folder_hint_text" msgid="8633351560105748141">"이름이 없는 폴더"</string>
- <string name="workspace_cling_title" msgid="738396473989890567">"나만의 홈 화면 만들기"</string>
- <string name="workspace_cling_move_item" msgid="791013895761065070">"자주 사용하는 앱을 홈 화면으로 가져오세요."</string>
+ <string name="workspace_cling_title" msgid="738396473989890567">"집처럼 편안하게 사용하세요."</string>
+ <string name="workspace_cling_move_item" msgid="791013895761065070">"즐겨찾는 앱을 이 곳에 놓을 수 있습니다."</string>
<string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"전체 앱을 보려면 원을 터치합니다."</string>
<string name="all_apps_cling_title" msgid="2559734712581447107">"앱 선택하기"</string>
<string name="all_apps_cling_add_item" msgid="7404588523183860170">"홈 화면에 앱을 추가하려면 길게 터치합니다."</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 322ebf14b..1ca007040 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -36,7 +36,7 @@
<string name="rename_action" msgid="6016003384693240896">"OK"</string>
<string name="cancel_action" msgid="3811860427489435048">"Avbryt"</string>
<string name="menu_item_add_item" msgid="6233177331075781114">"Legg til skrivebord"</string>
- <string name="group_applications" msgid="4118484163419674240">"Apper"</string>
+ <string name="group_applications" msgid="4118484163419674240">"Applikasjoner"</string>
<string name="group_shortcuts" msgid="9133529424900391877">"Snarveier"</string>
<string name="group_widgets" msgid="6704978494073105844">"Skrivebordselementer"</string>
<string name="group_wallpapers" msgid="1568191644272224858">"Bakgrunner"</string>
@@ -56,7 +56,7 @@
<string name="info_target_label" msgid="4019495079517426980">"App-info"</string>
<string name="accessibility_search_button" msgid="816822994629942611">"Søk"</string>
<string name="accessibility_voice_search_button" msgid="3938249215065842475">"Talesøk"</string>
- <string name="accessibility_all_apps_button" msgid="1595097919145716305">"Apper"</string>
+ <string name="accessibility_all_apps_button" msgid="1595097919145716305">"Applikasjoner"</string>
<string name="accessibility_delete_button" msgid="3628162007991023603">"Fjern"</string>
<string name="delete_zone_label_all_apps_system_app" msgid="3683920959591819044">"Avinstaller oppdateringen"</string>
<string name="menu_add" msgid="3065046628354640854">"Legg til"</string>
@@ -86,7 +86,7 @@
<string name="folder_hint_text" msgid="8633351560105748141">"Mappe uten navn"</string>
<string name="workspace_cling_title" msgid="738396473989890567">"Føl deg hjemme"</string>
<string name="workspace_cling_move_item" msgid="791013895761065070">"Her kan du plassere favorittappene dine."</string>
- <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Trykk på sirkelen for å se alle appene dine."</string>
+ <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Berør sirkelen for å se alle appene dine."</string>
<string name="all_apps_cling_title" msgid="2559734712581447107">"Velg noen apper"</string>
<string name="all_apps_cling_add_item" msgid="7404588523183860170">"Berør og hold nede en app for å legge den til på startsiden."</string>
<string name="folder_cling_title" msgid="4308949882377840953">"Bruk mapper for å holde orden på appene dine"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 899fb1eea..56b27075e 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -64,7 +64,7 @@
<string name="menu_wallpaper" msgid="5837429080911269832">"Обои"</string>
<string name="menu_search" msgid="4826514464423239041">"Поиск"</string>
<string name="menu_notifications" msgid="6424587053194766192">"Уведомления"</string>
- <string name="menu_settings" msgid="3946232973327980394">"Настройки"</string>
+ <string name="menu_settings" msgid="3946232973327980394">"Настройки системы"</string>
<string name="menu_help" msgid="4901160661634590633">"Справка"</string>
<string name="cab_menu_delete_app" msgid="1242619904941293871">"Удалить приложение"</string>
<string name="cab_menu_app_info" msgid="5180426909324882018">"Сведения о приложении"</string>
@@ -83,13 +83,13 @@
<string name="gadget_error_text" msgid="8359351016167075858">"Не удалось загрузить виджет"</string>
<string name="uninstall_system_app_text" msgid="7488523163288397451">"Это системное приложение. Удалить его невозможно."</string>
<string name="dream_name" msgid="2847171357608437154">"Фейерверк"</string>
- <string name="folder_hint_text" msgid="8633351560105748141">"Без названия"</string>
+ <string name="folder_hint_text" msgid="8633351560105748141">"Папка без названия"</string>
<string name="workspace_cling_title" msgid="738396473989890567">"Чувствуйте себя как дома"</string>
<string name="workspace_cling_move_item" msgid="791013895761065070">"Добавляйте сюда любимые приложения."</string>
<string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Чтобы открыть список приложений, нажмите на круг."</string>
<string name="all_apps_cling_title" msgid="2559734712581447107">"Выберите приложения"</string>
<string name="all_apps_cling_add_item" msgid="7404588523183860170">"Чтобы добавить приложение на главный экран, нажмите на значок и удерживайте его."</string>
- <string name="folder_cling_title" msgid="4308949882377840953">"Разложите все по папкам"</string>
+ <string name="folder_cling_title" msgid="4308949882377840953">"Разложите приложения по папкам"</string>
<string name="folder_cling_move_item" msgid="270598675060435169">"Чтобы переместить значок приложения, нажмите на него и удерживайте."</string>
<string name="folder_cling_create_folder" msgid="289412698047625601">"Чтобы создать папку на главном экране, перенесите значок одного приложения на значок другого."</string>
<string name="cling_dismiss" msgid="2780907108735868381">"ОК"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6f6a15811..3f77ce1df 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -27,19 +27,19 @@
<!-- Default folder name -->
<string name="folder_name"></string>
<!-- Title of dialog that appears after user selects Wallpaper from menu -->
- <string name="chooser_wallpaper">Select wallpaper from</string>
+ <string name="chooser_wallpaper">Choose wallpaper from</string>
<!-- Button label on Wallpaper Gallery screen; user selects this button to set a specific wallpaper -->
<string name="wallpaper_instructions">Set wallpaper</string>
<!-- Option in "Select wallpaper from" dialog box -->
<string name="pick_wallpaper">Wallpapers</string>
<!-- Displayed when user selects a shortcut for an app that was uninstalled [CHAR_LIMIT=none]-->
- <string name="activity_not_found">Application is not installed.</string>
+ <string name="activity_not_found">App isn\'t installed.</string>
<!-- Labels for the tabs in the customize drawer -->
<string name="widgets_tab_label">Widgets</string>
<!-- AppsCustomize pane -->
<!-- Message to tell the user to press and hold on a widget to add it [CHAR_LIMIT=50] -->
- <string name="long_press_widget_to_add">Touch &amp; hold to pick up a widget</string>
+ <string name="long_press_widget_to_add">Touch &amp; hold to pick up a widget.</string>
<!-- Market button text. The market button text is removed in Launcher.java
in the Phone UI. [CHAR LIMIT=32] -->
<string name="market">Shop</string>
@@ -51,11 +51,11 @@
<!-- External-drop widget error string. This is the error that is shown
when you drag and item into the homescreen and it is unable to fit,
or an error is encountered. [CHAR_LIMIT=50] -->
- <string name="external_drop_widget_error">Could not drop item onto this homescreen</string>
+ <string name="external_drop_widget_error">Couldn\'t drop item onto this Home screen.</string>
<!-- External-drop widget pick title. This is shown as the title of the
dialog which allows you to pick which widgets to handle a particular
drop if there are multiple choices. [CHAR_LIMIT=35] -->
- <string name="external_drop_widget_pick_title">Select widget to create</string>
+ <string name="external_drop_widget_pick_title">Choose widget to create</string>
<!-- Folders -->
<skip />
@@ -73,7 +73,7 @@
<!-- Title of dialog box -->
<string name="menu_item_add_item">Add to Home screen</string>
<!-- Options in "Add to Home" dialog box; Title of the group containing the list of all apps -->
- <string name="group_applications">Applications</string>
+ <string name="group_applications">Apps</string>
<!-- Options in "Add to Home" dialog box; Title of the group containing the list of all shortcut
s -->
<string name="group_shortcuts">Shortcuts</string>
@@ -95,7 +95,7 @@ s -->
<!-- Title of dialog when user is selecting shortcut to add to homescreen -->
<string name="title_select_shortcut">Select shortcut</string>
<!-- Title of dialog when user is selecting an application to add to homescreen -->
- <string name="title_select_application">Select application</string>
+ <string name="title_select_application">Choose app</string>
<!-- All applications label -->
<string name="all_apps_button_label">Apps</string>
@@ -121,7 +121,7 @@ s -->
<!-- Accessibility: Voice Search button -->
<string name="accessibility_voice_search_button">Voice Search</string>
<!-- Accessibility: AllApps button -->
- <string name="accessibility_all_apps_button">Applications</string>
+ <string name="accessibility_all_apps_button">Apps</string>
<!-- Accessibility: Delete button -->
<string name="accessibility_delete_button">Remove</string>
@@ -153,12 +153,12 @@ s -->
<skip />
<!-- Describes the button for uninstalling the currently selected application.
Text is not displayed, but provided for accessibility. [CHAR_LIMIT=none] -->
- <string name="cab_menu_delete_app">Uninstall application</string>
+ <string name="cab_menu_delete_app">Uninstall app</string>
<!-- Describes the button for getting details/info about currently selected application.
Text is not displayed, but provided for accessibility. [CHAR_LIMIT=none] -->
- <string name="cab_menu_app_info">Application details</string>
+ <string name="cab_menu_app_info">App details</string>
<!-- Appears in the CAB when an app is selected in All Apps or Customize mode. [CHAR_LIMIT=50] -->
- <string name="cab_app_selection_text">1 application selected</string>
+ <string name="cab_app_selection_text">1 app selected</string>
<!-- Appears in the CAB when a widget is selected in Customize mode. [CHAR_LIMIT=50] -->
<string name="cab_widget_selection_text">1 widget selected</string>
<!-- Appears in the CAB when a folder is selected in Customize mode. [CHAR_LIMIT=50] -->
@@ -171,22 +171,22 @@ s -->
<!-- Permission short label -->
<string name="permlab_install_shortcut">install shortcuts</string>
<!-- Permission description -->
- <string name="permdesc_install_shortcut">Allows an application to add
+ <string name="permdesc_install_shortcut">Allows an app to add
shortcuts without user intervention.</string>
<!-- Permission short label -->
<string name="permlab_uninstall_shortcut">uninstall shortcuts</string>
<!-- Permission description -->
- <string name="permdesc_uninstall_shortcut">Allows an application to remove
+ <string name="permdesc_uninstall_shortcut">Allows an app to remove
shortcuts without user intervention.</string>
<!-- Permission short label -->
<string name="permlab_read_settings">read Home settings and shortcuts</string>
<!-- Permission description -->
- <string name="permdesc_read_settings">Allows an application to read the settings and
+ <string name="permdesc_read_settings">Allows an app to read the settings and
shortcuts in Home.</string>
<!-- Permission short label -->
<string name="permlab_write_settings">write Home settings and shortcuts</string>
<!-- Permission description -->
- <string name="permdesc_write_settings">Allows an application to change the settings and
+ <string name="permdesc_write_settings">Allows an app to change the settings and
shortcuts in Home.</string>
<!-- Widgets: -->
@@ -196,7 +196,7 @@ s -->
<string name="gadget_error_text">Problem loading widget</string>
<!-- Text to inform the user that they can't uninstall a system application -->
- <string name="uninstall_system_app_text">This is a system application and cannot be uninstalled.</string>
+ <string name="uninstall_system_app_text">This is a system app and can\'t be uninstalled.</string>
<!-- Title of the Android Dreams (screensaver) module -->
<string name="dream_name">Rocket Launcher</string>
@@ -226,13 +226,13 @@ s -->
<!-- The title text for the All Apps cling [CHAR_LIMIT=none] -->
<string name="all_apps_cling_title">Choose some apps</string>
<!-- The description of how to pick up and add an item to the workspace [CHAR_LIMIT=none] -->
- <string name="all_apps_cling_add_item">To add an app to your home screen, touch &amp; hold it.</string>
+ <string name="all_apps_cling_add_item">To add an app to your Home screen, touch &amp; hold it.</string>
<!-- The title text for the Folder cling [CHAR_LIMIT=none] -->
<string name="folder_cling_title">Organize your apps with folders</string>
<!-- The description of how to move an app [CHAR_LIMIT=none] -->
<string name="folder_cling_move_item">To move an app, touch &amp; hold it.</string>
<!-- The description of how to create a folder [CHAR_LIMIT=none] -->
- <string name="folder_cling_create_folder">To make a new folder on your home screen, stack one app on top of another.</string>
+ <string name="folder_cling_create_folder">To make a new folder on your Home screen, stack one app on top of another.</string>
<!-- The text on the button to dismiss a cling [CHAR_LIMIT=none] -->
<string name="cling_dismiss">OK</string>
<add-resource type="string" name="default_folder_name" />
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 02f19ac09..6d2ec3a05 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1322,11 +1322,12 @@ public final class Launcher extends Activity
appSearchData = new Bundle();
appSearchData.putString(Search.SOURCE, "launcher-search");
}
+ Rect sourceBounds = mSearchDropTargetBar.getSearchBarBounds();
final SearchManager searchManager =
(SearchManager) getSystemService(Context.SEARCH_SERVICE);
searchManager.startSearch(initialQuery, selectInitialQuery, getComponentName(),
- appSearchData, globalSearch);
+ appSearchData, globalSearch, sourceBounds);
}
@Override
diff --git a/src/com/android/launcher2/SearchDropTargetBar.java b/src/com/android/launcher2/SearchDropTargetBar.java
index b4a9fc9c0..e90406e48 100644
--- a/src/com/android/launcher2/SearchDropTargetBar.java
+++ b/src/com/android/launcher2/SearchDropTargetBar.java
@@ -21,6 +21,7 @@ import android.animation.AnimatorListenerAdapter;
import android.animation.AnimatorSet;
import android.animation.ObjectAnimator;
import android.content.Context;
+import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.util.AttributeSet;
import android.view.View;
@@ -229,4 +230,22 @@ public class SearchDropTargetBar extends FrameLayout implements DragController.D
}
}
}
+
+ public Rect getSearchBarBounds() {
+ if (mQSBSearchBar != null) {
+ final float appScale = mQSBSearchBar.getContext().getResources()
+ .getCompatibilityInfo().applicationScale;
+ final int[] pos = new int[2];
+ mQSBSearchBar.getLocationOnScreen(pos);
+
+ final Rect rect = new Rect();
+ rect.left = (int) (pos[0] * appScale + 0.5f);
+ rect.top = (int) (pos[1] * appScale + 0.5f);
+ rect.right = (int) ((pos[0] + mQSBSearchBar.getWidth()) * appScale + 0.5f);
+ rect.bottom = (int) ((pos[1] + mQSBSearchBar.getHeight()) * appScale + 0.5f);
+ return rect;
+ } else {
+ return null;
+ }
+ }
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 22:17:47 +0000