Debajit Ghosh
00e9be647b
am a6ddefe6: am 99716fb4: updating sync settings icon
...
Merge commit 'a6ddefe68f465a78cf8dcacfbbf0b289816d1d19'
* commit 'a6ddefe68f465a78cf8dcacfbbf0b289816d1d19':
updating sync settings icon
2009-10-01 12:13:27 -07:00
Hung-ying Tyan
b25e22be8a
am 39087f8a: am 8fd062e1: Use the new VpnType.getDescriptionId().
...
Merge commit '39087f8a69ab224f3b067bb79e5cd66fd5e2a3aa'
* commit '39087f8a69ab224f3b067bb79e5cd66fd5e2a3aa':
Use the new VpnType.getDescriptionId().
2009-10-01 11:55:05 -07:00
Mike Cleron
28c6e2e962
am 9c06c4b2: am 08df1488: Newer icons
...
Merge commit '9c06c4b2df16042ca09e4f51c4a86bdb595258de'
* commit '9c06c4b2df16042ca09e4f51c4a86bdb595258de':
Newer icons
2009-10-01 11:54:10 -07:00
Hung-ying Tyan
f10da8fff5
am 06167cc3: am b0883cb3: Fix bugs in credential storage settings:
...
Merge commit '06167cc39569fde2a9bdbff859ff5358f2f90a0b'
* commit '06167cc39569fde2a9bdbff859ff5358f2f90a0b':
Fix bugs in credential storage settings:
2009-10-01 11:49:17 -07:00
Dianne Hackborn
986a88ab79
am 78651523: am cabb147c: Improve running services info.
...
Merge commit '78651523727ee3aadec008faa7ae5a945c51ab69'
* commit '78651523727ee3aadec008faa7ae5a945c51ab69':
Improve running services info.
2009-10-01 11:44:45 -07:00
Jim Miller
1a9f1bd065
am 356ceb58: am be699645: Merge change I56544d0e into eclair
...
Merge commit '356ceb5853243762d00d0c4e1482fbe887f66e3e'
* commit '356ceb5853243762d00d0c4e1482fbe887f66e3e':
Fix for 2137900: Be more conservative about poking the wakelock
2009-10-01 11:40:29 -07:00
Ken Shirriff
9bae0a3178
am f666279a: am eb8d6f78: Merge change Id80d1999 into eclair
...
Merge commit 'f666279a60cd371c938955448453ccac2428b539'
* commit 'f666279a60cd371c938955448453ccac2428b539':
Fix power widget brightness.
2009-10-01 11:38:10 -07:00
Amith Yamasani
b214576f47
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
2009-10-01 11:16:58 -07:00
Mike Cleron
3442d59157
am 31794fa9: am 69c51fea: New icons
...
Merge commit '31794fa97992a7a17a108ac99247ae2c904b8509'
* commit '31794fa97992a7a17a108ac99247ae2c904b8509':
New icons
2009-10-01 11:12:20 -07:00
Debajit Ghosh
a6ddefe68f
am 99716fb4: updating sync settings icon
...
Merge commit '99716fb4b4b0b3ca411dd8e699f5bc34a9c8b1ba' into eclair-plus-aosp
* commit '99716fb4b4b0b3ca411dd8e699f5bc34a9c8b1ba':
updating sync settings icon
2009-09-30 11:43:48 -07:00
Debajit Ghosh
99716fb4b4
updating sync settings icon
2009-09-30 11:01:26 -07:00
Hung-ying Tyan
39087f8a69
am 8fd062e1: Use the new VpnType.getDescriptionId().
...
Merge commit '8fd062e1a5c0047deff1dd817a097b94891000f2' into eclair-plus-aosp
* commit '8fd062e1a5c0047deff1dd817a097b94891000f2':
Use the new VpnType.getDescriptionId().
2009-09-30 03:06:58 -07:00
Hung-ying Tyan
8fd062e1a5
Use the new VpnType.getDescriptionId().
2009-09-30 17:57:56 +08:00
Mike Cleron
9c06c4b2df
am 08df1488: Newer icons
...
Merge commit '08df148848eb72d16564264f02b5424c8203c746' into eclair-plus-aosp
* commit '08df148848eb72d16564264f02b5424c8203c746':
Newer icons
2009-09-30 01:36:04 -07:00
Mike Cleron
08df148848
Newer icons
2009-09-30 01:18:17 -07:00
Hung-ying Tyan
06167cc395
am b0883cb3: Fix bugs in credential storage settings:
...
Merge commit 'b0883cb384fc7ad46e011a72355c9fda924e5b28' into eclair-plus-aosp
* commit 'b0883cb384fc7ad46e011a72355c9fda924e5b28':
Fix bugs in credential storage settings:
2009-09-29 21:54:25 -07:00
Hung-ying Tyan
b0883cb384
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.
2009-09-30 11:56:05 +08:00
Dianne Hackborn
7865152372
am cabb147c: Improve running services info.
...
Merge commit 'cabb147ce57bdcbb6baa08686415ce03f97028d7' into eclair-plus-aosp
* commit 'cabb147ce57bdcbb6baa08686415ce03f97028d7':
Improve running services info.
2009-09-29 18:15:38 -07:00
Dianne Hackborn
cabb147ce5
Improve running services info.
...
Change-Id: I797c76f322b9be7f25a1b695b0332b45bc7e9d4c
2009-09-29 18:04:36 -07:00
Jim Miller
356ceb5853
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
2009-09-29 15:49:00 -07:00
Android (Google) Code Review
be699645db
Merge change I56544d0e into eclair
...
* changes:
Fix for 2137900: Be more conservative about poking the wakelock
2009-09-29 18:41:44 -04:00
Ken Shirriff
f666279a60
am eb8d6f78: Merge change Id80d1999 into eclair
...
Merge commit 'eb8d6f783088a39e243e7be9ac930d198369092a' into eclair-plus-aosp
* commit 'eb8d6f783088a39e243e7be9ac930d198369092a':
Fix power widget brightness.
2009-09-29 14:43:15 -07:00
Android (Google) Code Review
eb8d6f7830
Merge change Id80d1999 into eclair
...
* changes:
Fix power widget brightness.
2009-09-29 17:34:43 -04:00
Jim Miller
56544d0e91
Fix for 2137900: Be more conservative about poking the wakelock
2009-09-29 14:16:53 -07:00
Ken Shirriff
d80d19996a
Fix power widget brightness.
...
If the auto-brightness is cleared, the brightness will drop to 0, so we
need to set it again.
2009-09-29 12:40:45 -07:00
Amith Yamasani
75f25db90d
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
2009-09-29 11:20:59 -07:00
Michael Chan
95f6af7b78
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.
2009-09-29 11:13:37 -07:00
Amith Yamasani
d7705d4cd7
Fix 2147749: Make Settings.ACTION_SOUND_SETTINGS work
...
Added the official action to the Settings manifest.
2009-09-29 11:10:05 -07:00
Roy West
441a157a3a
am dcd813ea: am c63742c8: Merge change I87d7f224 into eclair
...
Merge commit 'dcd813eac8678afaedc35f0271d79f1617cd810d'
* commit 'dcd813eac8678afaedc35f0271d79f1617cd810d':
Correct "on-screen" to "onscreen"; fix tts screen title
2009-09-29 11:08:05 -07:00
Nick Pelly
60fe0f0af6
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
2009-09-29 11:07:19 -07:00
Lixin Yue
366a622551
am 5d6278dd: am 7b576e49: Merge change 27058 into eclair
...
Merge commit '5d6278dd11f2cfcf84fcb21772bab9ec9abbaaad'
* commit '5d6278dd11f2cfcf84fcb21772bab9ec9abbaaad':
Fix device picker minor bug
2009-09-29 11:07:16 -07:00
Suchi Amalapurapu
f6cfb537ad
am b20be6e2: am 5a201b78: Merge change 27473 into eclair
...
Merge commit 'b20be6e24a7b546e413a00c51f8079fa7233651b'
* commit 'b20be6e24a7b546e413a00c51f8079fa7233651b':
Rename empty view so that the standard list view implementation
2009-09-29 11:07:12 -07:00
Mike Cleron
31794fa979
am 69c51fea: New icons
...
Merge commit '69c51fea86c1c29b801c2c369ba1a0ce68dfbaf6' into eclair-plus-aosp
* commit '69c51fea86c1c29b801c2c369ba1a0ce68dfbaf6':
New icons
2009-09-29 00:51:39 -07:00
Mike Cleron
69c51fea86
New icons
2009-09-29 00:30:34 -07:00
Michael Chan
26917f1ddd
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.
2009-09-28 17:39:14 -07:00
Michael Chan
e1089ad338
b/2142065 Added Bluetooth API to allow developer to request the user's permission to enable discovery mode.
...
Change-Id: I6da1598661ad05b4cfd2b7cc81e05d3053df5777
2009-09-28 17:16:23 -07:00
Roy West
dcd813eac8
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
2009-09-28 13:44:51 -07:00
Android (Google) Code Review
c63742c8fa
Merge change I87d7f224 into eclair
...
* changes:
Correct "on-screen" to "onscreen"; fix tts screen title
2009-09-28 16:37:00 -04:00
Nick Pelly
19f8e36b5a
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
2009-09-28 13:19:08 -07:00
Lixin Yue
5d6278dd11
am 7b576e49: Merge change 27058 into eclair
...
Merge commit '7b576e491718e9a6d3f0f66421eddbdfaa853d87' into eclair-plus-aosp
* commit '7b576e491718e9a6d3f0f66421eddbdfaa853d87':
Fix device picker minor bug
2009-09-28 13:19:05 -07:00
Suchi Amalapurapu
b20be6e24a
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
2009-09-28 13:19:01 -07:00
Nick Pelly
079ee952bd
Update application for android.bluetooth.ParcelUuid -> android.os.ParcelUuid
...
Change-Id: Iebf2b3ea9cac224e3e6c67e503b1063491dce5bb
2009-09-28 13:05:28 -07:00
Android (Google) Code Review
7b576e4917
Merge change 27058 into eclair
...
* changes:
Fix device picker minor bug
2009-09-28 14:46:49 -04:00
Android (Google) Code Review
5a201b7872
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
2009-09-28 14:46:24 -04:00
Ken Shirriff
20296766a9
am ea7f30ff: am 5928da68: Merge change 27471 into eclair
...
Merge commit 'ea7f30ffc426e0b251384778b64271261ca82b4c'
* commit 'ea7f30ffc426e0b251384778b64271261ca82b4c':
Fix power widget brightness for Sholes.
2009-09-28 11:42:15 -07:00
Ken Shirriff
ea7f30ffc4
am 5928da68: Merge change 27471 into eclair
...
Merge commit '5928da682a31f3375a206d551c478d76437bb7cf' into eclair-plus-aosp
* commit '5928da682a31f3375a206d551c478d76437bb7cf':
Fix power widget brightness for Sholes.
2009-09-28 11:34:10 -07:00
Suchi Amalapurapu
78c69095ea
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
2009-09-28 11:28:58 -07:00
Android (Google) Code Review
5928da682a
Merge change 27471 into eclair
...
* changes:
Fix power widget brightness for Sholes.
2009-09-28 14:27:15 -04:00
Ken Shirriff
c4a0576473
Fix power widget brightness for Sholes.
...
The widget must disable automatic brightness before modifying the brightness.
2009-09-28 11:17:20 -07:00
jsh
925efec53d
am 57b49b70: am afa9d6ea: Merge change 27283 into eclair
...
Merge commit '57b49b70de0ec6ea7528b44c0b82594c804996b7'
* commit '57b49b70de0ec6ea7528b44c0b82594c804996b7':
Display cell location for CDMA in Phone info screen.
2009-09-28 10:31:14 -07:00