OSDN Git Service
Chung-yih Wang [Thu, 11 Jun 2009 14:57:48 +0000 (07:57 -0700)]
am
e7e587da: Revert "Use the keystore service instead of the direct file acess."
Merge commit '
e7e587daf65ec39ca2b10e5c6a03f6bb0b4ccce0'
* commit '
e7e587daf65ec39ca2b10e5c6a03f6bb0b4ccce0':
Revert "Use the keystore service instead of the direct file acess."
Chung-yih Wang [Thu, 11 Jun 2009 14:57:39 +0000 (07:57 -0700)]
am
e97bfa3c: Fix the bug of missing EAP setting in wpa_supplicant.conf when a new EAP is configured.
Merge commit '
e97bfa3c2581bc59eceaaf043b7059dc29307884'
* commit '
e97bfa3c2581bc59eceaaf043b7059dc29307884':
Fix the bug of missing EAP setting in wpa_supplicant.conf when a new EAP is configured.
Chung-yih Wang [Thu, 11 Jun 2009 14:57:34 +0000 (07:57 -0700)]
am
289705f3: Use the keystore service instead of the direct file acess.
Merge commit '
289705f3311932a45adef1710358f5e302115013'
* commit '
289705f3311932a45adef1710358f5e302115013':
Use the keystore service instead of the direct file acess.
Chung-yih Wang [Thu, 11 Jun 2009 10:13:49 +0000 (18:13 +0800)]
Revert "Use the keystore service instead of the direct file acess."
This reverts commit
289705f3311932a45adef1710358f5e302115013.
Chung-yih Wang [Thu, 11 Jun 2009 09:56:04 +0000 (17:56 +0800)]
Fix the bug of missing EAP setting in wpa_supplicant.conf when a new EAP is configured.
Chung-yih Wang [Wed, 10 Jun 2009 10:49:59 +0000 (18:49 +0800)]
Use the keystore service instead of the direct file acess.
-- removed the temporal Keystore.java.
-- added the empty passphrase for private key.
Amith Yamasani [Thu, 11 Jun 2009 07:56:31 +0000 (00:56 -0700)]
am
5b578b4e: SD card notification settings summary change for #
1692416
Merge commit '
5b578b4e3f7e45c0d2d5f17516cd9966a6e6359b'
* commit '
5b578b4e3f7e45c0d2d5f17516cd9966a6e6359b':
SD card notification settings summary change for #
1692416
The Android Open Source Project [Thu, 11 Jun 2009 07:53:31 +0000 (00:53 -0700)]
Amith Yamasani [Thu, 11 Jun 2009 07:45:31 +0000 (00:45 -0700)]
am
78fd96a1: More details in the summary and details screens.
Merge commit '
78fd96a1c5dd7b03fa09d8b3116243cc9661c5e6'
* commit '
78fd96a1c5dd7b03fa09d8b3116243cc9661c5e6':
More details in the summary and details screens.
Jean-Michel Trivi [Thu, 11 Jun 2009 07:44:55 +0000 (00:44 -0700)]
am
80368622: Adding support for selecting the default language for Text-To-Speech in Settings.
Merge commit '
8036862226b6cdb6903c2591e66b4b9328b1d484'
* commit '
8036862226b6cdb6903c2591e66b4b9328b1d484':
Adding support for selecting the default language for Text-To-Speech in Settings.
Amith Yamasani [Thu, 11 Jun 2009 04:26:08 +0000 (21:26 -0700)]
SD card notification settings summary change for #
1692416
Android (Google) Code Review [Thu, 11 Jun 2009 03:34:09 +0000 (20:34 -0700)]
Merge change 3494 into donut
* changes:
Use Phone.[get|set]SmscAddress() instead of OEMHookRaw.
Amith Yamasani [Tue, 9 Jun 2009 13:34:49 +0000 (06:34 -0700)]
More details in the summary and details screens.
Show packages included, time that a subsystem was on for.
Load label and icon in the background and cache the values.
Switch between totals and since-unplugged.
Other UI improvements.
Jean-Michel Trivi [Wed, 10 Jun 2009 02:29:27 +0000 (19:29 -0700)]
Adding support for selecting the default language for Text-To-Speech in Settings.
Android (Google) Code Review [Wed, 10 Jun 2009 23:31:38 +0000 (16:31 -0700)]
am
a8d20626: Merge change 3793 into donut
Merge commit '
a8d206265ba8bd9be41cf2dd222965688fdefb64'
* commit '
a8d206265ba8bd9be41cf2dd222965688fdefb64':
Update Portuguese translations.
Android (Google) Code Review [Wed, 10 Jun 2009 22:33:46 +0000 (15:33 -0700)]
am
b8c5a592: Merge change 3689 into donut
Merge commit '
b8c5a592e738d6a7d45dec4dcc7fd74ff8577df9'
* commit '
b8c5a592e738d6a7d45dec4dcc7fd74ff8577df9':
CompatibilityMode settings
Eric Fischer [Wed, 10 Jun 2009 22:32:42 +0000 (15:32 -0700)]
am
8477860c: am
9e852f03: AI 149721: Import Portuguese translations.
Merge commit '
8477860c7c6b82c863e244f4c70b0ec945c4e70d'
* commit '
8477860c7c6b82c863e244f4c70b0ec945c4e70d':
AI 149721: Import Portuguese translations.
Android (Google) Code Review [Wed, 10 Jun 2009 22:31:18 +0000 (15:31 -0700)]
Merge change 3793 into donut
* changes:
Update Portuguese translations.
Android (Google) Code Review [Wed, 10 Jun 2009 22:25:21 +0000 (15:25 -0700)]
Merge change 3689 into donut
* changes:
CompatibilityMode settings
Eric Fischer [Wed, 10 Jun 2009 22:12:18 +0000 (15:12 -0700)]
Update Portuguese translations.
Jean-Michel Trivi [Sat, 6 Jun 2009 01:37:29 +0000 (18:37 -0700)]
CompatibilityMode settings
Eric Fischer [Wed, 10 Jun 2009 19:31:43 +0000 (12:31 -0700)]
am
9e852f03: AI 149721: Import Portuguese translations.
Merge commit '
9e852f03139b28c1f5ad2bc43c64bdf0adae9226' into donut
* commit '
9e852f03139b28c1f5ad2bc43c64bdf0adae9226':
AI 149721: Import Portuguese translations.
Eric Fischer [Wed, 10 Jun 2009 19:26:09 +0000 (12:26 -0700)]
AI 149721: Import Portuguese translations.
Automated import of CL 149721
Android (Google) Code Review [Wed, 10 Jun 2009 04:54:22 +0000 (21:54 -0700)]
Merge change 1182
* changes:
Settings app changes for Bluez4.
Jean-Michel Trivi [Tue, 9 Jun 2009 21:09:17 +0000 (14:09 -0700)]
am
ed29a658: Adding Text-To-Speech default settings in the Settings application.
Merge commit '
ed29a6583578a094350596246cb43c2876fd93b4'
* commit '
ed29a6583578a094350596246cb43c2876fd93b4':
Adding Text-To-Speech default settings in the Settings application.
Jean-Michel Trivi [Sat, 6 Jun 2009 01:37:29 +0000 (18:37 -0700)]
Adding Text-To-Speech default settings in the Settings application.
Chung-yih Wang [Tue, 9 Jun 2009 02:17:02 +0000 (19:17 -0700)]
am
0c1f8985: Add EAP/802.1X configuration for WiFi Setting.
Merge commit '
0c1f89857a730f9f75312fce39ff65c2f01e7d22'
* commit '
0c1f89857a730f9f75312fce39ff65c2f01e7d22':
Add EAP/802.1X configuration for WiFi Setting.
Chung-yih Wang [Wed, 3 Jun 2009 11:44:35 +0000 (19:44 +0800)]
Add EAP/802.1X configuration for WiFi Setting.
1. Remove the isEnterprise() filter in Scanresult.
2. This requires the new fields such as identity, eap, certificate/key
to support EAP authentication in Wifi Settings.
3. Add simple file-based keystore to select the cert/key from UI.
-- Updated from the comments.
-- Fix the bug for passing null pointer for adding spinner items.
Jaikumar Ganesh [Wed, 6 May 2009 05:26:56 +0000 (22:26 -0700)]
Settings app changes for Bluez4.
Ken Shirriff [Mon, 8 Jun 2009 22:36:39 +0000 (15:36 -0700)]
am
03a6110b: Implement the power-control widget.
Merge commit '
03a6110b4f62e72592b451c05848cfaad8c65324'
* commit '
03a6110b4f62e72592b451c05848cfaad8c65324':
Implement the power-control widget.
jsh [Tue, 12 May 2009 18:26:55 +0000 (11:26 -0700)]
Use Phone.[get|set]SmscAddress() instead of OEMHookRaw.
Ken Shirriff [Mon, 8 Jun 2009 20:49:05 +0000 (13:49 -0700)]
Implement the power-control widget.
This widget allows uses to turn on/off bluetooth, wifi, gps, and sync,
and adjust brightness without going through the settings menu.
The widget provider updates the settings when the buttons are pressed.
The widget provider is also a receiver for events indicating that the
status was updated elsewhere and the buttons need to be changed.
Mike Lockwood [Mon, 8 Jun 2009 14:53:56 +0000 (07:53 -0700)]
am
5ed2c4ad: Listen for changes to location pProvider enabled settings.
Merge commit '
5ed2c4ad43f2c3c85a025da04becd2eaa75927a1'
* commit '
5ed2c4ad43f2c3c85a025da04becd2eaa75927a1':
Listen for changes to location pProvider enabled settings.
Mike Lockwood [Mon, 8 Jun 2009 14:53:52 +0000 (07:53 -0700)]
am
d1330867: Remove Network Location" opt-in dialog from "Security and Settings"
Merge commit '
d13308674b4ff614b6ade32efde0d7cff6d8dc2a'
* commit '
d13308674b4ff614b6ade32efde0d7cff6d8dc2a':
Remove Network Location" opt-in dialog from "Security and Settings"
Mike Lockwood [Mon, 8 Jun 2009 03:07:20 +0000 (23:07 -0400)]
Listen for changes to location pProvider enabled settings.
This is needed so we can correctly update the network location checkbox
if the network location provider is disabled because the user disagreed
to the terms of service in a dialog shown by the provider.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mike Lockwood [Mon, 8 Jun 2009 00:11:39 +0000 (20:11 -0400)]
Remove Network Location" opt-in dialog from "Security and Settings"
This dialog is being moved to the Network Location Provider itself.
Signed-off-by: Mike Lockwood <lockwood@android.com>
The Android Open Source Project [Fri, 5 Jun 2009 01:27:56 +0000 (18:27 -0700)]
am
08a7f2a0: empty merge (change already in master)
Merge commit '
08a7f2a09e857e3beb3b17943b947137f88d7383'
Jean-Michel Trivi [Wed, 3 Jun 2009 22:17:22 +0000 (15:17 -0700)]
Removing empty b tag in string (that leaves a big multi-line warning in each build).
Android (Google) Code Review [Thu, 4 Jun 2009 16:20:09 +0000 (09:20 -0700)]
Merge change 3082 into donut
* changes:
Removing empty b tag in string (that leaves a big multi-line warning in each build).
Amith Yamasani [Wed, 3 Jun 2009 23:57:28 +0000 (16:57 -0700)]
am
7f6aa628: Add detail page for Battery usage and track GPS and foreground CPU.
Merge commit '
7f6aa6283ae759c5b013c142be036617cf79f725'
* commit '
7f6aa6283ae759c5b013c142be036617cf79f725':
Add detail page for Battery usage and track GPS and foreground CPU.
Amith Yamasani [Wed, 3 Jun 2009 22:45:40 +0000 (15:45 -0700)]
Add detail page for Battery usage and track GPS and foreground CPU.
Show details such as Cpu time, Cpu foreground time, data sent/received,
and GPS usage.
Jean-Michel Trivi [Wed, 3 Jun 2009 22:17:22 +0000 (15:17 -0700)]
Removing empty b tag in string (that leaves a big multi-line warning in each build).
Mike LeBeau [Wed, 3 Jun 2009 15:39:35 +0000 (08:39 -0700)]
am
110b75cd: Fix string to reference \'system search\' instead of \'global search\'.
Merge commit '
110b75cde7ca21e83fb84cab70b7d11bdff54f2c'
* commit '
110b75cde7ca21e83fb84cab70b7d11bdff54f2c':
Fix string to reference 'system search' instead of 'global search'.
Mike LeBeau [Wed, 3 Jun 2009 14:50:49 +0000 (15:50 +0100)]
Fix string to reference 'system search' instead of 'global search'.
Wink Saville [Mon, 1 Jun 2009 21:27:01 +0000 (14:27 -0700)]
Wink Saville [Fri, 29 May 2009 21:06:30 +0000 (14:06 -0700)]
Update some TODO comments.
Amith Yamasani [Sun, 24 May 2009 06:01:31 +0000 (23:01 -0700)]
am
2a2daf96: Top level screen for App Fuel Gauge.
Merge commit '
2a2daf960c43a2c97b1c6da430138e08e9caa54f'
* commit '
2a2daf960c43a2c97b1c6da430138e08e9caa54f':
Top level screen for App Fuel Gauge.
Amith Yamasani [Fri, 22 May 2009 22:18:46 +0000 (15:18 -0700)]
Top level screen for App Fuel Gauge.
Shows sorted list of power usage (with some debug information) by the top 10
apps and subsystems. Doesn't yet take into account certain subsystems such
as data network usage, audio/video DSP usage, Bluetooth and lights other than
screen backlight.
Screen, Idle, Wifi and Voice usage and CPU time are accounted for.
Also need to add detail screens for each item and suggested actions.
Robert Greenwalt [Thu, 21 May 2009 20:47:40 +0000 (13:47 -0700)]
Update hidden API with a persist option.
WifiManager.setNumAllowedChannels now needs a boolean persist arg.
Part of the fix for
1625953.
Android (Google) Code Review [Tue, 19 May 2009 06:56:38 +0000 (23:56 -0700)]
Jeff Sharkey [Tue, 19 May 2009 06:56:37 +0000 (23:56 -0700)]
am
67ceae63: Require BIND_APPWIDGET to bind widgets.
Merge commit '
67ceae636fd3fc9faa6fee0ff691b24ca78e5459'
* commit '
67ceae636fd3fc9faa6fee0ff691b24ca78e5459':
Require BIND_APPWIDGET to bind widgets.
Android (Google) Code Review [Tue, 19 May 2009 05:27:30 +0000 (22:27 -0700)]
Merge change 1582 into donut
* changes:
Teleca 2b changes.
Jeff Sharkey [Thu, 7 May 2009 23:13:13 +0000 (16:13 -0700)]
Require BIND_APPWIDGET to bind widgets.
See http://b/issue?id=
1839074 for more details.
Wink Saville [Wed, 13 May 2009 18:51:03 +0000 (11:51 -0700)]
Teleca 2b changes.
Android (Google) Code Review [Fri, 15 May 2009 18:15:11 +0000 (11:15 -0700)]
Merge change 1725
* changes:
Findbug fixes in Settings app
svetoslavganov [Fri, 15 May 2009 06:30:47 +0000 (23:30 -0700)]
am
a05d0dc6: Accessibility feature - settings (replacing 704 and merging with the latest Donut)
Merge commit '
a05d0dc67eb6aae169308dda25fe235226fa395b'
* commit '
a05d0dc67eb6aae169308dda25fe235226fa395b':
Accessibility feature - settings (replacing 704 and merging with the latest Donut)
svetoslavganov [Fri, 15 May 2009 05:26:34 +0000 (22:26 -0700)]
Accessibility feature - settings (replacing 704 and merging with the latest Donut)
Michael Chan [Fri, 15 May 2009 00:47:02 +0000 (17:47 -0700)]
Findbug fixes in Settings app
modified: src/com/android/settings/ApnPreference.java
modified: src/com/android/settings/ApnSettings.java
modified: src/com/android/settings/BandMode.java
modified: src/com/android/settings/BatteryInfo.java
modified: src/com/android/settings/LanguageSettings.java
modified: src/com/android/settings/ManageApplications.java
modified: src/com/android/settings/RadioInfo.java
modified: src/com/android/settings/SdCardSettings.java
modified: src/com/android/settings/UsageStats.java
modified: src/com/android/settings/ZoneList.java
modified: src/com/android/settings/bluetooth/LocalBluetoothDevice.java
modified: src/com/android/settings/deviceinfo/Status.java
modified: src/com/android/settings/quicklaunch/QuickLaunchSettings.java
modified: src/com/android/settings/wifi/AccessPointDialog.java
modified: src/com/android/settings/wifi/AccessPointPreference.java
modified: src/com/android/settings/wifi/WifiLayer.java
modified: src/com/android/settings/wifi/WifiSettings.java
Android (Google) Code Review [Tue, 12 May 2009 17:26:20 +0000 (10:26 -0700)]
am
f5255c2: Merge change 1418 into donut
Merge commit '
f5255c21f4d926849deb8ecfbcd74065bc0b534f'
* commit '
f5255c21f4d926849deb8ecfbcd74065bc0b534f':
Show locale names in alphabetical order, in their own language.
Android (Google) Code Review [Tue, 12 May 2009 17:22:27 +0000 (10:22 -0700)]
Merge change 1418 into donut
* changes:
Show locale names in alphabetical order, in their own language.
Suchi Amalapurapu [Tue, 12 May 2009 16:58:26 +0000 (09:58 -0700)]
am
50b5167: Add version number to Installed_App_Details
Merge commit '
50b516760af7755f178d32861e2aaafb0c2bfda1'
* commit '
50b516760af7755f178d32861e2aaafb0c2bfda1':
Add version number to Installed_App_Details
Eric Fischer [Tue, 12 May 2009 01:03:39 +0000 (18:03 -0700)]
Show locale names in alphabetical order, in their own language.
Bug
1776043: List the locales in alphabetical order.
Bug
1703550: List the locales in their own languages instead of
in the current language.
Suchi Amalapurapu [Fri, 8 May 2009 22:01:06 +0000 (15:01 -0700)]
Add version number to Installed_App_Details
Change uninstall string value to Factory reset for updated system apps
present a new confirmation dialog when factory resetting a system app.
refresh size, app properties and button's text(to clear, uninstall or factory reset) in onStart
Add new version attribute in layout. Add new layout attributes for app snippets instead of using the one
from ManageApps
Use managed dialogs to avoid leaks
Jim Miller [Fri, 8 May 2009 20:40:16 +0000 (13:40 -0700)]
am
e3744c8: Fix ANR caused by registering multiple listeners in DateTime
Merge commit '
e3744c8c8a4546b43d024ced6d25b2408da05f27'
* commit '
e3744c8c8a4546b43d024ced6d25b2408da05f27':
Fix ANR caused by registering multiple listeners in DateTimeSettings.onCreate().
Jim Miller [Fri, 8 May 2009 01:26:05 +0000 (18:26 -0700)]
Fix ANR caused by registering multiple listeners in DateTimeSettings.onCreate().
Michael Chan [Thu, 7 May 2009 01:25:41 +0000 (18:25 -0700)]
am
6c97742: Always add the bt profile to profile list on the arrive of a
Merge commit '
6c97742c88303c65e68fe08257a7ccf841f03866'
* commit '
6c97742c88303c65e68fe08257a7ccf841f03866':
Always add the bt profile to profile list on the arrive of a connect event
Michael Chan [Thu, 7 May 2009 01:08:58 +0000 (18:08 -0700)]
Always add the bt profile to profile list on the arrive of a connect event
Always add the bt profile to profile list on the arrive of a connect event. Previously,
the connect event is ignored if it is a profile that's not known ahead of time.
Robert Greenwalt [Wed, 6 May 2009 21:07:15 +0000 (14:07 -0700)]
am
e94a4e2: Fix locale selection to never chose a lang-only locale.
Merge commit '
e94a4e27474a410f6c9d1b2aa4ef8a8b58a8d218'
* commit '
e94a4e27474a410f6c9d1b2aa4ef8a8b58a8d218':
Fix locale selection to never chose a lang-only locale.
Robert Greenwalt [Wed, 6 May 2009 17:10:42 +0000 (10:10 -0700)]
Fix locale selection to never chose a lang-only locale.
This avoids us using the non-standard lang-only locale when communicating
off device. Fixes
1810133.
Android (Google) Code Review [Fri, 1 May 2009 17:21:43 +0000 (10:21 -0700)]
Merge change 843
* changes:
Reenable verbose logging for post-donut
Eric Fischer [Fri, 1 May 2009 01:13:07 +0000 (18:13 -0700)]
am
eccf5d5: am
9d2976a: AI 148147: Import lots of zh_TW translation chan
Merge commit '
eccf5d538a350fd16689b201b4483d14d16378d6'
* commit '
eccf5d538a350fd16689b201b4483d14d16378d6':
AI 148147: Import lots of zh_TW translation changes.
Eric Fischer [Fri, 1 May 2009 00:59:37 +0000 (17:59 -0700)]
am
9d2976a: AI 148147: Import lots of zh_TW translation changes.
Merge commit '
9d2976a10baf1c26997c4db02babb14b5bd9204d' into donut
* commit '
9d2976a10baf1c26997c4db02babb14b5bd9204d':
AI 148147: Import lots of zh_TW translation changes.
Eric Fischer [Fri, 1 May 2009 00:32:16 +0000 (17:32 -0700)]
AI 148147: Import lots of zh_TW translation changes.
Automated import of CL 148147
Eric Fischer [Fri, 1 May 2009 00:24:36 +0000 (17:24 -0700)]
am
7c1af6d: am
554c844: AI 148026: Update zh_TW translations.
Merge commit '
7c1af6dd3cf1a0c6c637736c80a3ad2e5562e07f'
* commit '
7c1af6dd3cf1a0c6c637736c80a3ad2e5562e07f':
AI 148026: Update zh_TW translations.
Eric Fischer [Fri, 1 May 2009 00:10:48 +0000 (17:10 -0700)]
am
554c844: AI 148026: Update zh_TW translations.
Merge commit '
554c844c7d010f21acb210abab1818d8cbe3dabf' into donut
* commit '
554c844c7d010f21acb210abab1818d8cbe3dabf':
AI 148026: Update zh_TW translations.
Eric Fischer [Thu, 30 Apr 2009 23:48:34 +0000 (16:48 -0700)]
AI 148026: Update zh_TW translations.
Automated import of CL 148026
Michael Chan [Thu, 30 Apr 2009 23:33:42 +0000 (16:33 -0700)]
Reenable verbose logging for post-donut
Android (Google) Code Review [Wed, 29 Apr 2009 22:17:17 +0000 (15:17 -0700)]
am
b2f497f: Merge change 750 into donut
Merge commit '
b2f497f8bb42bde197af7e3bab56661ce82f3a2d'
* commit '
b2f497f8bb42bde197af7e3bab56661ce82f3a2d':
Fixed the Bluetooth On/Off Checkbox in settings so it is enabled/disable properly.
Android (Google) Code Review [Wed, 29 Apr 2009 21:44:34 +0000 (14:44 -0700)]
Merge change 750 into donut
* changes:
Fixed the Bluetooth On/Off Checkbox in settings so it is enabled/disable properly.
Michael Chan [Wed, 29 Apr 2009 21:17:06 +0000 (14:17 -0700)]
Fixed the Bluetooth On/Off Checkbox in settings so it is enabled/disable properly.
In the BroadcastReceiver, pickup the new bluetooth status from the intent instead
of calling back to LocalBluetoothManager. There could be race condition since
LocalBluetoothManager itself gets the same info via the BroadcastReceiver mechanism.
Also cleaned up logs.
Eric Fischer [Wed, 29 Apr 2009 20:43:32 +0000 (13:43 -0700)]
am
edec69d: am
b95a2c9: AI 147962: Import updated zh_TW translations.
Merge commit '
edec69d61909b29f8bfa3556a8ce5aa7a52dae78'
* commit '
edec69d61909b29f8bfa3556a8ce5aa7a52dae78':
AI 147962: Import updated zh_TW translations.
Eric Fischer [Wed, 29 Apr 2009 20:43:32 +0000 (13:43 -0700)]
am
33d0fa6: am
1fa983e: AI 147492: Update zh_TW translations.
Merge commit '
33d0fa6f94e19513825658c8522daa530dcdeadd'
* commit '
33d0fa6f94e19513825658c8522daa530dcdeadd':
AI 147492: Update zh_TW translations.
Bjorn Bringert [Wed, 29 Apr 2009 20:43:32 +0000 (13:43 -0700)]
am
a9d5be1: Show Search settings in Settings app.
Merge commit '
a9d5be1e5f49c272aa445c5c66e07df81d8bfc27'
* commit '
a9d5be1e5f49c272aa445c5c66e07df81d8bfc27':
Show Search settings in Settings app.
Eric Fischer [Wed, 29 Apr 2009 04:59:21 +0000 (21:59 -0700)]
am
b95a2c9: AI 147962: Import updated zh_TW translations.
Merge commit '
b95a2c92c0542b19d92a03cfefb23454e3ff5bd3' into donut
* commit '
b95a2c92c0542b19d92a03cfefb23454e3ff5bd3':
AI 147962: Import updated zh_TW translations.
Eric Fischer [Wed, 29 Apr 2009 04:59:21 +0000 (21:59 -0700)]
am
1fa983e: AI 147492: Update zh_TW translations.
Merge commit '
1fa983eb05284ac31eca4cb68de2783117dde155' into donut
* commit '
1fa983eb05284ac31eca4cb68de2783117dde155':
AI 147492: Update zh_TW translations.
Eric Fischer [Tue, 28 Apr 2009 22:48:40 +0000 (15:48 -0700)]
AI 147962: Import updated zh_TW translations.
Automated import of CL 147962
Bjorn Bringert [Mon, 27 Apr 2009 14:16:25 +0000 (15:16 +0100)]
Show Search settings in Settings app.
The Settings app now shows a "Search settings" item,
if there is an activity that handles the Search settings intent.
This conditionally included settings is handled in the same way
as the sync settings.
Eric Fischer [Thu, 23 Apr 2009 18:59:15 +0000 (11:59 -0700)]
AI 147492: Update zh_TW translations.
Automated import of CL 147492
Jean-Baptiste Queru [Thu, 23 Apr 2009 01:33:19 +0000 (18:33 -0700)]
Merge donut into master
Jean-Baptiste Queru [Thu, 23 Apr 2009 00:56:59 +0000 (17:56 -0700)]
merge cupcake into donut
Jean-Baptiste Queru [Thu, 23 Apr 2009 00:12:39 +0000 (17:12 -0700)]
Merge donut into master
Android (Google) Code Review [Mon, 20 Apr 2009 21:45:51 +0000 (14:45 -0700)]
Merge change 201 into donut
* changes:
Dismiss the dialog in onDestroy so that it doesn't leak on orientation change or other transitions.
Amith Yamasani [Wed, 15 Apr 2009 21:42:32 +0000 (14:42 -0700)]
Dismiss the dialog in onDestroy so that it doesn't leak on orientation change or other transitions.
Evan Millar [Sun, 19 Apr 2009 06:36:22 +0000 (23:36 -0700)]
Merge branch 'readonly-p4-master'
Evan Millar [Sun, 19 Apr 2009 06:35:04 +0000 (23:35 -0700)]
AI 146854: am: CL 146853 Add kernel wakelock data to batteryinfo dump.
Original author: emillar
Automated import of CL 146854
Evan Millar [Sat, 18 Apr 2009 19:27:52 +0000 (12:27 -0700)]
Merge branch 'readonly-p4-donut' into donut
Evan Millar [Sat, 18 Apr 2009 19:26:34 +0000 (12:26 -0700)]
AI 146853: Add kernel wakelock data to batteryinfo dump.
BUG=
1755458
Automated import of CL 146853
Eric Fischer [Wed, 15 Apr 2009 20:30:20 +0000 (13:30 -0700)]
AI 146365: Import revised translations.
DO NOT MERGE
Automated import of CL 146365
Eric Fischer [Tue, 14 Apr 2009 21:38:55 +0000 (14:38 -0700)]
Merge branch 'readonly-p4-master'
Eric Fischer [Tue, 14 Apr 2009 21:37:37 +0000 (14:37 -0700)]
AI 146181: am: CL 145973 am: CL 145787 Add localized time zone names from CLDR-1.6.1.
Original author: enf
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146181