OSDN Git Service
Dianne Hackborn [Thu, 3 Sep 2009 20:33:55 +0000 (13:33 -0700)]
Improve running services to services managed by the system.
Also a little tweak to the animations preference.
Change-Id: I3183ef21e687a3b120d02c79e7388300084b9202
Android (Google) Code Review [Thu, 3 Sep 2009 16:20:15 +0000 (09:20 -0700)]
Merge change 23701 into eclair
* changes:
Fix bug
2088099 where the TTS example doesn't play in the Settings app when the UI is in Japanese. Rewrite of the initialization of the default language in the TTS Settings. The previous implementation had the following issues: - the "Listen to an example" didn't use the default settings - the string used for the example didn't match the selected language (this was in order to not imply that TTS is doing translation, but that proved confusing to users). The language initialization is now implemented in initDefaultLang() and ensures that the default locale is one supported in the array of available locales. The speech rate is also initialized from the settings or the default rate (if no value was stored in the settings).
Jean-Michel Trivi [Wed, 2 Sep 2009 22:15:33 +0000 (15:15 -0700)]
Fix bug
2088099 where the TTS example doesn't play in the Settings app
when the UI is in Japanese.
Rewrite of the initialization of the default language in the TTS Settings.
The previous implementation had the following issues:
- the "Listen to an example" didn't use the default settings
- the string used for the example didn't match the selected language
(this was in order to not imply that TTS is doing translation, but
that proved confusing to users).
The language initialization is now implemented in initDefaultLang()
and ensures that the default locale is one supported in the array
of available locales.
The speech rate is also initialized from the settings or the
default rate (if no value was stored in the settings).
Android (Google) Code Review [Wed, 2 Sep 2009 22:34:31 +0000 (15:34 -0700)]
Merge change 23699 into eclair
* changes:
b/
2045917 Fixed the problem where Bluetooth enable/disable remain disabled when Airplane mode is turned off.
Michael Chan [Wed, 2 Sep 2009 22:20:07 +0000 (15:20 -0700)]
b/
2045917 Fixed the problem where Bluetooth enable/disable remain disabled when Airplane mode is turned off.
Michael Chan [Wed, 2 Sep 2009 19:30:05 +0000 (12:30 -0700)]
b/
2050798 Bluetooth Passkeys should always be 6 digits so show leading zeros if needed.
Removed extra new lines in the passkey and pin dialogs because the string didn't fit in landscape mode. (scrollbars to appeared)
Michael Chan [Wed, 2 Sep 2009 01:51:04 +0000 (18:51 -0700)]
b/
2090193 Prevent Bluetooth Pairing Request Dialog from showing in "Recent Apps"
Jean-Michel Trivi [Tue, 1 Sep 2009 20:36:45 +0000 (13:36 -0700)]
Make sure the TTS example in the TTS Settings loads a supported language.
This fixes the issue where the example wouldn't play when the UI is in
Japanese in bug
2088099.
Dianne Hackborn [Tue, 1 Sep 2009 04:33:17 +0000 (21:33 -0700)]
New UI for viewing and stopping currently running services.
Change-Id: I86012262635c911be23513aa0b027174b490374d
Android (Google) Code Review [Tue, 1 Sep 2009 00:39:34 +0000 (17:39 -0700)]
Merge change 23372 into eclair
* changes:
Show the Use location prompt only once if user agrees. Bug #
1910370
Amith Yamasani [Tue, 1 Sep 2009 00:27:53 +0000 (17:27 -0700)]
Show the Use location prompt only once if user agrees. Bug #
1910370
Chouting Zhang [Fri, 28 Aug 2009 19:36:35 +0000 (14:36 -0500)]
Airplane Mode in Emergency Callback Mode (ECM)
When user tries to change Airplane Mode between ON & OFF
in ECM mode, a notice should be shown to indicate it's in ECM mode,
and ask if user wants to exit ECM, if yes, then the Airplane Mode
is changed after ECM mode exit. If not, Airplane Mode should not be
changed.
Daniel Sandler [Mon, 31 Aug 2009 14:00:50 +0000 (10:00 -0400)]
Missing images from change-id I2b9fd2d739085a297ec81ae73eebd60fed4c6896.
Daniel Sandler [Mon, 31 Aug 2009 13:29:16 +0000 (09:29 -0400)]
Add missing hdpi frames of the unlock pattern animation.
Amith Yamasani [Fri, 28 Aug 2009 22:36:52 +0000 (15:36 -0700)]
Fix for
1785342: The old PIN is required after entering New PIN
State of dialogs was not properly maintained across pause/resume.
Android (Google) Code Review [Fri, 28 Aug 2009 20:16:27 +0000 (13:16 -0700)]
Merge change 23149 into eclair
* changes:
High-resolution (hdpi) artwork from TAT for Settings.
Eric Fischer [Fri, 28 Aug 2009 20:02:24 +0000 (13:02 -0700)]
Armor string format tokens with translation placeholders.
Change-Id: I17df22448834b6d8b35f1d9a803fb4d36dfbb1f2
Daniel Sandler [Fri, 28 Aug 2009 18:51:57 +0000 (14:51 -0400)]
High-resolution (hdpi) artwork from TAT for Settings.
Hung-ying Tyan [Thu, 27 Aug 2009 10:49:31 +0000 (18:49 +0800)]
Handle two new err codes:
REMOTE_PPP_HUNG_UP and PPP_NEGOTIATION_FAILED.
Also refactor the dialog creation code to directly use the err code as
the dialog id and make it easier to tell which type of dialog (reconnect
or edit) is invoked for which err code.
Eric Fischer [Thu, 27 Aug 2009 20:52:31 +0000 (13:52 -0700)]
Fix strings whose apostrophes were eaten because of the lack of a backslash.
Change-Id: I11619ef7bdd0d418e701930ae46b2b9c93ca07ac
Hung-ying Tyan [Thu, 27 Aug 2009 03:03:46 +0000 (11:03 +0800)]
Fix the state machine for CONNECTING/DISCONNECTING states.
Android (Google) Code Review [Tue, 25 Aug 2009 18:55:20 +0000 (11:55 -0700)]
Merge change 22611 into eclair
* changes:
Hide the "Enable Assisted GPS" checkbox in security & location settings.
Mike Lockwood [Tue, 25 Aug 2009 18:34:56 +0000 (11:34 -0700)]
Hide the "Enable Assisted GPS" checkbox in security & location settings.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Amith Yamasani [Tue, 25 Aug 2009 00:55:56 +0000 (17:55 -0700)]
Remember dialog state for notification volume.
Restore the original volume if user hasn't okayed the new volume.
Amith Yamasani [Mon, 24 Aug 2009 19:52:42 +0000 (12:52 -0700)]
Remove summaries from top-level of settings.
Android (Google) Code Review [Mon, 24 Aug 2009 17:53:27 +0000 (10:53 -0700)]
Merge change 22303 into eclair
* changes:
Show error messages when Authentication fails.
Chung-yih Wang [Fri, 14 Aug 2009 07:20:44 +0000 (15:20 +0800)]
Support WPA2-EAP configuration.
Add the support for configuring WPA2-EAP APs by grouping them as the WPA-EAP in security mode.
Android (Google) Code Review [Fri, 21 Aug 2009 22:22:51 +0000 (15:22 -0700)]
Merge change 22339 into eclair
* changes:
Fixing bug
2064923. This is a fix to make sure that the accessibility manager does not start any of the accessibility services when it is disabled.
Charles Chen [Fri, 21 Aug 2009 22:14:25 +0000 (15:14 -0700)]
Fixing bug
2064923.
This is a fix to make sure that the accessibility manager does not start
any of the accessibility services when it is disabled.
Android (Google) Code Review [Fri, 21 Aug 2009 21:17:53 +0000 (14:17 -0700)]
Merge change 22324 into eclair
* changes:
Cap the length of dictionary words to keep TextView from exploding.
Jaikumar Ganesh [Fri, 21 Aug 2009 18:53:05 +0000 (11:53 -0700)]
Show error messages when Authentication fails.
Call Canceled when user presses "Don't Pair".
Thus for Authentication Failed cases we can show the message to the
user.
Android (Google) Code Review [Fri, 21 Aug 2009 18:48:50 +0000 (11:48 -0700)]
Merge change 22064 into eclair
* changes:
Add type to filter option to list view Make ListAdapter implement Filterable. Add new implementation for Filter to search based on prefixes. When creating the list include the filter option to create actual list entries. Since Filter.performFiltering is done on a work thread, introduce a new lock and a HashMap of packages matching a prefix which is then used to create a filtered list of applications. Also separte out modifying mAppLocalList which is the basis for list and the dependent mFilterMap used by Filter.performFiltering method to Locked methods for clarity. Note that mAppLocalList is manipulated on main UI thread everywhere but mFilterMap is not.
Suchi Amalapurapu [Thu, 20 Aug 2009 08:27:19 +0000 (01:27 -0700)]
Add type to filter option to list view
Make ListAdapter implement Filterable. Add new implementation for Filter
to search based on prefixes.
When creating the list include the filter option to create actual list entries.
Since Filter.performFiltering is done on a work thread, introduce a new lock
and a HashMap of packages matching a prefix which is then used to create a filtered list of applications.
Also separte out modifying mAppLocalList which is the basis for list and
the dependent mFilterMap used by Filter.performFiltering method to Locked
methods for clarity. Note that mAppLocalList is manipulated on main UI thread everywhere but mFilterMap is not.
Eric Fischer [Thu, 20 Aug 2009 17:17:28 +0000 (10:17 -0700)]
Cap the length of dictionary words to keep TextView from exploding.
Bug
1994172
Eric Fischer [Thu, 20 Aug 2009 23:00:51 +0000 (16:00 -0700)]
am
64b691a8: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
64b691a8abb2bbb2952cb44a7dc04f153d717bc3' into eclair
* commit '
64b691a8abb2bbb2952cb44a7dc04f153d717bc3':
Import revised translations. DO NOT MERGE
Android (Google) Code Review [Thu, 20 Aug 2009 22:10:49 +0000 (15:10 -0700)]
Merge change 22130 into eclair
* changes:
Call the correct function for canceling a pairing request.
Jaikumar Ganesh [Thu, 20 Aug 2009 22:02:41 +0000 (15:02 -0700)]
Call the correct function for canceling a pairing request.
Eric Fischer [Thu, 20 Aug 2009 21:08:19 +0000 (14:08 -0700)]
Import revised translations. DO NOT MERGE
Yue Lixin [Thu, 9 Jul 2009 08:48:52 +0000 (16:48 +0800)]
Implement Bluetooth device picker
Add Bluetooth device picker in Settings
- add resource to support device picker
- show different UI accroding to start Intent
- add OPP profile manager
Android (Google) Code Review [Wed, 19 Aug 2009 19:32:09 +0000 (12:32 -0700)]
Merge change 21929 into eclair
* changes:
Fix device address check when profile state changes.
Jaikumar Ganesh [Wed, 19 Aug 2009 19:25:37 +0000 (12:25 -0700)]
Fix device address check when profile state changes.
Amith Yamasani [Wed, 19 Aug 2009 19:11:57 +0000 (12:11 -0700)]
New settings top-level icons.
Android (Google) Code Review [Wed, 19 Aug 2009 19:12:49 +0000 (12:12 -0700)]
Merge change 21838 into eclair
* changes:
Fix RadioInfo for CDMA.
Suchi Amalapurapu [Wed, 19 Aug 2009 02:51:39 +0000 (19:51 -0700)]
am
d2136f7e: Create a shared preference setting and use it before loading/unloading cache and disable cache if file operations failed in the last launch. A simple if check when reading buffer size from file
Merge commit '
d2136f7e5da6d36a685f5bed2727f0abdafb70bf' into eclair
* commit '
d2136f7e5da6d36a685f5bed2727f0abdafb70bf':
Create a shared preference setting and use it before loading/unloading cache
Suchi Amalapurapu [Wed, 19 Aug 2009 02:32:06 +0000 (19:32 -0700)]
Create a shared preference setting and use it before loading/unloading cache
and disable cache if file operations failed in the last launch.
A simple if check when reading buffer size from file
jsh [Wed, 19 Aug 2009 01:00:15 +0000 (18:00 -0700)]
Fix RadioInfo for CDMA.
Eric Fischer [Tue, 18 Aug 2009 20:11:27 +0000 (13:11 -0700)]
am
aafb491d: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
aafb491d35e2512c504356bc441ae48b48a9f5db' into eclair
* commit '
aafb491d35e2512c504356bc441ae48b48a9f5db':
Import revised translations. DO NOT MERGE
Doug Zongker [Tue, 18 Aug 2009 20:11:16 +0000 (13:11 -0700)]
am
36efef1d: cut number of frames in lock screen demo animation from 15 to 8
Merge commit '
36efef1d7122aab2cc1172e7b7fe4d79ac98a41f' into eclair
* commit '
36efef1d7122aab2cc1172e7b7fe4d79ac98a41f':
cut number of frames in lock screen demo animation from 15 to 8
Eric Fischer [Tue, 18 Aug 2009 18:19:42 +0000 (11:19 -0700)]
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 18 Aug 2009 18:00:58 +0000 (11:00 -0700)]
am
da99054a: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
da99054ace677782c02cfd3e8cf3461ce15d61c1' into eclair
* commit '
da99054ace677782c02cfd3e8cf3461ce15d61c1':
Import revised translations. DO NOT MERGE
Jared Suttles [Tue, 18 Aug 2009 16:52:40 +0000 (11:52 -0500)]
Allow optional nested parenthesis in the kernel compiler version string.
This fixes parsing of the kernel version string in so that groups
3 and 4 can be shown in About phone.
Submitted on behalf of Patrick Auchter <patrick.auchter@motorola.com>
Signed-off-by: Jared Suttles <jared.suttles@motorola.com>
Doug Zongker [Tue, 18 Aug 2009 17:02:33 +0000 (10:02 -0700)]
cut number of frames in lock screen demo animation from 15 to 8
This trims about 108k out of the settings app, and the animation is
still acceptable.
Nick Pelly [Sat, 15 Aug 2009 01:43:18 +0000 (18:43 -0700)]
Bluetooth: Update Settings.apk to match BT API change.
Split BluetoothDevice into BluetoothDevice and BluetoothAdapter.
BluetoothAdapter: Represents the local BT adapter. Operations on the local
adapter (start a scan, etc).
BluetoothDevice: Represents a remote BT device. Operations on remote devices
(pair, connect, etc).
Eric Fischer [Mon, 17 Aug 2009 20:15:56 +0000 (13:15 -0700)]
Import revised translations. DO NOT MERGE
Michael Chan [Fri, 14 Aug 2009 20:57:25 +0000 (13:57 -0700)]
b/
2005377 Fixed the problem where previously paired devics can't be access(grayed out) in Bluetooth settings after a reboot.
Michael Chan [Wed, 12 Aug 2009 23:27:39 +0000 (16:27 -0700)]
do not merge: cherry-pick
e9f4f5dd390973b46310a7cce08d1c6c56e699c2 from master branch
Android Git Automerger [Thu, 13 Aug 2009 23:48:59 +0000 (16:48 -0700)]
Merge commit '
49e8d2e9' into eclair
Romain Guy [Thu, 13 Aug 2009 19:52:06 +0000 (12:52 -0700)]
Remove wallpapers picker
Android (Google) Code Review [Thu, 13 Aug 2009 07:03:43 +0000 (00:03 -0700)]
Merge change 7060 into donut
* changes:
1. Added the missing timezone for mainland China "Asia/Shanghai". In each localized version of timezones.xml, the name of this timezone is defined like "China Standard Time (Beijing)" if some other timezones are also in this format, or just "Beijing" if all of other timezones are of city names.
Android (Google) Code Review [Thu, 13 Aug 2009 00:00:57 +0000 (17:00 -0700)]
Merge change 21021
* changes:
Improve layout of lock tutorial, especially improved for sholes.
Karl Rosaen [Wed, 12 Aug 2009 23:27:12 +0000 (16:27 -0700)]
Improve layout of lock tutorial, especially improved for sholes.
Now, instead of having equal space overall above and below lock pattern widget,
the lock pattern widget is centered within the space above the button bar
at the bottom. Also, removing the line below the lock pattern widget per
romain's recommendation; it looks goofy with the button bar below.
see screen shots in http://b/
2045023 for the differences.
Michael Chan [Wed, 12 Aug 2009 22:38:01 +0000 (15:38 -0700)]
b/
1770342 Bluetooth: Show the pair and connect when the user long touches a device without any supported profiles.
Android (Google) Code Review [Wed, 12 Aug 2009 21:32:30 +0000 (14:32 -0700)]
Merge change 20986
* changes:
b/
2026622 Fixed the problem with the UI keeps showing that BT is scanning even though it has stopped. For some reason, the framework does not notify the settings app when the scan is done while the screen is off.
Michael Chan [Wed, 12 Aug 2009 21:27:18 +0000 (14:27 -0700)]
b/
2026622 Fixed the problem with the UI keeps showing that BT is scanning even though it has stopped.
For some reason, the framework does not notify the settings app when the scan is done while the screen is off.
Amith Yamasani [Wed, 12 Aug 2009 13:04:59 +0000 (06:04 -0700)]
Fix npe in leak fix.
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)]