OSDN Git Service
Mike Lockwood [Thu, 25 Jun 2009 17:51:06 +0000 (10:51 -0700)]
am
b7e46e89: Display a warning dialog when the user enables USB debugging.
Merge commit '
b7e46e89d77574dbb51855144ea3d46fcf220bbb'
* commit '
b7e46e89d77574dbb51855144ea3d46fcf220bbb':
Display a warning dialog when the user enables USB debugging.
Mike Lockwood [Thu, 25 Jun 2009 17:36:00 +0000 (13:36 -0400)]
Display a warning dialog when the user enables USB debugging.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Amith Yamasani [Thu, 25 Jun 2009 07:49:06 +0000 (00:49 -0700)]
Amith Yamasani [Fri, 19 Jun 2009 16:27:35 +0000 (09:27 -0700)]
Track native processes.
Add gauge to detail screen and make it look like the item from summary screen.
Some string changes.
Dianne Hackborn [Thu, 25 Jun 2009 03:37:05 +0000 (20:37 -0700)]
am
a54672f3: Some cleanup of settings launching, adding shortcuts.
Merge commit '
a54672f3a983766cf1dce754b3887807fcb723fa'
* commit '
a54672f3a983766cf1dce754b3887807fcb723fa':
Some cleanup of settings launching, adding shortcuts.
Dianne Hackborn [Wed, 24 Jun 2009 19:45:09 +0000 (12:45 -0700)]
Some cleanup of settings launching, adding shortcuts.
- Move the battery usage item from applications to phone info.
- Give the battery usage item a summary.
- Fiddle with the manifest to make it so we can launch parts of the settings
app without messing up launching of the main app. (That is, remove
affinities so they each are treated as different tasks.)
- Add the ability to make shortcuts to some key settings panels.
Roy West [Wed, 24 Jun 2009 22:44:34 +0000 (15:44 -0700)]
am
74b53da2: Additional edits to strings when uninstalling system app updates.
Merge commit '
74b53da2532e3c611f712d80a50445ae5c7863a0'
* commit '
74b53da2532e3c611f712d80a50445ae5c7863a0':
Additional edits to strings when uninstalling system app updates.
Amith Yamasani [Wed, 24 Jun 2009 22:44:33 +0000 (15:44 -0700)]
am
972fc298: Description and suggestion strings for Battery Usage detail screens.
Merge commit '
972fc2989aba6757e5128aaf8d800fed04f8400f'
* commit '
972fc2989aba6757e5128aaf8d800fed04f8400f':
Description and suggestion strings for Battery Usage detail screens.
Roy West [Wed, 24 Jun 2009 16:25:12 +0000 (09:25 -0700)]
Additional edits to strings when uninstalling system app updates.
Fixes bug
1940257.
Amith Yamasani [Tue, 23 Jun 2009 06:04:45 +0000 (23:04 -0700)]
Description and suggestion strings for Battery Usage detail screens.
Amith Yamasani [Tue, 23 Jun 2009 06:04:45 +0000 (23:04 -0700)]
Description and suggestion strings for Battery Usage detail screens.
Roy West [Wed, 24 Jun 2009 00:16:07 +0000 (17:16 -0700)]
Roy West [Tue, 23 Jun 2009 23:53:37 +0000 (16:53 -0700)]
Fix bug
1937431.
Shorten cut-off location permission string.
Fred Quintana [Tue, 23 Jun 2009 01:07:42 +0000 (18:07 -0700)]
support for changes to the sync settings and control API
Roy West [Tue, 23 Jun 2009 21:06:17 +0000 (14:06 -0700)]
am
518d02ca: First part of fix to bug
1813461, changing "Factory reset" to "Uninstall updates"
Merge commit '
518d02caa917bfe48e1cc22de84fb555cb82e9bb'
* commit '
518d02caa917bfe48e1cc22de84fb555cb82e9bb':
First part of fix to bug
1813461, changing "Factory reset" to "Uninstall updates"
Roy West [Tue, 23 Jun 2009 20:39:55 +0000 (13:39 -0700)]
First part of fix to bug
1813461, changing "Factory reset" to "Uninstall updates"
Jean-Michel Trivi [Tue, 23 Jun 2009 20:27:25 +0000 (13:27 -0700)]
am
1e6a45a2: Updated TTS settings to support language, country and variant settings. Disable/enable entries based on whether language files are installed on the phone. Added entry to install the language files on the phone.
Merge commit '
1e6a45a2d029f9e711e2de9a43bde50607b082c0'
* commit '
1e6a45a2d029f9e711e2de9a43bde50607b082c0':
Updated TTS settings to support language, country and variant settings.
Jean-Michel Trivi [Mon, 22 Jun 2009 23:03:40 +0000 (16:03 -0700)]
Updated TTS settings to support language, country and variant settings.
Disable/enable entries based on whether language files are installed on the phone.
Added entry to install the language files on the phone.
Roy West [Mon, 22 Jun 2009 18:32:29 +0000 (11:32 -0700)]
am
db33eb01: Use sentence style for "System tutorial" Bug
1742121
Merge commit '
db33eb01cd5f83dcb3d5d12287113a0700363588'
* commit '
db33eb01cd5f83dcb3d5d12287113a0700363588':
Use sentence style for "System tutorial"
Roy West [Fri, 19 Jun 2009 22:24:28 +0000 (15:24 -0700)]
Use sentence style for "System tutorial"
Bug
1742121
Hung-ying Tyan [Sat, 20 Jun 2009 07:07:53 +0000 (00:07 -0700)]
am
d22da209: Add save-username checkbox in the connect dialog.
Merge commit '
d22da2096bd738346be5e24eb964ae34d60fcd5e'
* commit '
d22da2096bd738346be5e24eb964ae34d60fcd5e':
Add save-username checkbox in the connect dialog.
Hung-ying Tyan [Mon, 15 Jun 2009 12:24:38 +0000 (20:24 +0800)]
Add save-username checkbox in the connect dialog.
* changes
+ Add checkbox to layout file and handling code in related classes.
+ Add new methods to VpnProfileActor.
+ Move dialog handling to VpnSettings from AuthenticatorActor in order
to support screen orientation change.
+ Hide "Connect" in the context menu if the profile is connecting.
+ Enable connecting profile in case it was disabled in last call.
Android (Google) Code Review [Sat, 20 Jun 2009 00:40:24 +0000 (17:40 -0700)]
Merge change 4852
* changes:
Handle class and name changed actions with DeviceFound signals.
Jaikumar Ganesh [Fri, 19 Jun 2009 23:10:50 +0000 (16:10 -0700)]
Handle class and name changed actions with DeviceFound signals.
When the class or name of a device changed, due to name resolution
or otherwise, we were not updating the cache.
Android (Google) Code Review [Fri, 19 Jun 2009 20:11:40 +0000 (13:11 -0700)]
am
4226b0af: Merge change 4797 into donut
Merge commit '
4226b0af53a8f300b347836199bd03018489d192'
* commit '
4226b0af53a8f300b347836199bd03018489d192':
Use new location of USE_LOCATION_FOR_SERVICES setting (Secure).
Android (Google) Code Review [Fri, 19 Jun 2009 20:09:26 +0000 (13:09 -0700)]
Merge change 4797 into donut
* changes:
Use new location of USE_LOCATION_FOR_SERVICES setting (Secure).
Amith Yamasani [Fri, 19 Jun 2009 19:42:10 +0000 (12:42 -0700)]
Use new location of USE_LOCATION_FOR_SERVICES setting (Secure).
Due to the need to access the bit from SetupWizard, had to move
the setting to Settings.Secure from Settings.Gservices.
Jean-Michel Trivi [Fri, 19 Jun 2009 15:53:19 +0000 (08:53 -0700)]
am
74e565d8: Update the Text-To-Speech settings screen to allow listening to a TTS example after checking that the data required by the TTS engine is properly installed. Removed use of local constants for the the default TTS values, use the values defined in TextToSpe
Merge commit '
74e565d85d13782b2a75647b3fd952a2324ca581'
* commit '
74e565d85d13782b2a75647b3fd952a2324ca581':
Update the Text-To-Speech settings screen to allow listening to a TTS
Jean-Michel Trivi [Fri, 19 Jun 2009 01:44:52 +0000 (18:44 -0700)]
Update the Text-To-Speech settings screen to allow listening to a TTS
example after checking that the data required by the TTS engine is
properly installed.
Removed use of local constants for the the default TTS values, use
the values defined in TextToSpeech.Engine instead.
Amith Yamasani [Thu, 18 Jun 2009 14:13:47 +0000 (07:13 -0700)]
am
dd14ee3d: Remove extra subtitle for legal preferences.
Merge commit '
dd14ee3d1698450f26ec31fdd2d1dd9a6ea81fc4'
* commit '
dd14ee3d1698450f26ec31fdd2d1dd9a6ea81fc4':
Remove extra subtitle for legal preferences.
Amith Yamasani [Thu, 18 Jun 2009 01:45:55 +0000 (18:45 -0700)]
am
2fb22c03: Fixed auto-uncap of Wifi status messages.
Merge commit '
2fb22c03bd587b373519f605feece1f846867cf6'
* commit '
2fb22c03bd587b373519f605feece1f846867cf6':
Fixed auto-uncap of Wifi status messages.
Amith Yamasani [Wed, 17 Jun 2009 23:57:30 +0000 (16:57 -0700)]
Remove extra subtitle for legal preferences.
Fixes #
1894381
Android (Google) Code Review [Wed, 17 Jun 2009 22:38:55 +0000 (15:38 -0700)]
am
f11d7458: Merge change 4378 into donut
Merge commit '
f11d7458ea2f52b3c4afad495274167b862e7a4c'
* commit '
f11d7458ea2f52b3c4afad495274167b862e7a4c':
Make the Quick Launch settings show localized application names.
Chung-yih Wang [Wed, 17 Jun 2009 22:38:31 +0000 (15:38 -0700)]
am
19e134e4: Use new Keystore APIs in vpn profile editor.
Merge commit '
19e134e494a561324394fcc030ee8e30bb41c614'
* commit '
19e134e494a561324394fcc030ee8e30bb41c614':
Use new Keystore APIs in vpn profile editor.
Chung-yih Wang [Wed, 17 Jun 2009 22:38:30 +0000 (15:38 -0700)]
am
b2f1c334: Simply the EAP certificate selection in Wifi Setting.
Merge commit '
b2f1c334de30b2185bec53af81984d015436f610'
* commit '
b2f1c334de30b2185bec53af81984d015436f610':
Simply the EAP certificate selection in Wifi Setting.
Amith Yamasani [Wed, 17 Jun 2009 22:38:17 +0000 (15:38 -0700)]
am
f06d8698: Add setting for allowing Google to use location for better search results.
Merge commit '
f06d8698a4a2de1973a25df0c6563bdfcba4eb03'
* commit '
f06d8698a4a2de1973a25df0c6563bdfcba4eb03':
Add setting for allowing Google to use location for better search results.
Amith Yamasani [Wed, 17 Jun 2009 18:57:42 +0000 (11:57 -0700)]
Fixed auto-uncap of Wifi status messages.
Fixes #
1852765. Change strings to lowercase and capitalize on demand.
Android (Google) Code Review [Wed, 17 Jun 2009 17:08:23 +0000 (10:08 -0700)]
Merge change 4378 into donut
* changes:
Make the Quick Launch settings show localized application names.
Chung-yih Wang [Wed, 17 Jun 2009 10:27:18 +0000 (18:27 +0800)]
Use new Keystore APIs in vpn profile editor.
Chung-yih Wang [Wed, 17 Jun 2009 07:46:42 +0000 (15:46 +0800)]
Simply the EAP certificate selection in Wifi Setting.
-- use the new keystore APU to save one more selection in WiFi EAP setting.
Amith Yamasani [Fri, 12 Jun 2009 05:32:33 +0000 (22:32 -0700)]
Add setting for allowing Google to use location for better search results.
Roy West [Wed, 17 Jun 2009 04:59:25 +0000 (21:59 -0700)]
am
14fa2b99: Another edit, now in two places, now that I understand the workflow of resetting the flow a bit better.
Merge commit '
14fa2b998630b7032b4e42b0bceb71f0df21fbdf'
* commit '
14fa2b998630b7032b4e42b0bceb71f0df21fbdf':
Another edit, now in two places, now that I understand the workflow of resetting the flow a bit better.
Roy West [Tue, 16 Jun 2009 21:07:55 +0000 (14:07 -0700)]
Another edit, now in two places, now that I understand the workflow of resetting the flow a bit better.
Eric Fischer [Tue, 16 Jun 2009 20:31:22 +0000 (13:31 -0700)]
Make the Quick Launch settings show localized application names.
It looks like when you look up the name of an application bookmark,
you get the name in whatever locale the device was in when it first
booted. Check the PackageManager to get a name in the current locale,
if possible, to display instead.
Roy West [Tue, 16 Jun 2009 15:37:02 +0000 (08:37 -0700)]
Roy West [Mon, 15 Jun 2009 21:40:17 +0000 (14:40 -0700)]
String change to fix bug
1838792.
Android (Google) Code Review [Mon, 15 Jun 2009 17:11:46 +0000 (10:11 -0700)]
am
a78edb54: Merge change 4127 into donut
Merge commit '
a78edb54182da5881f2f1e6bc76ae027a9a6f3e3'
* commit '
a78edb54182da5881f2f1e6bc76ae027a9a6f3e3':
Make the SD Card settings use the system file size formatter.
Android (Google) Code Review [Mon, 15 Jun 2009 17:09:41 +0000 (10:09 -0700)]
Merge change 4127 into donut
* changes:
Make the SD Card settings use the system file size formatter.
Hung-ying Tyan [Mon, 15 Jun 2009 11:55:12 +0000 (04:55 -0700)]
am
ff393bf9: Remove SingleServerProfile import.
Merge commit '
ff393bf90b6ef1e8792e05c60c692bbda37aabf8'
* commit '
ff393bf90b6ef1e8792e05c60c692bbda37aabf8':
Remove SingleServerProfile import.
Hung-ying Tyan [Mon, 15 Jun 2009 11:37:38 +0000 (19:37 +0800)]
Remove SingleServerProfile import.
Hung-ying Tyan [Mon, 15 Jun 2009 07:17:36 +0000 (00:17 -0700)]
am
84cfb0dc: Remove use of SingleServerProfile.
Merge commit '
84cfb0dc9b87534d89651bc45128fc21c9d24423'
* commit '
84cfb0dc9b87534d89651bc45128fc21c9d24423':
Remove use of SingleServerProfile.
Hung-ying Tyan [Mon, 15 Jun 2009 04:36:04 +0000 (12:36 +0800)]
Remove use of SingleServerProfile.
* changes
+ mv SingleServerEditor.java VpnProfileEditor.java
+ Add loadExtraPreferecesTo() to VpnProfileEditor
+ Make L2tpIpsecEditor extend VpnProfileEditor and use loadExtraPreferencesTo()
+ Modify VpnEditor.getEditor() accordingly
Hung-ying Tyan [Mon, 15 Jun 2009 04:12:57 +0000 (21:12 -0700)]
am
a55ae92a: Remove isCustomized() check as the API is not used for now.
Merge commit '
a55ae92a132325e9307f291c455b1148d0bff3cf'
* commit '
a55ae92a132325e9307f291c455b1148d0bff3cf':
Remove isCustomized() check as the API is not used for now.
Remove LAUNCHER category from VPN settings activity's intent filter.
Improve power control widget GUI.
Minor UI improvements and showing of unplugged duration.
Make the Settings side of the date format settings more locale-aware.
Hung-ying Tyan [Mon, 15 Jun 2009 03:17:30 +0000 (11:17 +0800)]
Remove isCustomized() check as the API is not used for now.
Hung-ying Tyan [Sun, 14 Jun 2009 09:53:19 +0000 (17:53 +0800)]
Remove LAUNCHER category from VPN settings activity's intent filter.
Also add preference summary to the VPN entry in the security settings.
Eric Fischer [Sat, 13 Jun 2009 00:58:50 +0000 (17:58 -0700)]
Make the SD Card settings use the system file size formatter.
The one built into the settings class wasn't internationalized.
Ken Shirriff [Fri, 12 Jun 2009 00:03:35 +0000 (17:03 -0700)]
Improve power control widget GUI.
Shrink power widget to 3 cells wide. Reorder buttons to group wireless
and other. Add color bar to indicate on/off.
Amith Yamasani [Fri, 12 Jun 2009 21:15:20 +0000 (14:15 -0700)]
Minor UI improvements and showing of unplugged duration.
Eric Fischer [Fri, 12 Jun 2009 01:16:15 +0000 (18:16 -0700)]
Make the Settings side of the date format settings more locale-aware.
Remove the two formats that have a spelled-out month, since applications
using this setting are trying to format numeric dates.
Do not forcibly set the setting the first time you go into Date & Time --
let the setting remain null if it was null before.
Add a choice corresponding to null to the list of format options. It will
look like "Normal (12-31-2009)" in the list, and will cause the system
to use whatever numeric format the locale calls for.
For the other choices, feed them to the locale-aware formatter so they
will appear with the punctuation that the locale calls for.
Hung-ying Tyan [Fri, 12 Jun 2009 15:26:23 +0000 (08:26 -0700)]
am
1617706d: Add VPN settings classes to Settings app.
Merge commit '
1617706d2529b2182d1a7fe2348495fb8f40bb81'
* commit '
1617706d2529b2182d1a7fe2348495fb8f40bb81':
Add VPN settings classes to Settings app.
Android (Google) Code Review [Fri, 12 Jun 2009 15:26:22 +0000 (08:26 -0700)]
am
1d097597: Merge change 3994 into donut
Merge commit '
1d09759798f029d684a636683ab7bf185eda9e6f'
* commit '
1d09759798f029d684a636683ab7bf185eda9e6f':
Shrink power widget to 3 cells wide.
Android (Google) Code Review [Fri, 12 Jun 2009 15:25:55 +0000 (08:25 -0700)]
am
a1ff25c9: Merge change 3973 into donut
Merge commit '
a1ff25c973fc5a65e32eab8b352d619c95fb24d0'
* commit '
a1ff25c973fc5a65e32eab8b352d619c95fb24d0':
Removing the summary texts for the Accessibility checkbox
Chung-yih Wang [Fri, 12 Jun 2009 15:25:48 +0000 (08:25 -0700)]
am
150d5d84: Use the keystore service instead of the direct file access.
Merge commit '
150d5d84e8913e93402950a84ff991b7549b71b4'
* commit '
150d5d84e8913e93402950a84ff991b7549b71b4':
Use the keystore service instead of the direct file access.
Hung-ying Tyan [Wed, 10 Jun 2009 14:52:44 +0000 (22:52 +0800)]
Add VPN settings classes to Settings app.
PATCH SET 2:
+ Add import com.android.settings.R
PATCH SET 3:
+ Remove @Override interface methods to be compilable by Java 1.5.
PATCH SET 4:
+ Add import android.net.vpn.VpnManager
PATCH SET 5:
+ Add license headers.
PATCH SET 6:
+ Remove Constant.java and move the constants to VpnSettings.
+ Make AuthenticationActor implement DialogInterface's handlers.
+ Remove trailing spaces.
PATCH SET 7:
+ Remove default username.
Android (Google) Code Review [Fri, 12 Jun 2009 03:23:33 +0000 (20:23 -0700)]
Merge change 3994 into donut
* changes:
Shrink power widget to 3 cells wide.
Android (Google) Code Review [Fri, 12 Jun 2009 01:07:51 +0000 (18:07 -0700)]
Merge change 3973 into donut
* changes:
Removing the summary texts for the Accessibility checkbox as requested by Raman.
Chung-yih Wang [Fri, 12 Jun 2009 00:16:26 +0000 (08:16 +0800)]
Use the keystore service instead of the direct file access.
Revert back to my merged change 3710.
Ken Shirriff [Fri, 12 Jun 2009 00:03:35 +0000 (17:03 -0700)]
Shrink power widget to 3 cells wide.
Charles Chen [Thu, 11 Jun 2009 22:54:36 +0000 (15:54 -0700)]
Removing the summary texts for the Accessibility checkbox
as requested by Raman.
Android (Google) Code Review [Thu, 11 Jun 2009 18:41:46 +0000 (11:41 -0700)]
am
ed36b1ab: Merge change 3814 into donut
Merge commit '
ed36b1abc1a9bcb0e6b35233a7696b7df89408ea'
* commit '
ed36b1abc1a9bcb0e6b35233a7696b7df89408ea':
Fix power widget bluetooth.
Android (Google) Code Review [Thu, 11 Jun 2009 17:20:10 +0000 (10:20 -0700)]
Merge change 3814 into donut
* changes:
Fix power widget bluetooth.
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.
Ken Shirriff [Wed, 10 Jun 2009 23:26:08 +0000 (16:26 -0700)]
Fix power widget bluetooth.
Starting wifi would also start bluetooth, due to a stray line.
bug=
1910079
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.