From 1feaa85791b3b5cc66a16142afc2259a2356bc9e Mon Sep 17 00:00:00 2001 From: The Android Open Source Project Date: Tue, 10 Feb 2009 15:44:05 -0800 Subject: [PATCH 01/12] auto import from //branches/cupcake/...@130745 --- AndroidManifest.xml | 93 +- res/layout/app_launcher.xml | 31 - res/layout/battery_history.xml | 142 ++- res/layout/bluetooth_data_entry.xml | 59 -- res/layout/bluetooth_device_list_item.xml | 41 - .../bluetooth_discoverability_panel.xml | 53 -- res/layout/bluetooth_discovery_screen.xml | 47 - res/layout/bluetooth_pairing_panel.xml | 39 - res/layout/bluetooth_pin_entry.xml | 2 + res/layout/bluetooth_sdp_query.xml | 29 - res/layout/choose_lock_pattern.xml | 45 +- res/layout/choose_lock_pattern_example.xml | 29 +- res/layout/choose_lock_pattern_tutorial.xml | 30 +- res/layout/date_picker_activity.xml | 31 - res/layout/date_time.xml | 67 -- res/layout/device_info_screen.xml | 58 -- res/layout/info_screen.xml | 36 - res/layout/info_screen_item.xml | 39 - res/layout/installed_app_details.xml | 58 +- res/layout/keyguard.xml | 67 -- res/layout/keyguard_password.xml | 102 -- res/layout/manage_applications_item.xml | 60 +- res/layout/media_format_final.xml | 38 + res/layout/media_format_primary.xml | 39 + res/layout/mylocation.xml | 47 - res/layout/power_management.xml | 51 - res/layout/preference_progress_category.xml | 18 +- .../preference_widget_btdevice_status.xml | 24 - res/layout/radio_info.xml | 12 + res/layout/ringer_volume_screen.xml | 96 -- res/layout/sdcard_settings_screen.xml | 6 + res/layout/settings_chooser.xml | 36 - res/layout/systemsettings.xml | 22 - res/layout/systemsettings_flat.xml | 22 - res/layout/telephony_editor.xml | 64 -- res/layout/time_picker_activity.xml | 27 - res/layout/usage_stats.xml | 45 + res/layout/usage_stats_item.xml | 50 + res/layout/wifi_screen.xml | 228 ----- res/values-cs/arrays.xml | 11 + res/values-cs/strings.xml | 208 +++-- res/values-de/arrays.xml | 11 + res/values-de/strings.xml | 224 +++-- res/values-en-rGB/strings.xml | 1 - res/values-es-rUS/strings.xml | 883 ------------------ res/values-es/arrays.xml | 11 + res/values-es/strings.xml | 208 +++-- res/values-fr/arrays.xml | 11 + res/values-fr/strings.xml | 212 +++-- res/values-it/arrays.xml | 11 + res/values-it/strings.xml | 208 +++-- res/values-ja/arrays.xml | 11 + res/values-ja/strings.xml | 208 +++-- res/values-ko/arrays.xml | 67 ++ res/values-ko/strings.xml | 735 +++++++++++++++ res/values-nb/arrays.xml | 67 ++ res/values-nb/strings.xml | 731 +++++++++++++++ res/values-nl-rNL/strings.xml | 883 ------------------ res/values-nl/arrays.xml | 11 + res/values-nl/strings.xml | 208 +++-- .../strings.xml} | 19 +- .../strings.xml} | 17 +- res/values-pl/arrays.xml | 11 + res/values-pl/strings.xml | 208 +++-- res/values-ru/arrays.xml | 11 + res/values-ru/strings.xml | 208 +++-- res/values-zh-rCN/arrays.xml | 11 + res/values-zh-rCN/strings.xml | 208 +++-- res/values-zh-rTW/arrays.xml | 11 + res/values-zh-rTW/strings.xml | 208 +++-- res/values/arrays.xml | 26 + res/values/colors.xml | 3 - res/values/strings.xml | 445 ++++----- res/values/styles.xml | 31 - res/xml/apn_editor.xml | 5 +- res/xml/apn_settings.xml | 6 +- res/xml/application_settings.xml | 8 +- res/xml/bluetooth_settings.xml | 6 +- res/xml/date_time_prefs.xml | 4 +- res/xml/development_prefs.xml | 6 +- res/xml/device_info_memory.xml | 6 +- res/xml/device_info_settings.xml | 6 +- res/xml/device_info_status.xml | 11 +- res/xml/input_methods_prefs.xml | 5 +- res/xml/language_settings.xml | 69 +- res/xml/quick_launch_settings.xml | 12 +- res/xml/settings.xml | 9 +- res/xml/sim_lock_settings.xml | 6 +- res/xml/sound_and_display_settings.xml | 16 +- res/xml/testing_settings.xml | 14 +- res/xml/wifi_advanced_settings.xml | 7 +- res/xml/wifi_settings.xml | 30 +- res/xml/wireless_settings.xml | 21 +- src/com/android/settings/ActivityPicker.java | 58 ++ src/com/android/settings/ApnSettings.java | 3 +- src/com/android/settings/BatteryHistory.java | 68 -- .../android/settings/DateTimeSettings.java | 5 + .../android/settings/DeviceInfoSettings.java | 22 +- .../android/settings/GadgetPickActivity.java | 112 +++ .../android/settings/InstalledAppDetails.java | 22 +- .../android/settings/LanguageSettings.java | 17 +- src/com/android/settings/LocalePicker.java | 20 +- .../android/settings/ManageApplications.java | 92 +- src/com/android/settings/MediaFormat.java | 193 ++++ src/com/android/settings/RadioInfo.java | 28 +- .../android/settings/SdCardErrorReceiver.java | 45 - src/com/android/settings/SdCardSettings.java | 14 + .../settings/SoundAndDisplaySettings.java | 76 +- src/com/android/settings/UsageStats.java | 249 +++++ .../settings/UserDictionarySettings.java | 15 +- .../battery_history/BatteryHistory.java | 645 +++++++++++++ .../battery_history/GraphableButton.java | 55 ++ .../BluetoothDiscoverableEnabler.java | 31 +- .../bluetooth/BluetoothEventRedirector.java | 19 +- .../bluetooth/BluetoothPinDialog.java | 95 +- .../ConnectSpecificProfilesActivity.java | 34 +- .../bluetooth/LocalBluetoothDevice.java | 68 +- .../LocalBluetoothDeviceManager.java | 41 +- .../bluetooth/LocalBluetoothManager.java | 4 - .../android/settings/deviceinfo/Memory.java | 20 +- .../android/settings/deviceinfo/Status.java | 28 +- .../quicklaunch/QuickLaunchSettings.java | 13 +- 122 files changed, 5734 insertions(+), 4925 deletions(-) delete mode 100644 res/layout/app_launcher.xml delete mode 100644 res/layout/bluetooth_data_entry.xml delete mode 100644 res/layout/bluetooth_device_list_item.xml delete mode 100644 res/layout/bluetooth_discoverability_panel.xml delete mode 100644 res/layout/bluetooth_discovery_screen.xml delete mode 100644 res/layout/bluetooth_pairing_panel.xml delete mode 100644 res/layout/bluetooth_sdp_query.xml delete mode 100644 res/layout/date_picker_activity.xml delete mode 100644 res/layout/date_time.xml delete mode 100644 res/layout/device_info_screen.xml delete mode 100644 res/layout/info_screen.xml delete mode 100644 res/layout/info_screen_item.xml delete mode 100644 res/layout/keyguard.xml delete mode 100644 res/layout/keyguard_password.xml create mode 100644 res/layout/media_format_final.xml create mode 100644 res/layout/media_format_primary.xml delete mode 100644 res/layout/mylocation.xml delete mode 100644 res/layout/power_management.xml delete mode 100644 res/layout/preference_widget_btdevice_status.xml delete mode 100644 res/layout/ringer_volume_screen.xml delete mode 100644 res/layout/settings_chooser.xml delete mode 100644 res/layout/systemsettings.xml delete mode 100644 res/layout/systemsettings_flat.xml delete mode 100644 res/layout/telephony_editor.xml delete mode 100644 res/layout/time_picker_activity.xml create mode 100755 res/layout/usage_stats.xml create mode 100755 res/layout/usage_stats_item.xml delete mode 100644 res/layout/wifi_screen.xml delete mode 100644 res/values-es-rUS/strings.xml create mode 100644 res/values-ko/arrays.xml create mode 100644 res/values-ko/strings.xml create mode 100644 res/values-nb/arrays.xml create mode 100644 res/values-nb/strings.xml delete mode 100644 res/values-nl-rNL/strings.xml rename res/{layout/list_setting_value_spinner.xml => values-no-nokeys/strings.xml} (60%) rename res/{layout/wallpaper_picker.xml => values-nokeys/strings.xml} (56%) create mode 100644 src/com/android/settings/ActivityPicker.java delete mode 100644 src/com/android/settings/BatteryHistory.java create mode 100644 src/com/android/settings/GadgetPickActivity.java create mode 100644 src/com/android/settings/MediaFormat.java delete mode 100644 src/com/android/settings/SdCardErrorReceiver.java create mode 100755 src/com/android/settings/UsageStats.java create mode 100644 src/com/android/settings/battery_history/BatteryHistory.java create mode 100644 src/com/android/settings/battery_history/GraphableButton.java diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 9e39c9f07c9..318e0b01ee8 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -30,13 +30,15 @@ + + + @@ -51,7 +53,7 @@ + > @@ -65,7 +67,7 @@ + > @@ -76,7 +78,7 @@ + > @@ -85,7 +87,7 @@ + > @@ -96,7 +98,7 @@ + > @@ -105,7 +107,7 @@ + > @@ -136,7 +138,7 @@ + > @@ -145,9 +147,10 @@ + > + @@ -156,12 +159,15 @@ android:label="@string/user_dict_settings_titlebar"> + + + + > @@ -172,7 +178,7 @@ + > @@ -190,7 +196,7 @@ + > @@ -218,8 +224,7 @@ - + @@ -230,8 +235,7 @@ + android:process="com.android.phone"> @@ -254,15 +258,14 @@ + > + android:label="@string/lockpattern_change_lock_pattern_label"> @@ -271,8 +274,7 @@ + android:process="com.android.phone"> @@ -280,8 +282,7 @@ - + @@ -312,8 +313,14 @@ - + + + + + + + @@ -329,8 +336,7 @@ + android:label="@string/development_settings_title"> @@ -340,19 +346,6 @@ - - - - - - - - - - - - - - + @@ -468,8 +461,7 @@ - > + @@ -483,6 +475,21 @@ + + + + + + + + + + + + + + + diff --git a/res/layout/app_launcher.xml b/res/layout/app_launcher.xml deleted file mode 100644 index 04d3fce7ab0..00000000000 --- a/res/layout/app_launcher.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - diff --git a/res/layout/battery_history.xml b/res/layout/battery_history.xml index c8c2097a2f0..5421c408a9b 100644 --- a/res/layout/battery_history.xml +++ b/res/layout/battery_history.xml @@ -1,14 +1,144 @@ - - + + + + - + android:layout_height="wrap_content" + android:entries="@array/battery_history_type_spinner" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/layout/bluetooth_data_entry.xml b/res/layout/bluetooth_data_entry.xml deleted file mode 100644 index 1900b6e390b..00000000000 --- a/res/layout/bluetooth_data_entry.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - -