OSDN Git Service
Jaikumar Ganesh [Thu, 20 Aug 2009 22:14:45 +0000 (15:14 -0700)]
am
91827213: Merge change 22130 into eclair
Merge commit '
9182721336cd5f070aa2b5cf971193c7887c81d6'
* commit '
9182721336cd5f070aa2b5cf971193c7887c81d6':
Call the correct function for canceling a pairing request.
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.
Yue Lixin [Thu, 20 Aug 2009 04:04:53 +0000 (21:04 -0700)]
am
a41e2f94: Implement Bluetooth device picker
Merge commit '
a41e2f94b792e44872be87f40fce182e6b39f4ba'
* commit '
a41e2f94b792e44872be87f40fce182e6b39f4ba':
Implement Bluetooth device picker
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
Jaikumar Ganesh [Wed, 19 Aug 2009 19:36:15 +0000 (12:36 -0700)]
am
3b94f097: Merge change 21929 into eclair
Merge commit '
3b94f097567ac7a95e9cb180cc63771a5bc08289'
* commit '
3b94f097567ac7a95e9cb180cc63771a5bc08289':
Fix device address check when profile state changes.
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.
Amith Yamasani [Wed, 19 Aug 2009 19:27:49 +0000 (12:27 -0700)]
am
3bbb03ff: New settings top-level icons.
Merge commit '
3bbb03ffbb6abc3252a5b32a04d2752e49cc1706'
* commit '
3bbb03ffbb6abc3252a5b32a04d2752e49cc1706':
New settings top-level icons.
Jaikumar Ganesh [Wed, 19 Aug 2009 19:25:37 +0000 (12:25 -0700)]
Fix device address check when profile state changes.
jsh [Wed, 19 Aug 2009 19:17:32 +0000 (12:17 -0700)]
am
f78227df: Merge change 21838 into eclair
Merge commit '
f78227df417eb8ec43c80923a39fba5c50bfe768'
* commit '
f78227df417eb8ec43c80923a39fba5c50bfe768':
Fix RadioInfo for CDMA.
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:56:20 +0000 (19:56 -0700)]
am
2c9b21f0: 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 '
2c9b21f048303469f040f30ec386e9ba25930ee9'
* commit '
2c9b21f048303469f040f30ec386e9ba25930ee9':
Create a shared preference setting and use it before loading/unloading cache
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:14:46 +0000 (13:14 -0700)]
am
1858ccd8: (-s ours) am
aafb491d: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
1858ccd8044f713ce540ee1d457d51fb9cb6ea54'
* commit '
1858ccd8044f713ce540ee1d457d51fb9cb6ea54':
Import revised translations. DO NOT MERGE
Doug Zongker [Tue, 18 Aug 2009 20:14:45 +0000 (13:14 -0700)]
am
2818107d: (-s ours) am
36efef1d: cut number of frames in lock screen demo animation from 15 to 8
Merge commit '
2818107dcc5c7e6ddf152448de8836ce01d3e1ad'
* commit '
2818107dcc5c7e6ddf152448de8836ce01d3e1ad':
cut number of frames in lock screen demo animation from 15 to 8
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 19:09:03 +0000 (12:09 -0700)]
am
f509814f: (-s ours) am
da99054a: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
f509814f6577754243edae217c5b6d51978300e9'
* commit '
f509814f6577754243edae217c5b6d51978300e9':
Import revised translations. DO NOT MERGE
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 17:50:11 +0000 (10:50 -0700)]
am
5807c646: Allow optional nested parenthesis in the kernel compiler version string.
Merge commit '
5807c64631b0716390bcef08320e8b4865a4246d'
* commit '
5807c64631b0716390bcef08320e8b4865a4246d':
Allow optional nested parenthesis in the kernel compiler version string.
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 [Tue, 18 Aug 2009 15:39:28 +0000 (08:39 -0700)]
am
d63c0112: Bluetooth: Update Settings.apk to match BT API change.
Merge commit '
d63c0112251ab4e4e977545368dd703d875012a4'
* commit '
d63c0112251ab4e4e977545368dd703d875012a4':
Bluetooth: Update Settings.apk to match BT API change.
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 22:13:12 +0000 (15:13 -0700)]
am
5eb32e86: b/
2005377 Fixed the problem where previously paired devics can\'t be access(grayed out) in Bluetooth settings after a reboot.
Merge commit '
5eb32e86a244b7cddde109dc4d2d466553c1a4b7'
* commit '
5eb32e86a244b7cddde109dc4d2d466553c1a4b7':
b/
2005377 Fixed the problem where previously paired devics can't be access(grayed out) in Bluetooth settings after a reboot.
Michael Chan [Fri, 14 Aug 2009 22:13:11 +0000 (15:13 -0700)]
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
Michael Chan [Wed, 12 Aug 2009 23:27:39 +0000 (16:27 -0700)]
b/
1793673 Prefill the Bluetooth Device Name in the "change device name" dialog.
Also disable the OK button if it's an empty string.
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)]
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