OSDN Git Service
Amith Yamasani [Wed, 12 Aug 2009 12:42:23 +0000 (05:42 -0700)]
Fix a dialog leak. #
1792635
Fixes the dialog leak when switching orientation in Development
settings.
Jean-Michel Trivi [Wed, 12 Aug 2009 01:12:02 +0000 (18:12 -0700)]
am
6dde8965: Fix bug
2045197. The TTS settings activity uses the default TTS stream type. Associate the volume control of this stream type with the volume control buttons.
Merge commit '
6dde8965a089cff72a278a6f0904a180c077191d'
* commit '
6dde8965a089cff72a278a6f0904a180c077191d':
Fix bug
2045197.
Eric Fischer [Wed, 12 Aug 2009 01:11:46 +0000 (18:11 -0700)]
am
c9e5fc45: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
c9e5fc45b0e9eb322865260d03fd2f36b28f3c98'
* commit '
c9e5fc45b0e9eb322865260d03fd2f36b28f3c98':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 12 Aug 2009 01:11:06 +0000 (18:11 -0700)]
am
a016cb00: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
a016cb00484af55ca77d4eb7c3b61950ddfb8319'
* commit '
a016cb00484af55ca77d4eb7c3b61950ddfb8319':
Import revised translations. DO NOT MERGE
Jean-Michel Trivi [Tue, 11 Aug 2009 16:06:58 +0000 (09:06 -0700)]
Fix bug
2045197.
The TTS settings activity uses the default TTS stream type. Associate
the volume control of this stream type with the volume control buttons.
Eric Fischer [Tue, 11 Aug 2009 00:57:14 +0000 (17:57 -0700)]
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 10 Aug 2009 17:48:54 +0000 (10:48 -0700)]
Import revised translations. DO NOT MERGE
Dianne Hackborn [Sun, 9 Aug 2009 03:56:11 +0000 (20:56 -0700)]
Add new activity for picking live wallpapers.
Android (Google) Code Review [Fri, 7 Aug 2009 13:34:08 +0000 (06:34 -0700)]
Merge change 20355
* changes:
Re-ordered some Settings and renamed some.
Jeff Sharkey [Fri, 7 Aug 2009 05:57:48 +0000 (22:57 -0700)]
am
6c3287a4: Adopt new AppWidget assets, per b/
2038594.
Merge commit '
6c3287a4d3a8e02322b501034db3133a3ccb1051'
* commit '
6c3287a4d3a8e02322b501034db3133a3ccb1051':
Adopt new AppWidget assets, per http://b/
2038594.
Jeff Sharkey [Fri, 7 Aug 2009 05:05:49 +0000 (22:05 -0700)]
Adopt new AppWidget assets, per http://b/
2038594.
Amith Yamasani [Thu, 6 Aug 2009 23:43:23 +0000 (16:43 -0700)]
Re-ordered some Settings and renamed some.
Reduced padding around the icons in the top level screen.
Re-ordered top-level settings.
Moved Airplane mode to the top of wireless & networks.
Michael Chan [Tue, 4 Aug 2009 22:02:17 +0000 (15:02 -0700)]
Modified the Bluetooth 2.1 Passkey confirmation dialog
- Changed the Passkey confirmation to show Pair/Don't Pair.
- Fixed the problem where the Ok button was showing up as Pair for the error dialog box.
- Disable the toasts when pairing failed in this case. Will need to check if this causes regression in other cases.
Chouting Zhang [Thu, 23 Jul 2009 03:51:40 +0000 (22:51 -0500)]
Remove 'SIM Card Lock' from Security & Location settings for CDMA phones.
Jean-Baptiste Queru [Tue, 4 Aug 2009 16:00:29 +0000 (09:00 -0700)]
merge from open-source master
Jean-Baptiste Queru [Mon, 3 Aug 2009 14:45:47 +0000 (07:45 -0700)]
merge from donut
Hung-ying Tyan [Mon, 3 Aug 2009 08:37:54 +0000 (01:37 -0700)]
am
09cda9cf: Add VPN connection lost dialog.
Merge commit '
09cda9cfaf658d85a5316cf6f07d5f8c038a942e'
* commit '
09cda9cfaf658d85a5316cf6f07d5f8c038a942e':
Add VPN connection lost dialog.
Hung-ying Tyan [Mon, 3 Aug 2009 08:26:47 +0000 (16:26 +0800)]
Add VPN connection lost dialog.
Hung-ying Tyan [Mon, 3 Aug 2009 01:42:37 +0000 (18:42 -0700)]
am
233991a2: Reduce the number of keystore connections to 1
Merge commit '
233991a2420bd870a0f85e8e0c4c1c00eaf4b975'
* commit '
233991a2420bd870a0f85e8e0c4c1c00eaf4b975':
Reduce the number of keystore connections to 1
Hung-ying Tyan [Sun, 2 Aug 2009 12:28:54 +0000 (20:28 +0800)]
Reduce the number of keystore connections to 1
at entering the security settings.
Android (Google) Code Review [Sat, 1 Aug 2009 03:18:10 +0000 (20:18 -0700)]
am
38322393: Merge change 9437 into donut
Merge commit '
38322393a6d029349ef4ef4f80757da175029bcb'
* commit '
38322393a6d029349ef4ef4f80757da175029bcb':
Reduce the number of keystore connections.
Android (Google) Code Review [Sat, 1 Aug 2009 03:15:37 +0000 (20:15 -0700)]
Merge change 9437 into donut
* changes:
Reduce the number of keystore connections.
Hung-ying Tyan [Sat, 1 Aug 2009 02:08:03 +0000 (10:08 +0800)]
Reduce the number of keystore connections.
Jim Miller [Fri, 31 Jul 2009 21:41:24 +0000 (14:41 -0700)]
Change resource string to "Accounts & Synchronization"
Amith Yamasani [Fri, 31 Jul 2009 14:24:08 +0000 (07:24 -0700)]
Add an icon to the left of the settings at the top level.
Add a new attribute for the icon.
Add place holder icons.
John Wang [Fri, 31 Jul 2009 01:58:55 +0000 (18:58 -0700)]
am
ed47f1e4: Fix the NullPointerException in Status Info.
Merge commit '
ed47f1e497abf5ad31b1c7035ae04478e9932986'
* commit '
ed47f1e497abf5ad31b1c7035ae04478e9932986':
Fix the NullPointerException in Status Info.
John Wang [Fri, 31 Jul 2009 01:22:58 +0000 (18:22 -0700)]
Fix the NullPointerException in Status Info.
Fix bug
1964037 Phone states activity fail. It only happens in Zaku build. Zaku build overlay the device_info_status.xml under vendor/docomo and don't have CDMA related preference. Status.java will hit the NullPointerException when trying to remove the non-exist preferences.
modified: src/com/android/settings/deviceinfo/Status.java
Android (Google) Code Review [Fri, 31 Jul 2009 00:39:35 +0000 (17:39 -0700)]
Merge change 9246
* changes:
2005382 Disable long press on Bluetooth device when BT is off
1930418 Grey BT device when BT is off
Michael Chan [Thu, 30 Jul 2009 22:33:44 +0000 (15:33 -0700)]
2005382 Disable long press on Bluetooth device when BT is off
1930418 Grey BT device when BT is off
Android (Google) Code Review [Thu, 30 Jul 2009 23:05:21 +0000 (16:05 -0700)]
am
9c432349: Merge change 9142 into donut
Merge commit '
9c432349a79cd0f19ebdee18deb2b0b8550d661f'
* commit '
9c432349a79cd0f19ebdee18deb2b0b8550d661f':
Add encryption option to PPTP UI.
Chung-yih Wang [Thu, 30 Jul 2009 23:05:19 +0000 (16:05 -0700)]
am
c538b651: Fix some UI flow issues when the keystore is locked in WiFi setting.
Merge commit '
c538b651a23287ab25584995c6c4b7a68ece027c'
* commit '
c538b651a23287ab25584995c6c4b7a68ece027c':
Fix some UI flow issues when the keystore is locked in WiFi setting.
Amith Yamasani [Thu, 30 Jul 2009 23:05:18 +0000 (16:05 -0700)]
am
03f46bf4: Remove link to Contributors. Fix for #
2022496
Merge commit '
03f46bf48e41b0b2e43fd4c2d6dc0eb213d55fdb'
* commit '
03f46bf48e41b0b2e43fd4c2d6dc0eb213d55fdb':
Remove link to Contributors. Fix for #
2022496
Android (Google) Code Review [Thu, 30 Jul 2009 16:56:29 +0000 (09:56 -0700)]
am
79748b42: Merge change 9000 into donut
Merge commit '
79748b42e3e891c0d1541753c133fa83638146ce'
* commit '
79748b42e3e891c0d1541753c133fa83638146ce':
Fix duplicate entries being added when application is in active use
Android (Google) Code Review [Thu, 30 Jul 2009 15:35:41 +0000 (08:35 -0700)]
Merge change 9116
* changes:
Allow enabling Wifi when in airplane mode.
Jean-Michel Trivi [Thu, 30 Jul 2009 13:56:28 +0000 (06:56 -0700)]
Android (Google) Code Review [Thu, 30 Jul 2009 12:23:06 +0000 (05:23 -0700)]
Merge change 9142 into donut
* changes:
Add encryption option to PPTP UI.
Chung-yih Wang [Thu, 30 Jul 2009 11:04:31 +0000 (19:04 +0800)]
Fix some UI flow issues when the keystore is locked in WiFi setting.
To make it more user friendly, we need to continue on what
users intend to do after unlocking the credential storage.
Hung-ying Tyan [Thu, 30 Jul 2009 11:54:13 +0000 (19:54 +0800)]
Add encryption option to PPTP UI.
Also add new error dialogs for L2TP challenge error and remote server
hanging up error.
Mike Lockwood [Thu, 30 Jul 2009 06:25:10 +0000 (23:25 -0700)]
Allow enabling Wifi when in airplane mode.
If the new system settings value for AIRPLANE_MODE_TOGGLEABLE_RADIOS
contains RADIO_WIFI, then the user will be allowed to enable Wifi
while in airplane mode.
Turning on airplane mode will still disable Wifi, but the user will
be free to reenable it in the Settings app.
We also allow access to the VPN settings under the same circumstances.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Amith Yamasani [Thu, 30 Jul 2009 04:03:02 +0000 (21:03 -0700)]
Remove link to Contributors. Fix for #
2022496
Hung-ying Tyan [Wed, 29 Jul 2009 23:45:25 +0000 (16:45 -0700)]
am
c157aadf: Add error dialog when secrets are missing.
Merge commit '
c157aadf5682e417ace8e4cf3fba498e6953cad3'
* commit '
c157aadf5682e417ace8e4cf3fba498e6953cad3':
Add error dialog when secrets are missing.
Android (Google) Code Review [Wed, 29 Jul 2009 22:48:15 +0000 (15:48 -0700)]
Merge change 9000 into donut
* changes:
Fix duplicate entries being added when application is in active use
Jean-Baptiste Queru [Wed, 29 Jul 2009 21:57:07 +0000 (14:57 -0700)]
merge from donut
Suchi Amalapurapu [Wed, 29 Jul 2009 17:44:21 +0000 (10:44 -0700)]
Fix duplicate entries being added when application is in active use
Jean-Michel Trivi [Tue, 28 Jul 2009 22:13:35 +0000 (15:13 -0700)]
Fix bug
2017664.
Use the new constant names in TextToSpeech.
Hung-ying Tyan [Wed, 29 Jul 2009 04:05:27 +0000 (12:05 +0800)]
Add error dialog when secrets are missing.
Android (Google) Code Review [Tue, 28 Jul 2009 20:17:39 +0000 (13:17 -0700)]
Merge change 8847
* changes:
Wifi: Fix crash when changing screen orientation in Regulatory Domain list.
Mike Lockwood [Tue, 28 Jul 2009 20:15:50 +0000 (13:15 -0700)]
Wifi: Fix crash when changing screen orientation in Regulatory Domain list.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Suchi Amalapurapu [Tue, 28 Jul 2009 18:29:09 +0000 (11:29 -0700)]
Suchi Amalapurapu [Tue, 28 Jul 2009 17:28:23 +0000 (10:28 -0700)]
Remove debug statement
Hung-ying Tyan [Mon, 27 Jul 2009 04:47:35 +0000 (21:47 -0700)]
am
6120ddd7: Capitalize the first letter of a VPN name.
Merge commit '
6120ddd7863d1240a535bc111b62e068c8736058'
* commit '
6120ddd7863d1240a535bc111b62e068c8736058':
Capitalize the first letter of a VPN name.
Hung-ying Tyan [Mon, 27 Jul 2009 04:46:17 +0000 (21:46 -0700)]
am
38a9daff: Fix secret EditText display and other fixes.
Merge commit '
38a9daffa5d3c5cd478bf5a81334cdbc02d4727c'
* commit '
38a9daffa5d3c5cd478bf5a81334cdbc02d4727c':
Fix secret EditText display and other fixes.
Jean-Baptiste Queru [Sun, 26 Jul 2009 18:43:56 +0000 (11:43 -0700)]
reconcile korg/master into goog/master
Jean-Baptiste Queru [Sun, 26 Jul 2009 00:48:03 +0000 (17:48 -0700)]
Merge korg/donut into korg/master
Hung-ying Tyan [Sat, 25 Jul 2009 16:05:21 +0000 (00:05 +0800)]
Capitalize the first letter of a VPN name.
Hung-ying Tyan [Wed, 22 Jul 2009 23:36:23 +0000 (07:36 +0800)]
Fix secret EditText display and other fixes.
+ Now it shows shadowed "(unchanged)" (as in wifi settings) and "(not set)"
instead of two dots.
Patch Set 2:
+ Show cancellation confirmation dialog only when there's change in
profile.
Patch Set 3:
+ Re-enable profile preferences when the reconnect dialog is cancelled.
Fred Quintana [Thu, 23 Jul 2009 03:01:37 +0000 (20:01 -0700)]
update the permissions for the AccountManagerService
Amith Yamasani [Thu, 23 Jul 2009 20:29:13 +0000 (13:29 -0700)]
am
c25f8955: Link to bluetooth settings.
Merge commit '
c25f8955bee14a26520457fca2ab79c013f6196e'
* commit '
c25f8955bee14a26520457fca2ab79c013f6196e':
Link to bluetooth settings.
Amith Yamasani [Wed, 22 Jul 2009 23:19:18 +0000 (16:19 -0700)]
Link to bluetooth settings.
WiFi -> Wi-Fi
Android (Google) Code Review [Wed, 22 Jul 2009 23:09:09 +0000 (16:09 -0700)]
am
86637edf: Merge change 8183 into donut
Merge commit '
86637edfa2df69016afcabbfc581c00a16041745'
* commit '
86637edfa2df69016afcabbfc581c00a16041745':
Improve UX of adding credential...
Android (Google) Code Review [Wed, 22 Jul 2009 22:44:42 +0000 (15:44 -0700)]
Merge change 8183 into donut
* changes:
Improve UX of adding credential...
Hung-ying Tyan [Wed, 22 Jul 2009 13:31:28 +0000 (21:31 +0800)]
Improve UX of adding credential...
with more toast messages and fix dialog handling when needs another
dialog to initialize or enable the credential storage.
Chung-yih Wang [Wed, 22 Jul 2009 18:51:12 +0000 (11:51 -0700)]
Chung-yih Wang [Wed, 22 Jul 2009 18:51:10 +0000 (11:51 -0700)]
am
b2295174: Add the missing phase2 field in EAP configuration.
Merge commit '
b2295174dcb27efa0bf2fb58bb31a517413d9c86'
* commit '
b2295174dcb27efa0bf2fb58bb31a517413d9c86':
Add the missing phase2 field in EAP configuration.
Chung-yih Wang [Wed, 22 Jul 2009 17:56:57 +0000 (01:56 +0800)]
Fix the broken build
Chung-yih Wang [Wed, 22 Jul 2009 03:48:33 +0000 (11:48 +0800)]
Add the missing phase2 field in EAP configuration.
+ Enable the password field for configuring the EAP-APs scanned.
Suchi Amalapurapu [Wed, 22 Jul 2009 00:16:35 +0000 (17:16 -0700)]
resolved conflicts for merge of
e0b5f33c to master
Android (Google) Code Review [Tue, 21 Jul 2009 23:54:12 +0000 (16:54 -0700)]
Merge change 7913 into donut
* changes:
Reorganize message posting when updating sizes and resources. Rather than posting a message for each package, post a message for a set of packages(8) so that we don't end up posting too many messages and making the UI non-responsive by keeping the Handler too busy. We just pass the loaded info as a map in the message object. Changes to back ground threads that compute sizes and load resources.
Android (Google) Code Review [Tue, 21 Jul 2009 22:05:08 +0000 (15:05 -0700)]
am
53a1e445: Merge change 8077 into donut
Merge commit '
53a1e445443865ef98f16652c7b403eee17499e8'
* commit '
53a1e445443865ef98f16652c7b403eee17499e8':
Implement the Back button handler to save a VPN.
Android (Google) Code Review [Tue, 21 Jul 2009 22:05:06 +0000 (15:05 -0700)]
am
ef2c5ac2: Merge change 8071 into donut
Merge commit '
ef2c5ac2e4c42d0280c4c4839ec7286180fe4be8'
* commit '
ef2c5ac2e4c42d0280c4c4839ec7286180fe4be8':
Disable suggestion for certain types of text boxes.
Android (Google) Code Review [Tue, 21 Jul 2009 22:03:43 +0000 (15:03 -0700)]
Merge change 8077 into donut
* changes:
Implement the Back button handler to save a VPN.
Android (Google) Code Review [Tue, 21 Jul 2009 22:03:31 +0000 (15:03 -0700)]
Merge change 8071 into donut
* changes:
Disable suggestion for certain types of text boxes.
Hung-ying Tyan [Tue, 21 Jul 2009 21:44:39 +0000 (05:44 +0800)]
Implement the Back button handler to save a VPN.
Android (Google) Code Review [Tue, 21 Jul 2009 21:38:09 +0000 (14:38 -0700)]
am
8d4faa9e: Merge change 7977 into donut
Merge commit '
8d4faa9ec3e29695b8d5d039bc8ac12d9bd655a8'
* commit '
8d4faa9ec3e29695b8d5d039bc8ac12d9bd655a8':
Add a way to override the display names for locales in the locale picker.
Hung-ying Tyan [Tue, 21 Jul 2009 21:05:46 +0000 (05:05 +0800)]
Disable suggestion for certain types of text boxes.
+ Disable suggestion for password, server name and domain suffices.
+ Use a shorter string to indicate that a secret is set.
Android (Google) Code Review [Tue, 21 Jul 2009 17:42:35 +0000 (10:42 -0700)]
Merge change 7977 into donut
* changes:
Add a way to override the display names for locales in the locale picker.
Hung-ying Tyan [Tue, 21 Jul 2009 14:12:23 +0000 (07:12 -0700)]
am
241610e9: Add password error hint when adding new cert.
Merge commit '
241610e986a8d2823f519762737903779089c253'
* commit '
241610e986a8d2823f519762737903779089c253':
Add password error hint when adding new cert.
Android (Google) Code Review [Tue, 21 Jul 2009 06:33:58 +0000 (23:33 -0700)]
am
a7fe59d0: Merge change 7974 into donut
Merge commit '
a7fe59d05d3393484e8c610962be70d29dee2cc4'
* commit '
a7fe59d05d3393484e8c610962be70d29dee2cc4':
Removing translated text for compatibility option, which has been moved to SpareParts
Amith Yamasani [Tue, 21 Jul 2009 06:33:46 +0000 (23:33 -0700)]
am
8fb0ec36: UI improvements for "Battery use" app.
Merge commit '
8fb0ec36ec2f4cb8e0a48020b1b6e79b7f45635c'
* commit '
8fb0ec36ec2f4cb8e0a48020b1b6e79b7f45635c':
UI improvements for "Battery use" app.
Mitsuru Oshima [Tue, 21 Jul 2009 06:30:04 +0000 (23:30 -0700)]
Merge commit '
5c20034b' into fix
Conflicts:
res/values/strings.xml
Hung-ying Tyan [Tue, 21 Jul 2009 01:41:30 +0000 (09:41 +0800)]
Add password error hint when adding new cert.
Eric Fischer [Tue, 21 Jul 2009 01:16:26 +0000 (18:16 -0700)]
Add a way to override the display names for locales in the locale picker.
In particular, show (the Chinese for) "Chinese (Simplified)" and "Chinese
(Traditional)" instead of "Chinese (China)" and "Chinese (Taiwan)".
Android (Google) Code Review [Tue, 21 Jul 2009 00:59:56 +0000 (17:59 -0700)]
Merge change 7974 into donut
* changes:
Removing translated text for compatibility option, which has been moved to SpareParts
Mitsuru Oshima [Tue, 21 Jul 2009 00:44:51 +0000 (17:44 -0700)]
Removing translated text for compatibility option, which has been moved to SpareParts
Amith Yamasani [Mon, 13 Jul 2009 06:06:04 +0000 (23:06 -0700)]
UI improvements for "Battery use" app.
Change the controls UI to display a suggestion.
Bluetooth AT command tracking (not enabled yet).
Mitsuru Oshima [Mon, 20 Jul 2009 22:52:29 +0000 (15:52 -0700)]
moving compatibility mode option to spare parts
Suchi Amalapurapu [Thu, 9 Jul 2009 19:05:46 +0000 (12:05 -0700)]
Reorganize message posting when updating sizes and resources. Rather than posting
a message for each package, post a message for a set of packages(8) so that we don't
end up posting too many messages and making the UI non-responsive by keeping
the Handler too busy. We just pass the loaded info as a map in the message object.
Changes to back ground threads that compute sizes and load resources.
Add a new AppInfoCache class with some additional methods to load and persist cache.
As of now this just uses a raw file to cache application sizes and labels. We
could have gotten away with a simple map object but for clarity and future enhancements
just reorganized everything into a class. Load the cache in onCreate and persist
in onDestroy rather than start and stop. Using the cache we get < 1sec load times.
Peristing the cache has negligible performance effects. Remove multiple references to
cache and just use one object all over the code.
Rework AppInfo class and remove some confusing initializations. Also move the formatting
sizes part to back ground threads rather than in the constructor of AppInfo projects.
Formatting the sizes takes a lot of time and there is no point in blocking the UI thread
with this operation.
Changes to Adapter to use the newly created cache system. Define new comparator
for comparing application labels when sorting lists rather than using the one defined in
ApplicationInfo class which was loading the labels again in compare method. This was redundant
and since we cache these labels anyway, just use the cached labels instead. Rename and add
new methods for some of the new handler messages that send updates to a list of objects now.
Changes to removeFromList method and just remove entry from lists and cache linearly.
Also fix a bug in the adapter class where we reinit the list everytime the activity gets
restarted. Add a check here to invoke notifyDataSetChanged if underlying data changes.
Add some debug statements to record time.
Jaikumar Ganesh [Fri, 17 Jul 2009 01:41:58 +0000 (18:41 -0700)]
Initial 2.1 bluetooth support.
Need to work with Strings and UI person to fix and later test everything.
Hung-ying Tyan [Mon, 20 Jul 2009 04:14:28 +0000 (21:14 -0700)]
am
ba127f57: Improve VpnSettings start-up time.
Merge commit '
ba127f57ae143a0c7fad5a46b327c04eb2254737'
* commit '
ba127f57ae143a0c7fad5a46b327c04eb2254737':
Improve VpnSettings start-up time.
Jean-Michel Trivi [Mon, 20 Jul 2009 03:28:43 +0000 (20:28 -0700)]
am
628431de: Fix bug
1956707 in which setting the default language has no effect. Use the current Locale upon initialization of the TTS engine. Retrieve the default engine value from the TextToSpeech.Engine class instead of a hard-coded value in TextToSpeechSettings.
Merge commit '
628431de91689b62a19e5fde0ed3b546bba7da74'
* commit '
628431de91689b62a19e5fde0ed3b546bba7da74':
Fix bug
1956707 in which setting the default language has no effect.
Hung-ying Tyan [Fri, 17 Jul 2009 18:55:56 +0000 (02:55 +0800)]
Improve VpnSettings start-up time.
* Changes
+ add orientation and keyboard config change in the manifest file.
+ remove state saving code
+ improve status checking time by doing it in one server connection.
Jean-Michel Trivi [Fri, 17 Jul 2009 23:52:54 +0000 (16:52 -0700)]
Fix bug
1956707 in which setting the default language has no effect.
Use the current Locale upon initialization of the TTS engine.
Retrieve the default engine value from the TextToSpeech.Engine class
instead of a hard-coded value in TextToSpeechSettings.
Android (Google) Code Review [Fri, 17 Jul 2009 22:43:07 +0000 (15:43 -0700)]
am
6b1b36a8: Merge change 7687 into donut
Merge commit '
6b1b36a832943126d19a21dcadda11cc75c3a9b6'
* commit '
6b1b36a832943126d19a21dcadda11cc75c3a9b6':
Add UI to handle PKCS12 cert.
Android (Google) Code Review [Fri, 17 Jul 2009 17:24:27 +0000 (10:24 -0700)]
Merge change 7687 into donut
* changes:
Add UI to handle PKCS12 cert.
Hung-ying Tyan [Fri, 17 Jul 2009 12:58:06 +0000 (20:58 +0800)]
Add UI to handle PKCS12 cert.
Romain Guy [Fri, 17 Jul 2009 00:54:41 +0000 (17:54 -0700)]
am
f90682f4: Give an icon to Settings shortcuts.
Merge commit '
f90682f4fb645ff45cbabcc0e7c3c26dc3cce599'
* commit '
f90682f4fb645ff45cbabcc0e7c3c26dc3cce599':
Give an icon to Settings shortcuts.
Romain Guy [Thu, 16 Jul 2009 22:06:44 +0000 (15:06 -0700)]
Give an icon to Settings shortcuts.
Hung-ying Tyan [Thu, 16 Jul 2009 16:55:11 +0000 (09:55 -0700)]
am
c3eaaad1: Fix "use secure credential" checkbox in Settings.
Merge commit '
c3eaaad17ebe9a2cbe34b096511c8f06369dadd1'
* commit '
c3eaaad17ebe9a2cbe34b096511c8f06369dadd1':
Fix "use secure credential" checkbox in Settings.
Hung-ying Tyan [Thu, 16 Jul 2009 07:24:42 +0000 (15:24 +0800)]
Fix "use secure credential" checkbox in Settings.
Uncheck the checkbox if the user cancels the password-entering dialog.
Mike Lockwood [Thu, 16 Jul 2009 01:13:56 +0000 (18:13 -0700)]
am
599221c7: wifi: Update the AccessPointState network ID after saving configuration.
Merge commit '
599221c7bbd6cd613fd4f86805ccaf0696a3e78c'
* commit '
599221c7bbd6cd613fd4f86805ccaf0696a3e78c':
wifi: Update the AccessPointState network ID after saving configuration.