diff --git a/core/jni/android_server_BluetoothEventLoop.cpp b/core/jni/android_server_BluetoothEventLoop.cpp index 62a50e5cad629..d2e94546cbafe 100644 --- a/core/jni/android_server_BluetoothEventLoop.cpp +++ b/core/jni/android_server_BluetoothEventLoop.cpp @@ -735,7 +735,6 @@ static DBusHandlerResult event_filter(DBusConnection *conn, DBusMessage *msg, return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } - // STOPSHIP: Change to LOGV LOGE("%s: Received signal %s:%s from %s", __FUNCTION__, dbus_message_get_interface(msg), dbus_message_get_member(msg), dbus_message_get_path(msg)); diff --git a/docs/html/guide/tutorials/localization/index.jd b/docs/html/guide/tutorials/localization/index.jd index 19f9eb3d22895..d31eb10962d39 100755 --- a/docs/html/guide/tutorials/localization/index.jd +++ b/docs/html/guide/tutorials/localization/index.jd @@ -76,7 +76,7 @@ subdirectories for the three most common types of resources: graphics (res/values/). Most of the localization work you do later in this tutorial will involve adding more subdirectories to the res/ directory.

- plain project
  • Open the res/layout/main.xml file and replace it with the @@ -192,7 +192,7 @@ within res/values/strings.xml.

    • The project structure now looks like this:

    - nonlocalized

    Tip: If you will want to run the application on @@ -215,9 +215,9 @@ should look something like this:

    After clicking the flag, in any locale: - nonlocalized - nonlocalized2nonlocalized2 @@ -400,29 +400,34 @@ is not Germany.

    Localize the Strings

    -

    The application requires three more strings.xml files, one each -for German, French, and Japanese. In this example, we will start by copying -res/values/strings.xml into new -res/values-<qualifier>/strings.xml files.

    - -

    Under the res/ directory, create the three new directories and -copy res/values/strings.xml into each of them. For example, using -Eclipse you could do it like this:

    +

    The application requires three more strings.xml files, one +each for German, French, and Japanese. To create these resource files within +Eclipse:

      -
    1. Right-click the res/values/ folder and select Copy.
      2. -
    2. Right-click on the res/ folder and select Paste. Rename the -folder values-de and click OK.
      - res_file_copy
      3. -
    3. Repeat steps 1 and 2 two more times, for values-fr, and -values-ja. Now the project includes these new files, all still -containing British English text strings:
      +
    4. Select File > New > Android +XML File to open the New Android XML File wizard. You can also open +the wizard by clicking its icon in the toolbar:
      +
      5. +
    5. Select L10N for the Project field, and type strings.xml into +the File field. In the left-hand list, select Language, then click the right arrow.
      +res_file_copy
      6. +
    6. Type de in the Language box and click Finish.
      + res_file_copy +

      A new file, res/values-de/strings.xml, now appears among the project +files.

      7. +
    7. Repeat the steps twice more, for the language codes fr and + ja. +Now the project includes these new skeleton files:
      res/values-de/strings.xml
      res/values-fr/strings.xml
      res/values-ja/strings.xml
      8. -
    8. Replace the strings in the three new files with localized text. To do +
    9. Add localized text to the new files. To do this, open the res/values-<qualifier>/strings.xml files and replace the code as follows:
    @@ -526,12 +531,12 @@ available in the Android system image.

    use the Custom Locale application, which is available in the Application tab:

    -

    custom locale appcustom locale app

    To switch to a new locale, long-press a locale name:

    -

    using custom localeusing custom locale

    For a list of supported locales, see the @@ -549,14 +554,14 @@ locale. Here are some of the results you should see:

    German / Germany
    Specifically supported by the Hello, L10N application. - custom locale appcustom locale app French / Canada
    Specifically supported by the Hello, L10N application. - custom locale appcustom locale app @@ -564,7 +569,7 @@ style="margin-left:10px;margin-right:20px"> German / Switzerland
    Only the language is specifically supported by the Hello, L10N application. - custom locale appcustom locale app` @@ -572,7 +577,7 @@ style="margin-left:10px;margin-right:20px">` Japanese
    Specifically supported by the Hello, L10N application. - custom locale appcustom locale app` @@ -580,7 +585,7 @@ style="margin-left:10px;margin-right:20px">` Romansh / Switzerland (custom locale rm_CH)
    Not specifically supported by the Hello, L10N application, so the application uses the default resources. - custom locale appcustom locale app diff --git a/docs/html/images/hello_l10n/xml_file_wizard_shortcut.png b/docs/html/images/hello_l10n/xml_file_wizard_shortcut.png new file mode 100755 index 0000000000000..f72554da657f9 Binary files /dev/null and b/docs/html/images/hello_l10n/xml_file_wizard_shortcut.png differ diff --git a/docs/html/images/hello_l10n/xml_wizard1.png b/docs/html/images/hello_l10n/xml_wizard1.png new file mode 100755 index 0000000000000..35dc09fbb961d Binary files /dev/null and b/docs/html/images/hello_l10n/xml_wizard1.png differ diff --git a/docs/html/images/hello_l10n/xml_wizard2.png b/docs/html/images/hello_l10n/xml_wizard2.png new file mode 100755 index 0000000000000..6bcd28b4e1545 Binary files /dev/null and b/docs/html/images/hello_l10n/xml_wizard2.png differ