OSDN Git Service
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)]
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.
Wink Saville [Mon, 28 Sep 2009 08:11:42 +0000 (01:11 -0700)]
am
bfcb8900: am
a40fb237: Add Safety information to Settings > About Phone
Merge commit '
bfcb8900804cc9e7e18ef60805d994dcf53a45c7'
* commit '
bfcb8900804cc9e7e18ef60805d994dcf53a45c7':
Add Safety information to Settings > About Phone
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.
Dianne Hackborn [Mon, 28 Sep 2009 08:08:12 +0000 (01:08 -0700)]
am
d13e95cc: am
9281c929: Explicitly show plugged state.
Merge commit '
d13e95cc2605c3ffe9d961d2e2c269c9179b5007'
* commit '
d13e95cc2605c3ffe9d961d2e2c269c9179b5007':
Explicitly show plugged state.
Hung-ying Tyan [Mon, 28 Sep 2009 02:14:18 +0000 (10:14 +0800)]
Add CredentialInstaller.
johnwang [Sun, 27 Sep 2009 22:43:24 +0000 (15:43 -0700)]
am
fd5e1e94: am
782d1ae0: Merge change 27181 into eclair
Merge commit '
fd5e1e9453d51b227e8f2fb6852098f94e5a7eed'
* commit '
fd5e1e9453d51b227e8f2fb6852098f94e5a7eed':
Update neighboring cell printout.
johnwang [Sun, 27 Sep 2009 22:41:14 +0000 (15:41 -0700)]
Dan Murphy [Sun, 27 Sep 2009 22:38:32 +0000 (15:38 -0700)]
am
72233c9d: am
22e18689: packages/apps/Setting: Make vkey button haptics part of global haptic setting
Merge commit '
72233c9d02f27a21d03f8560cc50132168cf6464'
* commit '
72233c9d02f27a21d03f8560cc50132168cf6464':
packages/apps/Setting: Make vkey button haptics part of global haptic setting
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 18:26:30 +0000 (11:26 -0700)]
am
44c2220f: am
51a81002: Merge change 27057 into eclair
Merge commit '
44c2220f2e2c8217a4cf05e7074ee4e7fb95ec11'
* commit '
44c2220f2e2c8217a4cf05e7074ee4e7fb95ec11':
Restrict Bluetooth adapater name length to 200 characters.
Suchi Amalapurapu [Fri, 25 Sep 2009 18:26:08 +0000 (11:26 -0700)]
am
60d2ae23: am
0f8e20f1: Merge change 26713 into eclair
Merge commit '
60d2ae2334806d5b1ee3a0a3113b8396103c117a'
* commit '
60d2ae2334806d5b1ee3a0a3113b8396103c117a':
Set selection in single choice list.
Michael Chan [Fri, 25 Sep 2009 18:26:05 +0000 (11:26 -0700)]
am
520c7356: am
776dcff1: Merge change 26878 into eclair
Merge commit '
520c7356cf86b681fc670fce49e2749c9fb2bff0'
* commit '
520c7356cf86b681fc670fce49e2749c9fb2bff0':
b/
2140751 Fixed the problem where BT device icon was showing until pairing happens (actually UUID comes in to be exact)
Amith Yamasani [Fri, 25 Sep 2009 18:16:06 +0000 (11:16 -0700)]
am
7a6341b0: am
f73cdd4d: New icon for Privacy. Also, forgot to remove Factory reset from About phone.
Merge commit '
7a6341b07667e50e6236c481b972e31e9562544f'
* commit '
7a6341b07667e50e6236c481b972e31e9562544f':
New icon for Privacy.
Michael Chan [Fri, 25 Sep 2009 18:07:51 +0000 (11:07 -0700)]
am
05c05254: am
f2f3ceeb: b/
2138890 Pre-initilize Bluetooth profile managers
Merge commit '
05c052541455dea7f00d2bde412bc6bb1686ac72'
* commit '
05c052541455dea7f00d2bde412bc6bb1686ac72':
b/
2138890 Pre-initilize Bluetooth profile managers
Dianne Hackborn [Fri, 25 Sep 2009 18:01:05 +0000 (11:01 -0700)]
am
0fad576c: am
ec54997a: Fix issue #
2133206: dialogs/menus should auto-dismiss when screen turns off
Merge commit '
0fad576cb56669ff070d4cdd571ea220cf43dea4'
* commit '
0fad576cb56669ff070d4cdd571ea220cf43dea4':
Fix issue #
2133206: dialogs/menus should auto-dismiss when screen turns off
Amith Yamasani [Fri, 25 Sep 2009 17:53:45 +0000 (10:53 -0700)]
am
ef83ad69: am
e65c943f: New Privacy settings screen and Backup settings toggle. See #
2132044 & #
2133178
Merge commit '
ef83ad69c79069de13202173351183af46036bfd'
* commit '
ef83ad69c79069de13202173351183af46036bfd':
New Privacy settings screen and Backup settings toggle. See #
2132044 & #
2133178
Roy West [Fri, 25 Sep 2009 17:53:07 +0000 (10:53 -0700)]
am
e7f230a3: am
0ce6f6db: Search and rewrite some uses of select and disable for touch and use.
Merge commit '
e7f230a36332f5cdc1454e9ce44195c01a49806f'
* commit '
e7f230a36332f5cdc1454e9ce44195c01a49806f':
Search and rewrite some uses of select and disable for touch and use.
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.
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
Jaikumar Ganesh [Fri, 25 Sep 2009 15:51:37 +0000 (08:51 -0700)]
am
3c96a621: am
1bfe73d0: Filter devices by UUID and then class.
Merge commit '
3c96a621c0fbe5304dfb73bd5fab3b3c27a3f1dd'
* commit '
3c96a621c0fbe5304dfb73bd5fab3b3c27a3f1dd':
Filter devices by UUID and then class.
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.
Michael Chan [Wed, 23 Sep 2009 18:37:24 +0000 (11:37 -0700)]
am
dd5dd7d9: am
90456311: Merge change 26396 into eclair
Merge commit '
dd5dd7d93dbf895d50b651027ef68a75f1f14a51'
* commit '
dd5dd7d93dbf895d50b651027ef68a75f1f14a51':
b/
2126036 Improve remote device capability identification by switching to use UUIDs instead of class bits.
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:13:35 +0000 (09:13 -0700)]
am
aa3500db: am
031ba6a3: Merge change 26365 into eclair
Merge commit '
aa3500dba73613252adb6964ef7af14bd2d7f6e3'
* commit '
aa3500dba73613252adb6964ef7af14bd2d7f6e3':
SecuritySettings: use Credentials instead of CertTool.
Chia-chi Yeh [Tue, 22 Sep 2009 16:13:31 +0000 (09:13 -0700)]
am
367c7ac8: am
59d1977c: Merge change 26363 into eclair
Merge commit '
367c7ac866063cc1c658457c55f2dde55c6a3785'
* commit '
367c7ac866063cc1c658457c55f2dde55c6a3785':
WifiSettings: use Credentials instead of CertTool.
Chia-chi Yeh [Tue, 22 Sep 2009 16:13:27 +0000 (09:13 -0700)]
am
3f85d8e8: am
cb41032d: Merge change 26186 into eclair
Merge commit '
3f85d8e8ddbfe63f6366dd180cbb63d7b56a5b5b'
* commit '
3f85d8e8ddbfe63f6366dd180cbb63d7b56a5b5b':
Settings: revise VpnSettings.
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:46:45 +0000 (17:46 -0700)]
am
30f8a387: am
8c212ef4: Remove long animation setting (standard length is now longer).
Merge commit '
30f8a38786c63796ba9914adfdd45b4134adbbb3'
* commit '
30f8a38786c63796ba9914adfdd45b4134adbbb3':
Remove long animation setting (standard length is now longer).
Ken Shirriff [Tue, 22 Sep 2009 00:46:41 +0000 (17:46 -0700)]
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.
Suchi Amalapurapu [Mon, 21 Sep 2009 16:36:04 +0000 (09:36 -0700)]
am
5466090c: am
9e710510: Merge change 26022 into eclair
Merge commit '
5466090cb8bb8f93423a19902157e6cea8c4fc62'
* commit '
5466090cb8bb8f93423a19902157e6cea8c4fc62':
Change default filter to third party when launched via settings and all apps when launched via
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:53:18 +0000 (03:53 -0700)]
am
451ada66: am
e32e8baa: Fix the typo in phase2 options.
Merge commit '
451ada665d6cc85b0a77643c59a752f7099db812'
* commit '
451ada665d6cc85b0a77643c59a752f7099db812':
Fix the typo in phase2 options.
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:08:08 +0000 (17:08 -0700)]
am
35b21807: am
d459bebd: Use the ratio of different CPU speeds to compute CPU power consumption per app.
Merge commit '
35b21807e81fada6df6d1ab898ed189ec1994d4e'
* commit '
35b21807e81fada6df6d1ab898ed189ec1994d4e':
Use the ratio of different CPU speeds to compute CPU power consumption per app.
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.
Ken Shirriff [Sun, 20 Sep 2009 20:32:56 +0000 (13:32 -0700)]
am
06a20451: am
8cd8b0b7: Merge change 25969 into eclair
Merge commit '
06a20451d88f93fc03367231a8cb97bc793194bf'
* commit '
06a20451d88f93fc03367231a8cb97bc793194bf':
Fix power widget dimensions.
Ken Shirriff [Sun, 20 Sep 2009 20:25:03 +0000 (13:25 -0700)]
am
8cd8b0b7: Merge change 25969 into eclair
Merge commit '
8cd8b0b7edca98b84c5a1f6223ac0b343eb26e8d' into eclair-plus-aosp
* commit '
8cd8b0b7edca98b84c5a1f6223ac0b343eb26e8d':
Fix power widget dimensions.
Android (Google) Code Review [Sun, 20 Sep 2009 20:17:52 +0000 (16:17 -0400)]
Merge change 25969 into eclair
* changes:
Fix power widget dimensions.
Ken Shirriff [Sun, 20 Sep 2009 18:04:05 +0000 (11:04 -0700)]
Fix power widget dimensions.
The widget was taking 2 units vertically on some devices.
Benny Wong [Fri, 18 Sep 2009 17:12:09 +0000 (10:12 -0700)]
am
6c1ac291: am
dc543d28: Fix the issue WiFi UI IP settings lost when change slider state before save IP settings
Merge commit '
6c1ac291d9f8adacc5dd3b8b5f08a11dced53ecb'
* commit '
6c1ac291d9f8adacc5dd3b8b5f08a11dced53ecb':
Fix the issue WiFi UI IP settings lost when change slider state before save IP settings
Benny Wong [Fri, 18 Sep 2009 17:07:00 +0000 (10:07 -0700)]
am
dc543d28: Fix the issue WiFi UI IP settings lost when change slider state before save IP settings
Merge commit '
dc543d289884386faa1361d8fca5536a59c72c1a' into eclair-plus-aosp
* commit '
dc543d289884386faa1361d8fca5536a59c72c1a':
Fix the issue WiFi UI IP settings lost when change slider state before save IP settings
Benny Wong [Thu, 17 Sep 2009 05:41:21 +0000 (00:41 -0500)]
Fix the issue WiFi UI IP settings lost when change slider state before save IP settings
Original GID: 1062
Dianne Hackborn [Fri, 18 Sep 2009 01:13:10 +0000 (18:13 -0700)]
am
9341f5d8: am
f66beeae: Follow along with startActivityPendingIntent() change.
Merge commit '
9341f5d81cffd972281e25b414ecaeb716ab16a8'
* commit '
9341f5d81cffd972281e25b414ecaeb716ab16a8':
Follow along with startActivityPendingIntent() change.
Dianne Hackborn [Fri, 18 Sep 2009 01:08:35 +0000 (18:08 -0700)]
am
f66beeae: Follow along with startActivityPendingIntent() change.
Merge commit '
f66beeaea7d3654bee280644f4edc6d7215b0ee5' into eclair-plus-aosp
* commit '
f66beeaea7d3654bee280644f4edc6d7215b0ee5':
Follow along with startActivityPendingIntent() change.
Dianne Hackborn [Thu, 17 Sep 2009 22:15:46 +0000 (15:15 -0700)]
Follow along with startActivityPendingIntent() change.
Change-Id: I6d804af66deeaf87339eeb548b6a3d2965262f02