OSDN Git Service
Chia-chi Yeh [Mon, 12 Oct 2009 18:17:15 +0000 (11:17 -0700)]
am
1e98dfb4: Merge change I446bf8b5 into eclair
Merge commit '
1e98dfb480f7c7be6bd2c0dc752d7742765cd74e'
* commit '
1e98dfb480f7c7be6bd2c0dc752d7742765cd74e':
SecuritySettings: minor tuning.
Chia-chi Yeh [Mon, 12 Oct 2009 18:17:11 +0000 (11:17 -0700)]
am
b83ff4af: Merge change Ibf07c83d into eclair
Merge commit '
b83ff4af8c359fd5cea276318f0c9e4487ec7465'
* commit '
b83ff4af8c359fd5cea276318f0c9e4487ec7465':
SecuritySettings: remove debug messages.
Chia-chi Yeh [Mon, 12 Oct 2009 18:17:07 +0000 (11:17 -0700)]
am
51e97b33: Merge change Ia7c57145 into eclair
Merge commit '
51e97b33d265709da2aa69c861994574a0544aaa'
* commit '
51e97b33d265709da2aa69c861994574a0544aaa':
SecuritySettings: remove trailing spaces.
Chia-chi Yeh [Mon, 12 Oct 2009 18:17:03 +0000 (11:17 -0700)]
am
c49ca127: Merge change I02f58e89 into eclair
Merge commit '
c49ca127aa993dc2ae402680ce392da06f0e1d4c'
* commit '
c49ca127aa993dc2ae402680ce392da06f0e1d4c':
SecuritySettings: clean up.
Chia-chi Yeh [Mon, 12 Oct 2009 18:16:59 +0000 (11:16 -0700)]
am
d2fa30ba: Merge change I28f1a0fc into eclair
Merge commit '
d2fa30baee10b755704beded16e8cf0ab2eb502f'
* commit '
d2fa30baee10b755704beded16e8cf0ab2eb502f':
WifiSettings: use keystore namespace instead of blobl.
android-build SharedAccount [Thu, 1 Oct 2009 22:13:00 +0000 (15:13 -0700)]
am
3a0fc70b: am
40906ea2: empty merge to avoid future conflicts
Merge commit '
3a0fc70b691201cf1806661224c94bd564354f63'
* commit '
3a0fc70b691201cf1806661224c94bd564354f63':
b/
2154576 Fixed the problem were some BT profiles were not connected when first UUID notification of many didn't have all the UUIDs
Michael Chan [Thu, 1 Oct 2009 22:12:16 +0000 (15:12 -0700)]
am
93979854: am
7bf9e031: Merge change Ie7e8a7ef into eclair
Merge commit '
93979854db687085e66173b10551ebf8915e7ab1'
* commit '
93979854db687085e66173b10551ebf8915e7ab1':
Don't auto-connect to OPP after pairing
Amith Yamasani [Thu, 1 Oct 2009 20:39:27 +0000 (13:39 -0700)]
am
7c8a08d5: am
ee52bed5: Merge change I39527366 into eclair
Merge commit '
7c8a08d51389e1c2c0411a1a4a12646880199e01'
* commit '
7c8a08d51389e1c2c0411a1a4a12646880199e01':
Use a custom system icon for native processes.
Mike Cleron [Thu, 1 Oct 2009 20:39:22 +0000 (13:39 -0700)]
Michael Chan [Thu, 1 Oct 2009 20:39:17 +0000 (13:39 -0700)]
am
f30ebb8b: am
e6531e25: b/
2154978 Show only connectable profiles (Headset and& A2DP but not OPP) in Bluetooth Device Advance Options aka "Connect to..."
Merge commit '
f30ebb8bc86482e057f68083f0c09f7da1c89652'
* commit '
f30ebb8bc86482e057f68083f0c09f7da1c89652':
b/
2154978 Show only connectable profiles (Headset and& A2DP but not OPP) in Bluetooth Device Advance Options aka "Connect to..."
Amith Yamasani [Thu, 1 Oct 2009 19:21:07 +0000 (12:21 -0700)]
Jaikumar Ganesh [Thu, 1 Oct 2009 19:17:53 +0000 (12:17 -0700)]
am
8c5ff4b7: am
1eb1df08: Add strings for authentication type.
Merge commit '
8c5ff4b76a5bd3bc7d578ca2cdf89c2e1c423973'
* commit '
8c5ff4b76a5bd3bc7d578ca2cdf89c2e1c423973':
Add strings for authentication type.
Michael Chan [Thu, 1 Oct 2009 19:15:45 +0000 (12:15 -0700)]
am
eedf612f: am
e3b59f19: Merge change I5eab1270 into eclair
Merge commit '
eedf612f83c78eb8c60cb8b9034c25bd627eda8f'
* commit '
eedf612f83c78eb8c60cb8b9034c25bd627eda8f':
b/
2154576 Fixed the problem were some BT profiles were not connected when first UUID notification of many didn't have all the UUIDs
Debajit Ghosh [Thu, 1 Oct 2009 19:13:27 +0000 (12:13 -0700)]
Hung-ying Tyan [Thu, 1 Oct 2009 18:55:05 +0000 (11:55 -0700)]
am
39087f8a: am
8fd062e1: Use the new VpnType.getDescriptionId().
Merge commit '
39087f8a69ab224f3b067bb79e5cd66fd5e2a3aa'
* commit '
39087f8a69ab224f3b067bb79e5cd66fd5e2a3aa':
Use the new VpnType.getDescriptionId().
Mike Cleron [Thu, 1 Oct 2009 18:54:10 +0000 (11:54 -0700)]
Hung-ying Tyan [Thu, 1 Oct 2009 18:49:17 +0000 (11:49 -0700)]
am
06167cc3: am
b0883cb3: Fix bugs in credential storage settings:
Merge commit '
06167cc39569fde2a9bdbff859ff5358f2f90a0b'
* commit '
06167cc39569fde2a9bdbff859ff5358f2f90a0b':
Fix bugs in credential storage settings:
Dianne Hackborn [Thu, 1 Oct 2009 18:44:45 +0000 (11:44 -0700)]
am
78651523: am
cabb147c: Improve running services info.
Merge commit '
78651523727ee3aadec008faa7ae5a945c51ab69'
* commit '
78651523727ee3aadec008faa7ae5a945c51ab69':
Improve running services info.
Jim Miller [Thu, 1 Oct 2009 18:40:29 +0000 (11:40 -0700)]
am
356ceb58: am
be699645: Merge change I56544d0e into eclair
Merge commit '
356ceb5853243762d00d0c4e1482fbe887f66e3e'
* commit '
356ceb5853243762d00d0c4e1482fbe887f66e3e':
Fix for
2137900: Be more conservative about poking the wakelock
Ken Shirriff [Thu, 1 Oct 2009 18:38:10 +0000 (11:38 -0700)]
am
f666279a: am
eb8d6f78: Merge change Id80d1999 into eclair
Merge commit '
f666279a60cd371c938955448453ccac2428b539'
* commit '
f666279a60cd371c938955448453ccac2428b539':
Fix power widget brightness.
Amith Yamasani [Thu, 1 Oct 2009 18:16:58 +0000 (11:16 -0700)]
am
75f25db9: am
d7705d4c: Fix
2147749: Make Settings.ACTION_SOUND_SETTINGS work
Merge commit '
75f25db90dd5465273cd23f27d2f5a1cd625aeb9'
* commit '
75f25db90dd5465273cd23f27d2f5a1cd625aeb9':
Fix
2147749: Make Settings.ACTION_SOUND_SETTINGS work
Mike Cleron [Thu, 1 Oct 2009 18:12:20 +0000 (11:12 -0700)]
Android (Google) Code Review [Thu, 1 Oct 2009 17:12:21 +0000 (13:12 -0400)]
Merge change I446bf8b5 into eclair
* changes:
SecuritySettings: minor tuning.
Chia-chi Yeh [Thu, 1 Oct 2009 17:11:17 +0000 (01:11 +0800)]
SecuritySettings: minor tuning.
Android (Google) Code Review [Thu, 1 Oct 2009 17:04:25 +0000 (13:04 -0400)]
Merge change Ibf07c83d into eclair
* changes:
SecuritySettings: remove debug messages.
Chia-chi Yeh [Thu, 1 Oct 2009 17:03:50 +0000 (01:03 +0800)]
SecuritySettings: remove debug messages.
Android (Google) Code Review [Thu, 1 Oct 2009 16:49:08 +0000 (12:49 -0400)]
Merge change Ia7c57145 into eclair
* changes:
SecuritySettings: remove trailing spaces.
Chia-chi Yeh [Thu, 1 Oct 2009 16:48:32 +0000 (00:48 +0800)]
SecuritySettings: remove trailing spaces.
Android (Google) Code Review [Thu, 1 Oct 2009 16:47:24 +0000 (12:47 -0400)]
Merge change I02f58e89 into eclair
* changes:
SecuritySettings: clean up.
Android (Google) Code Review [Thu, 1 Oct 2009 16:47:12 +0000 (12:47 -0400)]
Merge change I28f1a0fc into eclair
* changes:
WifiSettings: use keystore namespace instead of blobl.
Chia-chi Yeh [Thu, 1 Oct 2009 16:39:14 +0000 (00:39 +0800)]
SecuritySettings: clean up.
android-build SharedAccount [Thu, 1 Oct 2009 15:57:04 +0000 (08:57 -0700)]
am
40906ea2: empty merge to avoid future conflicts
Merge commit '
40906ea24eceed5b06be2087d8e06738fc9cd876' into eclair-plus-aosp
* commit '
40906ea24eceed5b06be2087d8e06738fc9cd876':
b/
2154576 Fixed the problem were some BT profiles were not connected when first UUID notification of many didn't have all the UUIDs
android-build SharedAccount [Thu, 1 Oct 2009 15:46:43 +0000 (08:46 -0700)]
empty merge to avoid future conflicts
Merge branch 'eclair-release' into HEAD
Michael Chan [Thu, 1 Oct 2009 14:54:39 +0000 (07:54 -0700)]
am
7bf9e031: Merge change Ie7e8a7ef into eclair
Merge commit '
7bf9e0317cfb62b12e99ed9ab6c6975c848c519e' into eclair-plus-aosp
* commit '
7bf9e0317cfb62b12e99ed9ab6c6975c848c519e':
Don't auto-connect to OPP after pairing
Android (Google) Code Review [Thu, 1 Oct 2009 14:46:26 +0000 (10:46 -0400)]
Merge change Ie7e8a7ef into eclair
* changes:
Don't auto-connect to OPP after pairing
Chia-chi Yeh [Thu, 1 Oct 2009 11:17:55 +0000 (19:17 +0800)]
WifiSettings: use keystore namespace instead of blobl.
Michael Chan [Thu, 1 Oct 2009 06:08:19 +0000 (23:08 -0700)]
Don't auto-connect to OPP after pairing
Change-Id: Ie7e8a7ef7188f7ffa6b32595764c100a0d72be89
Amith Yamasani [Thu, 1 Oct 2009 04:15:52 +0000 (21:15 -0700)]
am
ee52bed5: Merge change I39527366 into eclair
Merge commit '
ee52bed514cbee1fade95a9f862e238c4975cd8b' into eclair-plus-aosp
* commit '
ee52bed514cbee1fade95a9f862e238c4975cd8b':
Use a custom system icon for native processes.
Mike Cleron [Thu, 1 Oct 2009 04:15:36 +0000 (21:15 -0700)]
am
c5648906: Merge change I00ab9f0b into eclair
Merge commit '
c564890637bf91e92ede27789e4d98863c46e681' into eclair-plus-aosp
* commit '
c564890637bf91e92ede27789e4d98863c46e681':
Fix widgets
Michael Chan [Thu, 1 Oct 2009 04:14:24 +0000 (21:14 -0700)]
am
e6531e25: b/
2154978 Show only connectable profiles (Headset and& A2DP but not OPP) in Bluetooth Device Advance Options aka "Connect to..."
Merge commit '
e6531e253bf646324d3a68de0e9cc612c5e1c8ac' into eclair-plus-aosp
* commit '
e6531e253bf646324d3a68de0e9cc612c5e1c8ac':
b/
2154978 Show only connectable profiles (Headset and& A2DP but not OPP) in Bluetooth Device Advance Options aka "Connect to..."
Android (Google) Code Review [Thu, 1 Oct 2009 01:43:48 +0000 (21:43 -0400)]
Merge change I39527366 into eclair
* changes:
Use a custom system icon for native processes.
Amith Yamasani [Wed, 30 Sep 2009 22:54:26 +0000 (15:54 -0700)]
Use a custom system icon for native processes.
New icons for system components in Battery Use screen.
Android (Google) Code Review [Thu, 1 Oct 2009 01:34:36 +0000 (21:34 -0400)]
Merge change I00ab9f0b into eclair
* changes:
Fix widgets
Mike Cleron [Thu, 1 Oct 2009 01:29:25 +0000 (18:29 -0700)]
Fix widgets
Michael Chan [Wed, 30 Sep 2009 21:26:10 +0000 (14:26 -0700)]
b/
2154978 Show only connectable profiles (Headset and& A2DP but not OPP) in Bluetooth Device Advance Options aka "Connect to..."
Change-Id: I34249a4828707bde491da4a82dca94ecf37cf490
Michael Chan [Wed, 30 Sep 2009 19:18:51 +0000 (12:18 -0700)]
b/
2154576 Fixed the problem were some BT profiles were not connected when first UUID notification of many didn't have all the UUIDs
Reset connect timer event if profile was non-empty.
Clear profiles after unpair
mConnectAttemptedWithoutUuid
Change-Id: I5eab1270a755c6c87eb5be13a2f43dbbcd9a2f88
Amith Yamasani [Wed, 30 Sep 2009 22:12:56 +0000 (15:12 -0700)]
am
e5cff265: Merge change Ibe023c8a into eclair
Merge commit '
e5cff2655cd60226646820638e2dab54a4af5e9a' into eclair-plus-aosp
* commit '
e5cff2655cd60226646820638e2dab54a4af5e9a':
Fix Safety Settings screen bugs -
2150942,
2151440,
2151727
Android (Google) Code Review [Wed, 30 Sep 2009 22:05:03 +0000 (18:05 -0400)]
Merge change Ibe023c8a into eclair
* changes:
Fix Safety Settings screen bugs -
2150942,
2151440,
2151727
Jaikumar Ganesh [Wed, 30 Sep 2009 21:15:29 +0000 (14:15 -0700)]
am
1eb1df08: Add strings for authentication type.
Merge commit '
1eb1df082d59bdef8b3e0cda6d1af635449833ab' into eclair-plus-aosp
* commit '
1eb1df082d59bdef8b3e0cda6d1af635449833ab':
Add strings for authentication type.
Jaikumar Ganesh [Wed, 30 Sep 2009 16:43:34 +0000 (09:43 -0700)]
Add strings for authentication type.
A new field is going to be added to the APN editor.
Authentication type: 4 possible values - None, PAP, CHAP, PAP or CHAP
These strings are too technical for the end user, however these
fields will be pre-populated and the user would not have to change them.
Change-Id: I7df326722fc4aebfe68d2726e2695eda8ea798a9
Amith Yamasani [Wed, 30 Sep 2009 19:18:51 +0000 (12:18 -0700)]
Fix Safety Settings screen bugs -
2150942,
2151440,
2151727
Handle the back key.
Finish the activity if dialog is cancelled.
Show an error and finish the activity if URL couldn't be found due to
connectivity problem and not just when Telephony is not available.
Michael Chan [Wed, 30 Sep 2009 19:44:42 +0000 (12:44 -0700)]
am
e3b59f19: Merge change I5eab1270 into eclair
Merge commit '
e3b59f193e0df1a2643c367f7f1f4f7b6817a5f8' into eclair-plus-aosp
* commit '
e3b59f193e0df1a2643c367f7f1f4f7b6817a5f8':
b/
2154576 Fixed the problem were some BT profiles were not connected when first UUID notification of many didn't have all the UUIDs
Android (Google) Code Review [Wed, 30 Sep 2009 19:39:06 +0000 (15:39 -0400)]
Merge change I5eab1270 into eclair
* changes:
b/
2154576 Fixed the problem were some BT profiles were not connected when first UUID notification of many didn't have all the UUIDs
Michael Chan [Wed, 30 Sep 2009 19:18:51 +0000 (12:18 -0700)]
b/
2154576 Fixed the problem were some BT profiles were not connected when first UUID notification of many didn't have all the UUIDs
Reset connect timer event if profile was non-empty.
Clear profiles after unpair
mConnectAttemptedWithoutUuid
Change-Id: I5eab1270a755c6c87eb5be13a2f43dbbcd9a2f88
Debajit Ghosh [Wed, 30 Sep 2009 18:43:48 +0000 (11:43 -0700)]
am
99716fb4: updating sync settings icon
Merge commit '
99716fb4b4b0b3ca411dd8e699f5bc34a9c8b1ba' into eclair-plus-aosp
* commit '
99716fb4b4b0b3ca411dd8e699f5bc34a9c8b1ba':
updating sync settings icon
Debajit Ghosh [Wed, 30 Sep 2009 17:51:32 +0000 (10:51 -0700)]
updating sync settings icon
Hung-ying Tyan [Wed, 30 Sep 2009 10:06:58 +0000 (03:06 -0700)]
am
8fd062e1: Use the new VpnType.getDescriptionId().
Merge commit '
8fd062e1a5c0047deff1dd817a097b94891000f2' into eclair-plus-aosp
* commit '
8fd062e1a5c0047deff1dd817a097b94891000f2':
Use the new VpnType.getDescriptionId().
Hung-ying Tyan [Wed, 30 Sep 2009 09:57:56 +0000 (17:57 +0800)]
Use the new VpnType.getDescriptionId().
Mike Cleron [Wed, 30 Sep 2009 08:36:04 +0000 (01:36 -0700)]
Mike Cleron [Wed, 30 Sep 2009 08:18:17 +0000 (01:18 -0700)]
Newer icons
Hung-ying Tyan [Wed, 30 Sep 2009 04:54:25 +0000 (21:54 -0700)]
am
b0883cb3: Fix bugs in credential storage settings:
Merge commit '
b0883cb384fc7ad46e011a72355c9fda924e5b28' into eclair-plus-aosp
* commit '
b0883cb384fc7ad46e011a72355c9fda924e5b28':
Fix bugs in credential storage settings:
Hung-ying Tyan [Wed, 30 Sep 2009 03:56:05 +0000 (11:56 +0800)]
Fix bugs in credential storage settings:
* resume credential storage settings in onResume() in case if a new
activity changes the settings and switches back.
* reset mRetry in case the dialog is retried and canceled.
* update preferences in onDismiss handler in case the dialog is canceled
and need to revert the checkbox.
Dianne Hackborn [Wed, 30 Sep 2009 01:15:38 +0000 (18:15 -0700)]
am
cabb147c: Improve running services info.
Merge commit '
cabb147ce57bdcbb6baa08686415ce03f97028d7' into eclair-plus-aosp
* commit '
cabb147ce57bdcbb6baa08686415ce03f97028d7':
Improve running services info.
Dianne Hackborn [Wed, 30 Sep 2009 00:38:08 +0000 (17:38 -0700)]
Improve running services info.
Change-Id: I797c76f322b9be7f25a1b695b0332b45bc7e9d4c
Jim Miller [Tue, 29 Sep 2009 22:49:00 +0000 (15:49 -0700)]
am
be699645: Merge change I56544d0e into eclair
Merge commit '
be699645dbae746c431caf9c0736938c55fda588' into eclair-plus-aosp
* commit '
be699645dbae746c431caf9c0736938c55fda588':
Fix for
2137900: Be more conservative about poking the wakelock
Android (Google) Code Review [Tue, 29 Sep 2009 22:41:44 +0000 (18:41 -0400)]
Merge change I56544d0e into eclair
* changes:
Fix for
2137900: Be more conservative about poking the wakelock
Ken Shirriff [Tue, 29 Sep 2009 21:43:15 +0000 (14:43 -0700)]
am
eb8d6f78: Merge change Id80d1999 into eclair
Merge commit '
eb8d6f783088a39e243e7be9ac930d198369092a' into eclair-plus-aosp
* commit '
eb8d6f783088a39e243e7be9ac930d198369092a':
Fix power widget brightness.
Android (Google) Code Review [Tue, 29 Sep 2009 21:34:43 +0000 (17:34 -0400)]
Merge change Id80d1999 into eclair
* changes:
Fix power widget brightness.
Jim Miller [Tue, 29 Sep 2009 21:16:53 +0000 (14:16 -0700)]
Fix for
2137900: Be more conservative about poking the wakelock
Ken Shirriff [Tue, 29 Sep 2009 19:40:45 +0000 (12:40 -0700)]
Fix power widget brightness.
If the auto-brightness is cleared, the brightness will drop to 0, so we
need to set it again.
Amith Yamasani [Tue, 29 Sep 2009 18:20:59 +0000 (11:20 -0700)]
am
d7705d4c: Fix
2147749: Make Settings.ACTION_SOUND_SETTINGS work
Merge commit '
d7705d4cd710ad93954acbffa464f9c96bf33809' into eclair-plus-aosp
* commit '
d7705d4cd710ad93954acbffa464f9c96bf33809':
Fix
2147749: Make Settings.ACTION_SOUND_SETTINGS work
Michael Chan [Tue, 29 Sep 2009 18:13:37 +0000 (11:13 -0700)]
am
26917f1d: am
e1089ad3: b/
2142065 Added Bluetooth API to allow developer to request the user\'s permission to enable discovery mode.
Merge commit '
26917f1ddd052534c4a6e1577b79570d9bbbdd10'
* commit '
26917f1ddd052534c4a6e1577b79570d9bbbdd10':
b/
2142065 Added Bluetooth API to allow developer to request the user's permission to enable discovery mode.
Amith Yamasani [Tue, 29 Sep 2009 18:10:05 +0000 (11:10 -0700)]
Fix
2147749: Make Settings.ACTION_SOUND_SETTINGS work
Added the official action to the Settings manifest.
Roy West [Tue, 29 Sep 2009 18:08:05 +0000 (11:08 -0700)]
am
dcd813ea: am
c63742c8: Merge change I87d7f224 into eclair
Merge commit '
dcd813eac8678afaedc35f0271d79f1617cd810d'
* commit '
dcd813eac8678afaedc35f0271d79f1617cd810d':
Correct "on-screen" to "onscreen"; fix tts screen title
Nick Pelly [Tue, 29 Sep 2009 18:07:19 +0000 (11:07 -0700)]
am
19f8e36b: am
079ee952: Update application for android.bluetooth.ParcelUuid -> android.os.ParcelUuid
Merge commit '
19f8e36b5a3d70d87c8ec2429f090ec12b54d87b'
* commit '
19f8e36b5a3d70d87c8ec2429f090ec12b54d87b':
Update application for android.bluetooth.ParcelUuid -> android.os.ParcelUuid
Lixin Yue [Tue, 29 Sep 2009 18:07:16 +0000 (11:07 -0700)]
am
5d6278dd: am
7b576e49: Merge change 27058 into eclair
Merge commit '
5d6278dd11f2cfcf84fcb21772bab9ec9abbaaad'
* commit '
5d6278dd11f2cfcf84fcb21772bab9ec9abbaaad':
Fix device picker minor bug
Suchi Amalapurapu [Tue, 29 Sep 2009 18:07:12 +0000 (11:07 -0700)]
am
b20be6e2: am
5a201b78: Merge change 27473 into eclair
Merge commit '
b20be6e24a7b546e413a00c51f8079fa7233651b'
* commit '
b20be6e24a7b546e413a00c51f8079fa7233651b':
Rename empty view so that the standard list view implementation
Mike Cleron [Tue, 29 Sep 2009 07:51:39 +0000 (00:51 -0700)]
Mike Cleron [Tue, 29 Sep 2009 07:30:34 +0000 (00:30 -0700)]
New icons
Michael Chan [Tue, 29 Sep 2009 00:39:14 +0000 (17:39 -0700)]
am
e1089ad3: b/
2142065 Added Bluetooth API to allow developer to request the user\'s permission to enable discovery mode.
Merge commit '
e1089ad33896f4fe5b75e773813367d700773b6f' into eclair-plus-aosp
* commit '
e1089ad33896f4fe5b75e773813367d700773b6f':
b/
2142065 Added Bluetooth API to allow developer to request the user's permission to enable discovery mode.
Michael Chan [Sat, 26 Sep 2009 13:16:17 +0000 (06:16 -0700)]
b/
2142065 Added Bluetooth API to allow developer to request the user's permission to enable discovery mode.
Change-Id: I6da1598661ad05b4cfd2b7cc81e05d3053df5777
Roy West [Mon, 28 Sep 2009 20:44:51 +0000 (13:44 -0700)]
am
c63742c8: Merge change I87d7f224 into eclair
Merge commit '
c63742c8fa533b6fc879f12ccecc2a51c1aca23b' into eclair-plus-aosp
* commit '
c63742c8fa533b6fc879f12ccecc2a51c1aca23b':
Correct "on-screen" to "onscreen"; fix tts screen title
Android (Google) Code Review [Mon, 28 Sep 2009 20:37:00 +0000 (16:37 -0400)]
Merge change I87d7f224 into eclair
* changes:
Correct "on-screen" to "onscreen"; fix tts screen title
Nick Pelly [Mon, 28 Sep 2009 20:19:08 +0000 (13:19 -0700)]
am
079ee952: Update application for android.bluetooth.ParcelUuid -> android.os.ParcelUuid
Merge commit '
079ee952bdfae560c36df1f1dcd3f1177e4afa47' into eclair-plus-aosp
* commit '
079ee952bdfae560c36df1f1dcd3f1177e4afa47':
Update application for android.bluetooth.ParcelUuid -> android.os.ParcelUuid
Lixin Yue [Mon, 28 Sep 2009 20:19:05 +0000 (13:19 -0700)]
am
7b576e49: Merge change 27058 into eclair
Merge commit '
7b576e491718e9a6d3f0f66421eddbdfaa853d87' into eclair-plus-aosp
* commit '
7b576e491718e9a6d3f0f66421eddbdfaa853d87':
Fix device picker minor bug
Suchi Amalapurapu [Mon, 28 Sep 2009 20:19:01 +0000 (13:19 -0700)]
am
5a201b78: Merge change 27473 into eclair
Merge commit '
5a201b787233a7e2b9b4bf6f84ab14b2cd3eec74' into eclair-plus-aosp
* commit '
5a201b787233a7e2b9b4bf6f84ab14b2cd3eec74':
Rename empty view so that the standard list view implementation
Nick Pelly [Mon, 28 Sep 2009 19:28:14 +0000 (12:28 -0700)]
Update application for android.bluetooth.ParcelUuid -> android.os.ParcelUuid
Change-Id: Iebf2b3ea9cac224e3e6c67e503b1063491dce5bb
Android (Google) Code Review [Mon, 28 Sep 2009 18:46:49 +0000 (14:46 -0400)]
Merge change 27058 into eclair
* changes:
Fix device picker minor bug
Android (Google) Code Review [Mon, 28 Sep 2009 18:46:24 +0000 (14:46 -0400)]
Merge change 27473 into eclair
* changes:
Rename empty view so that the standard list view implementation displays empty list message when list goes empty. Ideally the list is not empty for running processes and All filter options. so the message is just set to third party apps Remove the empty list view logic from code base
Ken Shirriff [Mon, 28 Sep 2009 18:42:15 +0000 (11:42 -0700)]
am
ea7f30ff: am
5928da68: Merge change 27471 into eclair
Merge commit '
ea7f30ffc426e0b251384778b64271261ca82b4c'
* commit '
ea7f30ffc426e0b251384778b64271261ca82b4c':
Fix power widget brightness for Sholes.
Ken Shirriff [Mon, 28 Sep 2009 18:34:10 +0000 (11:34 -0700)]
am
5928da68: Merge change 27471 into eclair
Merge commit '
5928da682a31f3375a206d551c478d76437bb7cf' into eclair-plus-aosp
* commit '
5928da682a31f3375a206d551c478d76437bb7cf':
Fix power widget brightness for Sholes.
Suchi Amalapurapu [Mon, 28 Sep 2009 18:27:48 +0000 (11:27 -0700)]
Rename empty view so that the standard list view implementation
displays empty list message when list goes empty. Ideally the list is
not empty for running processes and All filter options. so the
message is just set to third party apps
Remove the empty list view logic from code base
Android (Google) Code Review [Mon, 28 Sep 2009 18:27:15 +0000 (14:27 -0400)]
Merge change 27471 into eclair
* changes:
Fix power widget brightness for Sholes.
Ken Shirriff [Mon, 28 Sep 2009 18:17:20 +0000 (11:17 -0700)]
Fix power widget brightness for Sholes.
The widget must disable automatic brightness before modifying the brightness.
jsh [Mon, 28 Sep 2009 17:31:14 +0000 (10:31 -0700)]
am
57b49b70: am
afa9d6ea: Merge change 27283 into eclair
Merge commit '
57b49b70de0ec6ea7528b44c0b82594c804996b7'
* commit '
57b49b70de0ec6ea7528b44c0b82594c804996b7':
Display cell location for CDMA in Phone info screen.
jsh [Mon, 28 Sep 2009 17:26:12 +0000 (10:26 -0700)]
am
afa9d6ea: Merge change 27283 into eclair
Merge commit '
afa9d6ea321228add087f753e1e2a3853150d56f' into eclair-plus-aosp
* commit '
afa9d6ea321228add087f753e1e2a3853150d56f':
Display cell location for CDMA in Phone info screen.
Android (Google) Code Review [Mon, 28 Sep 2009 17:21:44 +0000 (13:21 -0400)]
Merge change 27283 into eclair
* changes:
Display cell location for CDMA in Phone info screen.
Hung-ying Tyan [Mon, 28 Sep 2009 17:06:01 +0000 (10:06 -0700)]
Roy West [Sun, 27 Sep 2009 19:01:46 +0000 (12:01 -0700)]
Correct "on-screen" to "onscreen"; fix tts screen title
Michael Chan [Mon, 28 Sep 2009 08:12:41 +0000 (01:12 -0700)]
am
b62f48c6: am
a38a1a77: Merge change 27285 into eclair
Merge commit '
b62f48c6d32f74d8683bc300332afd5635af143a'
* commit '
b62f48c6d32f74d8683bc300332afd5635af143a':
b/
2137747 Fixed the problem where BT is stuck grayed out if you turned off BT, turned on Airplane mode, turn off then on screen, turned off Airplane mode.