OSDN Git Service
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
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.
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: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: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.
Roy West [Sun, 27 Sep 2009 19:01:46 +0000 (12:01 -0700)]
Correct "on-screen" to "onscreen"; fix tts screen title
Hung-ying Tyan [Mon, 28 Sep 2009 08:09:34 +0000 (01:09 -0700)]
am
70cef693: Add CredentialInstaller.
Merge commit '
70cef693d133bc66db029bf055c51733ac54c972' into eclair-plus-aosp
* commit '
70cef693d133bc66db029bf055c51733ac54c972':
Add CredentialInstaller.
Hung-ying Tyan [Mon, 28 Sep 2009 02:14:18 +0000 (10:14 +0800)]
Add CredentialInstaller.
Michael Chan [Sun, 27 Sep 2009 20:01:13 +0000 (13:01 -0700)]
am
a38a1a77: Merge change 27285 into eclair
Merge commit '
a38a1a77ab36e6779790401c3a02604e428ac58b' into eclair-plus-aosp
* commit '
a38a1a77ab36e6779790401c3a02604e428ac58b':
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.
Android (Google) Code Review [Sun, 27 Sep 2009 19:53:43 +0000 (15:53 -0400)]
Merge change 27285 into eclair
* changes:
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.
Michael Chan [Sun, 27 Sep 2009 19:46:51 +0000 (12:46 -0700)]
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.
Change-Id: I37c628e4a98157ed91d519518773a458dca36c00
jsh [Thu, 24 Sep 2009 16:19:22 +0000 (09:19 -0700)]
Display cell location for CDMA in Phone info screen.
Useful for debugging location issues.
b/
2134743
Wink Saville [Sun, 27 Sep 2009 19:00:01 +0000 (12:00 -0700)]
am
a40fb237: Add Safety information to Settings > About Phone
Merge commit '
a40fb23734cc5d5ac6e69a060cbb488269ad8af3' into eclair-plus-aosp
* commit '
a40fb23734cc5d5ac6e69a060cbb488269ad8af3':
Add Safety information to Settings > About Phone
Wink Saville [Sat, 26 Sep 2009 23:47:18 +0000 (16:47 -0700)]
Add Safety information to Settings > About Phone
The Safety information link is stored in a system property, ro.url.safetylegal
If the phone has data connection, select "Safety information" menu will open the
Safety information link. If there is no data connection for the phone, a message will
pop up which ask user to open Safety information link from PC.
Change-Id: Ia46e2e868ebcda93138cb9f00c978d8ac827022a
Dianne Hackborn [Sat, 26 Sep 2009 20:02:59 +0000 (13:02 -0700)]
am
9281c929: Explicitly show plugged state.
Merge commit '
9281c929d6e4abf0ddf77d614b2eb57f7528397a' into eclair-plus-aosp
* commit '
9281c929d6e4abf0ddf77d614b2eb57f7528397a':
Explicitly show plugged state.
Dianne Hackborn [Sat, 26 Sep 2009 19:44:02 +0000 (12:44 -0700)]
Explicitly show plugged state.
Change-Id: I4592382cdcc9e116d3af102fd76057968a6ea874
johnwang [Sat, 26 Sep 2009 01:07:51 +0000 (18:07 -0700)]
am
782d1ae0: Merge change 27181 into eclair
Merge commit '
782d1ae019a81f6c46908f2d056246a344759567' into eclair-plus-aosp
* commit '
782d1ae019a81f6c46908f2d056246a344759567':
Update neighboring cell printout.
Android (Google) Code Review [Sat, 26 Sep 2009 01:01:34 +0000 (21:01 -0400)]
Merge change 27181 into eclair
* changes:
Update neighboring cell printout.
johnwang [Sat, 26 Sep 2009 00:26:54 +0000 (17:26 -0700)]
Update neighboring cell printout.
johnwang [Fri, 25 Sep 2009 23:11:35 +0000 (16:11 -0700)]
am
7ac8e67e: Merge change 26706 into eclair
Merge commit '
7ac8e67e58f1433c61414cdd79281097c04ead86' into eclair-plus-aosp
* commit '
7ac8e67e58f1433c61414cdd79281097c04ead86':
Format cleanup.
Android (Google) Code Review [Fri, 25 Sep 2009 23:06:18 +0000 (19:06 -0400)]
Merge change 26706 into eclair
* changes:
Format cleanup.
Dan Murphy [Fri, 25 Sep 2009 21:18:56 +0000 (14:18 -0700)]
am
22e18689: packages/apps/Setting: Make vkey button haptics part of global haptic setting
Merge commit '
22e186898e47cf35a49e73494bf11695c854d284' into eclair-plus-aosp
* commit '
22e186898e47cf35a49e73494bf11695c854d284':
packages/apps/Setting: Make vkey button haptics part of global haptic setting
johnwang [Wed, 23 Sep 2009 23:22:34 +0000 (16:22 -0700)]
Format cleanup.
Remove tailing white space.
Dan Murphy [Tue, 22 Sep 2009 16:47:08 +0000 (11:47 -0500)]
packages/apps/Setting: Make vkey button haptics part of global haptic setting
This change ties the virtual key haptics to the global haptics settings
Signed-off-by: Dan Murphy <D.Murphy@motorola.com>
Jaikumar Ganesh [Fri, 25 Sep 2009 17:34:20 +0000 (10:34 -0700)]
am
51a81002: Merge change 27057 into eclair
Merge commit '
51a81002ec11b4aa57eadf40ad10aa09248381a0' into eclair-plus-aosp
* commit '
51a81002ec11b4aa57eadf40ad10aa09248381a0':
Restrict Bluetooth adapater name length to 200 characters.
Android (Google) Code Review [Fri, 25 Sep 2009 17:28:10 +0000 (13:28 -0400)]
Merge change 27057 into eclair
* changes:
Restrict Bluetooth adapater name length to 200 characters.
Lixin Yue [Tue, 22 Sep 2009 02:44:51 +0000 (10:44 +0800)]
Fix device picker minor bug
When in device picker screen, if other device triggers pairing process with own
device, after paired succssfully, it should not send intent to OppReceiver to
start file sending. We need check if the paired device is the one user selected.
Original Author: Lixin Yue
Modified by: Jaikumar Ganesh (jaikumar@google.com)
Change-Id: I32df995ba94417470cccaead492844a9c61c0846
Jaikumar Ganesh [Fri, 25 Sep 2009 16:54:35 +0000 (09:54 -0700)]
Restrict Bluetooth adapater name length to 200 characters.
The max allowed as per spec is 248.
Change-Id: I287fb7f861a30e736d6078923712433c52f3031a
Suchi Amalapurapu [Fri, 25 Sep 2009 17:19:29 +0000 (10:19 -0700)]
am
0f8e20f1: Merge change 26713 into eclair
Merge commit '
0f8e20f122b9f7ec323c28c6a3d61fd2ac78b71e' into eclair-plus-aosp
* commit '
0f8e20f122b9f7ec323c28c6a3d61fd2ac78b71e':
Set selection in single choice list.
Michael Chan [Fri, 25 Sep 2009 17:19:24 +0000 (10:19 -0700)]
am
776dcff1: Merge change 26878 into eclair
Merge commit '
776dcff14387140721d46ccd97cf51ce81be7f85' into eclair-plus-aosp
* commit '
776dcff14387140721d46ccd97cf51ce81be7f85':
b/
2140751 Fixed the problem where BT device icon was showing until pairing happens (actually UUID comes in to be exact)
Android (Google) Code Review [Fri, 25 Sep 2009 17:16:26 +0000 (13:16 -0400)]
Merge change 26713 into eclair
* changes:
Set selection in single choice list. Reorder the menu entries to use the menu options as indices into the choice box directly
Android (Google) Code Review [Fri, 25 Sep 2009 17:12:40 +0000 (13:12 -0400)]
Merge change 26878 into eclair
* changes:
b/
2140751 Fixed the problem where BT device icon was showing until pairing happens (actually UUID comes in to be exact)
Michael Chan [Thu, 24 Sep 2009 18:39:34 +0000 (11:39 -0700)]
b/
2140751 Fixed the problem where BT device icon was showing until pairing happens (actually UUID comes in to be exact)
Change-Id: I670f29d5f9a577ec177b049cfd9c775bf91b60c3
Amith Yamasani [Fri, 25 Sep 2009 01:59:55 +0000 (18:59 -0700)]
am
f73cdd4d: New icon for Privacy. Also, forgot to remove Factory reset from About phone.
Merge commit '
f73cdd4dd09d585cf59c3c91872bc21449491b03' into eclair-plus-aosp
* commit '
f73cdd4dd09d585cf59c3c91872bc21449491b03':
New icon for Privacy.
Amith Yamasani [Fri, 25 Sep 2009 01:41:40 +0000 (18:41 -0700)]
New icon for Privacy.
Also, forgot to remove Factory reset from About phone.
Michael Chan [Thu, 24 Sep 2009 18:52:22 +0000 (11:52 -0700)]
am
f2f3ceeb: b/
2138890 Pre-initilize Bluetooth profile managers
Merge commit '
f2f3ceebbdf724e8904712a2a21cb0e677b7ea0d' into eclair-plus-aosp
* commit '
f2f3ceebbdf724e8904712a2a21cb0e677b7ea0d':
b/
2138890 Pre-initilize Bluetooth profile managers
Michael Chan [Thu, 24 Sep 2009 14:45:49 +0000 (07:45 -0700)]
b/
2138890 Pre-initilize Bluetooth profile managers
Change-Id: I633202457ca445308ec35b99260e603a85451042
Dianne Hackborn [Thu, 24 Sep 2009 06:27:50 +0000 (23:27 -0700)]
am
ec54997a: Fix issue #
2133206: dialogs/menus should auto-dismiss when screen turns off
Merge commit '
ec54997a04307887b709c607808dace00df2f138' into eclair-plus-aosp
* commit '
ec54997a04307887b709c607808dace00df2f138':
Fix issue #
2133206: dialogs/menus should auto-dismiss when screen turns off
Dianne Hackborn [Thu, 24 Sep 2009 05:24:22 +0000 (22:24 -0700)]
Fix issue #
2133206: dialogs/menus should auto-dismiss when screen turns off
These dialogs should clear.
Change-Id: Ie78212c1bd112d1f2f7a05f2d23eb9b5c9f02131
Suchi Amalapurapu [Wed, 23 Sep 2009 23:33:56 +0000 (16:33 -0700)]
Set selection in single choice list.
Reorder the menu entries to use the menu options as indices into
the choice box directly
Amith Yamasani [Wed, 23 Sep 2009 22:32:53 +0000 (15:32 -0700)]
am
e65c943f: New Privacy settings screen and Backup settings toggle. See #
2132044 & #
2133178
Merge commit '
e65c943f974966e21c6f18dc9a95107ea1f07631' into eclair-plus-aosp
* commit '
e65c943f974966e21c6f18dc9a95107ea1f07631':
New Privacy settings screen and Backup settings toggle. See #
2132044 & #
2133178
Amith Yamasani [Tue, 22 Sep 2009 20:50:19 +0000 (13:50 -0700)]
New Privacy settings screen and Backup settings toggle. See #
2132044 & #
2133178
Also fixes
2138367: Share with Google setting doesn't get updated on checking the setting
And
2098232: "Set unlock pattern" should be at the top of the section
Roy West [Wed, 23 Sep 2009 21:52:24 +0000 (14:52 -0700)]
am
0ce6f6db: Search and rewrite some uses of select and disable for touch and use.
Merge commit '
0ce6f6dbc842b4a9fce0c34850b17bf543a12ed0' into eclair-plus-aosp
* commit '
0ce6f6dbc842b4a9fce0c34850b17bf543a12ed0':
Search and rewrite some uses of select and disable for touch and use.
Roy West [Wed, 23 Sep 2009 20:07:19 +0000 (13:07 -0700)]
Search and rewrite some uses of select and disable for touch and use.
Jaikumar Ganesh [Wed, 23 Sep 2009 17:49:46 +0000 (10:49 -0700)]
am
1bfe73d0: Filter devices by UUID and then class.
Merge commit '
1bfe73d0b1d338f3c16a8177eb8de509e44a5c01' into eclair-plus-aosp
* commit '
1bfe73d0b1d338f3c16a8177eb8de509e44a5c01':
Filter devices by UUID and then class.
Jaikumar Ganesh [Wed, 23 Sep 2009 17:32:41 +0000 (10:32 -0700)]
Filter devices by UUID and then class.
The settings app has been updated to use UUIDs.
When there is a filter type set for device picket UI, use the
UUIDs first and then the class bits.
Change-Id: Ifde5dbc3a1cf25babce4c686002315aa3933de59
Michael Chan [Tue, 22 Sep 2009 22:51:00 +0000 (15:51 -0700)]
am
90456311: Merge change 26396 into eclair
Merge commit '
9045631186a4f7fcf49a3f4700276ad8fbcab90c' into eclair-plus-aosp
* commit '
9045631186a4f7fcf49a3f4700276ad8fbcab90c':
b/
2126036 Improve remote device capability identification by switching to use UUIDs instead of class bits.
Android (Google) Code Review [Tue, 22 Sep 2009 22:38:45 +0000 (18:38 -0400)]
Merge change 26396 into eclair
* changes:
b/
2126036 Improve remote device capability identification by switching to use UUIDs instead of class bits.
Michael Chan [Mon, 21 Sep 2009 01:18:27 +0000 (18:18 -0700)]
b/
2126036 Improve remote device capability identification by switching to use UUIDs instead of class bits.
Change-Id: Ie60d1c579e40027c2174215c1989887a3250c9bc
Chia-chi Yeh [Tue, 22 Sep 2009 16:08:01 +0000 (09:08 -0700)]
am
031ba6a3: Merge change 26365 into eclair
Merge commit '
031ba6a3648367d307596f11b94367e50651397b' into eclair-plus-aosp
* commit '
031ba6a3648367d307596f11b94367e50651397b':
SecuritySettings: use Credentials instead of CertTool.
Chia-chi Yeh [Tue, 22 Sep 2009 16:07:57 +0000 (09:07 -0700)]
am
59d1977c: Merge change 26363 into eclair
Merge commit '
59d1977ccd2ad686c39770aad31cae04a5c8d457' into eclair-plus-aosp
* commit '
59d1977ccd2ad686c39770aad31cae04a5c8d457':
WifiSettings: use Credentials instead of CertTool.
Chia-chi Yeh [Tue, 22 Sep 2009 16:07:54 +0000 (09:07 -0700)]
am
cb41032d: Merge change 26186 into eclair
Merge commit '
cb41032d85e2538c0a0a85f72656891c6203dc9b' into eclair-plus-aosp
* commit '
cb41032d85e2538c0a0a85f72656891c6203dc9b':
Settings: revise VpnSettings.
Android (Google) Code Review [Tue, 22 Sep 2009 16:03:17 +0000 (12:03 -0400)]
Merge change 26365 into eclair
* changes:
SecuritySettings: use Credentials instead of CertTool.
Android (Google) Code Review [Tue, 22 Sep 2009 16:02:57 +0000 (12:02 -0400)]
Merge change 26363 into eclair
* changes:
WifiSettings: use Credentials instead of CertTool.
Android (Google) Code Review [Tue, 22 Sep 2009 16:02:34 +0000 (12:02 -0400)]
Merge change 26186 into eclair
* changes:
Settings: revise VpnSettings.
Chia-chi Yeh [Tue, 22 Sep 2009 15:59:01 +0000 (23:59 +0800)]
SecuritySettings: use Credentials instead of CertTool.
Also remove unused classes which will be replaced by CertInstaller.
Chia-chi Yeh [Tue, 22 Sep 2009 15:44:17 +0000 (23:44 +0800)]
WifiSettings: use Credentials instead of CertTool.
Dianne Hackborn [Tue, 22 Sep 2009 00:39:53 +0000 (17:39 -0700)]
am
8c212ef4: Remove long animation setting (standard length is now longer).
Merge commit '
8c212ef4cfd911ba80dd256cab7a3f997e2cb8cc' into eclair-plus-aosp
* commit '
8c212ef4cfd911ba80dd256cab7a3f997e2cb8cc':
Remove long animation setting (standard length is now longer).
Ken Shirriff [Tue, 22 Sep 2009 00:39:49 +0000 (17:39 -0700)]
am
7d1e0865: Adjust widget size.
Merge commit '
7d1e086504c6bd3bdeb52f137fde1380d1288aa1' into eclair-plus-aosp
* commit '
7d1e086504c6bd3bdeb52f137fde1380d1288aa1':
Adjust widget size.
Dianne Hackborn [Mon, 21 Sep 2009 07:37:32 +0000 (00:37 -0700)]
Remove long animation setting (standard length is now longer).
Also a few tweaks to the running services UI.
Change-Id: I160dc5fd52a865ca95288aad787e28b814080c53
Chia-chi Yeh [Mon, 21 Sep 2009 18:28:14 +0000 (02:28 +0800)]
Settings: revise VpnSettings.
Ken Shirriff [Sun, 20 Sep 2009 22:21:28 +0000 (15:21 -0700)]
Adjust widget size.
Without this change, the widget cannot be placed on the home screen in
landscape mode because it's thought to be too big.
Suchi Amalapurapu [Mon, 21 Sep 2009 16:30:20 +0000 (09:30 -0700)]
am
9e710510: Merge change 26022 into eclair
Merge commit '
9e7105108ba0aecc961b2ecc3003a57242c982bc' into eclair-plus-aosp
* commit '
9e7105108ba0aecc961b2ecc3003a57242c982bc':
Change default filter to third party when launched via settings and all apps when launched via
Android (Google) Code Review [Mon, 21 Sep 2009 16:23:14 +0000 (12:23 -0400)]
Merge change 26022 into eclair
* changes:
Change default filter to third party when launched via settings and all apps when launched via low storage. Update string name. fix padding for Force Stop button Change message when clearing application data.
Chung-yih Wang [Mon, 21 Sep 2009 10:49:13 +0000 (03:49 -0700)]
am
e32e8baa: Fix the typo in phase2 options.
Merge commit '
e32e8baa44f10749518cffdc6a9a47130fb3e19d' into eclair-plus-aosp
* commit '
e32e8baa44f10749518cffdc6a9a47130fb3e19d':
Fix the typo in phase2 options.
Chung-yih Wang [Mon, 21 Sep 2009 10:42:55 +0000 (18:42 +0800)]
Fix the typo in phase2 options.
MSCHAP2 => MSCHAPV2
Amith Yamasani [Mon, 21 Sep 2009 00:03:52 +0000 (17:03 -0700)]
am
d459bebd: Use the ratio of different CPU speeds to compute CPU power consumption per app.
Merge commit '
d459bebd89756a8b735feb6f27bd864b0427feb7' into eclair-plus-aosp
* commit '
d459bebd89756a8b735feb6f27bd864b0427feb7':
Use the ratio of different CPU speeds to compute CPU power consumption per app.
Amith Yamasani [Sun, 20 Sep 2009 22:52:35 +0000 (15:52 -0700)]
Use the ratio of different CPU speeds to compute CPU power consumption per app.
Suchi Amalapurapu [Sun, 20 Sep 2009 21:25:46 +0000 (14:25 -0700)]
Change default filter to third party when launched via settings and all apps when launched via
low storage. Update string name.
fix padding for Force Stop button
Change message when clearing application data.
OSDN Git Service
