OSDN Git Service
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 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.
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
Eric Fischer [Thu, 17 Sep 2009 22:26:40 +0000 (15:26 -0700)]
am
8b2397f7: (-s ours) am
909a9450: Import revised translations. DO NOT MERGE
Merge commit '
8b2397f734fe0e541eb1629e24b9447e6d482df9'
* commit '
8b2397f734fe0e541eb1629e24b9447e6d482df9':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 17 Sep 2009 22:15:27 +0000 (15:15 -0700)]
am
909a9450: Import revised translations. DO NOT MERGE
Merge commit '
909a945031ec5ec372991de1d2ea1718f494ab9c' into eclair-plus-aosp
* commit '
909a945031ec5ec372991de1d2ea1718f494ab9c':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 17 Sep 2009 21:35:43 +0000 (14:35 -0700)]
Import revised translations. DO NOT MERGE
Dianne Hackborn [Thu, 17 Sep 2009 19:27:09 +0000 (12:27 -0700)]
am
87f0c26b: am
3faa23a2: Use new memory API; show memory used by bg and fg processes.
Merge commit '
87f0c26b31f14860f4db564362087d7bc91f27cb'
* commit '
87f0c26b31f14860f4db564362087d7bc91f27cb':
Use new memory API; show memory used by bg and fg processes.
Dianne Hackborn [Thu, 17 Sep 2009 19:20:04 +0000 (12:20 -0700)]
am
3faa23a2: Use new memory API; show memory used by bg and fg processes.
Merge commit '
3faa23a2b0dcd0a19acf7b24e7eea36d67b4eda1' into eclair-plus-aosp
* commit '
3faa23a2b0dcd0a19acf7b24e7eea36d67b4eda1':
Use new memory API; show memory used by bg and fg processes.
Amith Yamasani [Thu, 17 Sep 2009 19:17:56 +0000 (12:17 -0700)]
Suchi Amalapurapu [Thu, 17 Sep 2009 19:09:38 +0000 (12:09 -0700)]
am
04f3b821: am
5d9ee149: Merge change 25397 into eclair
Merge commit '
04f3b82137ae952f0e0653b9fdd1cf8d8d08afd7'
* commit '
04f3b82137ae952f0e0653b9fdd1cf8d8d08afd7':
Fix issues with updating list when applications get installed while ManageApps is paused or stopped.
Romain Guy [Thu, 17 Sep 2009 19:09:34 +0000 (12:09 -0700)]
am
f48fb571: am
9da119df: Merge change 25387 into eclair
Merge commit '
f48fb571e96696b26c1a0b2badb62bd38fe57a2d'
* commit '
f48fb571e96696b26c1a0b2badb62bd38fe57a2d':
Fix broken 9patch for hdpi.
Jaikumar Ganesh [Thu, 17 Sep 2009 19:09:30 +0000 (12:09 -0700)]
am
e60a8ebd: am
bb334392: Merge change 25354 into eclair
Merge commit '
e60a8ebd0e2a1911c0c5ac5f5b1d3e8f1c212cb1'
* commit '
e60a8ebd0e2a1911c0c5ac5f5b1d3e8f1c212cb1':
Fix string name for bluetooth pairing and fix NPE
Debajit Ghosh [Thu, 17 Sep 2009 19:09:26 +0000 (12:09 -0700)]
am
5bfc786e: am
ae57dbd6: make power settings widget toggle sync, not background data
Merge commit '
5bfc786ebe258a349aba57aedbb38717ae696c13'
* commit '
5bfc786ebe258a349aba57aedbb38717ae696c13':
make power settings widget toggle sync, not background data
Dianne Hackborn [Thu, 17 Sep 2009 17:24:34 +0000 (10:24 -0700)]
Use new memory API; show memory used by bg and fg processes.
Change-Id: I449eba1aa4bc1de7537f8c526e27d32c1979d823
Amith Yamasani [Thu, 17 Sep 2009 17:46:44 +0000 (10:46 -0700)]
am
985f5efc: Add "settings" to a bunch of screens. Fix
2110077,
2115734,
2101651
Merge commit '
985f5efc8278e1a5c2170c3aba354a4c9367b741' into eclair-plus-aosp
* commit '
985f5efc8278e1a5c2170c3aba354a4c9367b741':
Add "settings" to a bunch of screens. Fix
2110077,
2115734,
2101651
Amith Yamasani [Wed, 16 Sep 2009 19:43:50 +0000 (12:43 -0700)]
Add "settings" to a bunch of screens. Fix
2110077,
2115734,
2101651
Move Factory data reset to About phone.
Show input method when dialog to enter/edit new dictionary word is displayed.
Add title to Accessibility settings.
Chung-yih Wang [Thu, 17 Sep 2009 16:52:42 +0000 (09:52 -0700)]
am
9752a844: am
dd1bb33e: Merge change 24646 into eclair
Merge commit '
9752a84445f224c28514c19645e8d640068d9df9'
* commit '
9752a84445f224c28514c19645e8d640068d9df9':
Aggregate the security settings for WiFi network configuration.
Mike Lockwood [Thu, 17 Sep 2009 16:52:38 +0000 (09:52 -0700)]
am
c26442e9: am
65f49474: Restore backlight brightness after restoring auto ALS mode.
Merge commit '
c26442e923d9deb5bea3fa78da661b1eb24bd965'
* commit '
c26442e923d9deb5bea3fa78da661b1eb24bd965':
Restore backlight brightness after restoring auto ALS mode.
Hung-ying Tyan [Thu, 17 Sep 2009 16:52:33 +0000 (09:52 -0700)]
am
e74b1c6a: am
10d3cf50: Enable cert install from sdcard in Settings...
Merge commit '
e74b1c6ae4c21d81ad7343e8ac53c259b2b869cf'
* commit '
e74b1c6ae4c21d81ad7343e8ac53c259b2b869cf':
Enable cert install from sdcard in Settings...
Chung-yih Wang [Thu, 17 Sep 2009 16:52:10 +0000 (09:52 -0700)]
am
7b22c686: am
dd498f90: Merge change 24870 into eclair
Merge commit '
7b22c686854263194e37250117c62457f9ba6e89'
* commit '
7b22c686854263194e37250117c62457f9ba6e89':
Transient patch for the WifiConfiguration change.
Suchi Amalapurapu [Thu, 17 Sep 2009 15:46:20 +0000 (08:46 -0700)]
am
5d9ee149: Merge change 25397 into eclair
Merge commit '
5d9ee1490258d56e0e1074b5e9b9a4bff39dd602' into eclair-plus-aosp
* commit '
5d9ee1490258d56e0e1074b5e9b9a4bff39dd602':
Fix issues with updating list when applications get installed while ManageApps is paused or stopped.
Romain Guy [Thu, 17 Sep 2009 15:42:22 +0000 (08:42 -0700)]
am
9da119df: Merge change 25387 into eclair
Merge commit '
9da119dff89ca8433e253dd1df19eaceba8e9641' into eclair-plus-aosp
* commit '
9da119dff89ca8433e253dd1df19eaceba8e9641':
Fix broken 9patch for hdpi.
Jaikumar Ganesh [Thu, 17 Sep 2009 15:41:11 +0000 (08:41 -0700)]
am
bb334392: Merge change 25354 into eclair
Merge commit '
bb3343923c640461eecc4fac25f911224a16d056' into eclair-plus-aosp
* commit '
bb3343923c640461eecc4fac25f911224a16d056':
Fix string name for bluetooth pairing and fix NPE
Debajit Ghosh [Thu, 17 Sep 2009 15:40:17 +0000 (08:40 -0700)]
am
ae57dbd6: make power settings widget toggle sync, not background data
Merge commit '
ae57dbd618decb8cdc942756e283fadef659b2b6' into eclair-plus-aosp
* commit '
ae57dbd618decb8cdc942756e283fadef659b2b6':
make power settings widget toggle sync, not background data
Jaikumar Ganesh [Thu, 17 Sep 2009 13:41:40 +0000 (06:41 -0700)]
am
7b354367: am
a383452a: Merge change 25125 into eclair
Merge commit '
7b354367af8407dd6ee89fe4875047b1134eda9a'
* commit '
7b354367af8407dd6ee89fe4875047b1134eda9a':
Show name for incoming pairing requests.
Mike Lockwood [Thu, 17 Sep 2009 13:39:09 +0000 (06:39 -0700)]
am
5e10e111: am
cd03f532: Move backlight brightness from HardwareService to PowerManager
Merge commit '
5e10e11116087d27c14d1a07d36dc7959af6a97f'
* commit '
5e10e11116087d27c14d1a07d36dc7959af6a97f':
Move backlight brightness from HardwareService to PowerManager
Dan Murphy [Thu, 17 Sep 2009 06:57:34 +0000 (23:57 -0700)]
am
661df9b6: am
a096888f: apps/settings: Add auto/manual brightness control to Brightness settings
Merge commit '
661df9b62ae5a5b0ba0671fd1d38230e6f9c3d7e'
* commit '
661df9b62ae5a5b0ba0671fd1d38230e6f9c3d7e':
apps/settings: Add auto/manual brightness control to Brightness settings
Hung-ying Tyan [Thu, 17 Sep 2009 06:54:02 +0000 (23:54 -0700)]
am
7c20380e: am
a3aaf19e: Fix setting passwd string and vpn checkbox titles.
Merge commit '
7c20380ee1602f03e25583136825304c51fcb794'
* commit '
7c20380ee1602f03e25583136825304c51fcb794':
Fix setting passwd string and vpn checkbox titles.
Jaikumar Ganesh [Thu, 17 Sep 2009 06:53:54 +0000 (23:53 -0700)]
am
1b7ffcf4: (-s ours) am
5f23cb39: Modify settings for 2.1
Merge commit '
1b7ffcf4957191cbd805a4863ece75cd549575e9'
* commit '
1b7ffcf4957191cbd805a4863ece75cd549575e9':
Modify settings for 2.1
Android (Google) Code Review [Thu, 17 Sep 2009 05:05:12 +0000 (01:05 -0400)]
Merge change 25397 into eclair
* changes:
Fix issues with updating list when applications get installed while ManageApps is paused or stopped. When ManageApps gets started, the list of installed apps is retrieved from PackageManager and compared against the old list to figure out newly installed apps(since the app has been stopped) and also to weedout stale entries of packages which might have been deleted. Since the application objects themselves might have changed the list is usually refreshed with new objects. Deleted applications are taken care of right away by just removing from the List adapter. For newly added apps however, the size and label/resource info has to be loaded before being inserted in to the list since the list is already sorted. So just remove these entries from the list for now and let ADD_PKG message handle adding the new elements. Make AppInfo a nested class so that it doesn't hold a reference to its enclosing class and we have too many such entries one for each package.
Suchi Amalapurapu [Wed, 16 Sep 2009 23:38:10 +0000 (16:38 -0700)]
Fix issues with updating list when applications get installed while ManageApps is paused or stopped.
When ManageApps gets started, the list of installed apps is retrieved from PackageManager and
compared against the old list to figure out newly installed apps(since the app has been stopped) and
also to weedout stale entries of packages which might have been deleted.
Since the application objects themselves might have changed the list is usually refreshed with new objects.
Deleted applications are taken care of right away by just removing from the List adapter.
For newly added apps however, the size and label/resource info has to be loaded before being inserted in to
the list since the list is already sorted. So just remove these entries from the list for now and let
ADD_PKG message handle adding the new elements.
Make AppInfo a nested class so that it doesn't hold a reference to its enclosing class and
we have too many such entries one for each package.
Android (Google) Code Review [Wed, 16 Sep 2009 23:39:42 +0000 (19:39 -0400)]
Merge change 25387 into eclair
* changes:
Fix broken 9patch for hdpi.
Romain Guy [Wed, 16 Sep 2009 23:39:07 +0000 (16:39 -0700)]
Fix broken 9patch for hdpi.
Change-Id: I88c1bde1b0a19ccd9084889313e64a0a924f4bb0
Android (Google) Code Review [Wed, 16 Sep 2009 22:29:31 +0000 (18:29 -0400)]
Merge change 25354 into eclair
* changes:
Fix string name for bluetooth pairing and fix NPE
Jaikumar Ganesh [Wed, 16 Sep 2009 21:37:13 +0000 (14:37 -0700)]
Fix string name for bluetooth pairing and fix NPE
Change-Id: Ibfd0e1e1ed3e1a1e5939d0bdffd17e2e929317b1
Jaikumar Ganesh [Wed, 16 Sep 2009 21:38:08 +0000 (14:38 -0700)]
Fix pairing string name for bluetooth.
Jaikumar Ganesh [Wed, 16 Sep 2009 18:56:11 +0000 (11:56 -0700)]
resolved conflicts for merge of
1b7ffcf4 to master
Debajit Ghosh [Wed, 16 Sep 2009 02:08:10 +0000 (19:08 -0700)]
make power settings widget toggle sync, not background data
Chung-yih Wang [Wed, 16 Sep 2009 10:32:58 +0000 (03:32 -0700)]
am
dd1bb33e: Merge change 24646 into eclair
Merge commit '
dd1bb33e017a10f800a6da37042a91859acf56e9' into eclair-plus-aosp
* commit '
dd1bb33e017a10f800a6da37042a91859acf56e9':
Aggregate the security settings for WiFi network configuration.
Mike Lockwood [Wed, 16 Sep 2009 10:28:28 +0000 (03:28 -0700)]
am
65f49474: Restore backlight brightness after restoring auto ALS mode.
Merge commit '
65f49474d69ab867d048fc2d6c53d456e585101f' into eclair-plus-aosp
* commit '
65f49474d69ab867d048fc2d6c53d456e585101f':
Restore backlight brightness after restoring auto ALS mode.
Android (Google) Code Review [Wed, 16 Sep 2009 10:26:54 +0000 (06:26 -0400)]
Merge change 24646 into eclair
* changes:
Aggregate the security settings for WiFi network configuration.
Mike Lockwood [Wed, 16 Sep 2009 10:20:22 +0000 (06:20 -0400)]
Restore backlight brightness after restoring auto ALS mode.
Fixes b/
2121632
Change-Id: I14228a4fd1d599de1e5fdbb3c8b4b3c02a1460ac
Signed-off-by: Mike Lockwood <lockwood@android.com>
Hung-ying Tyan [Wed, 16 Sep 2009 08:27:34 +0000 (01:27 -0700)]
am
10d3cf50: Enable cert install from sdcard in Settings...
Merge commit '
10d3cf5082edb42f196ce0d5ac77c7a12b959599' into eclair-plus-aosp
* commit '
10d3cf5082edb42f196ce0d5ac77c7a12b959599':
Enable cert install from sdcard in Settings...
Hung-ying Tyan [Tue, 15 Sep 2009 09:58:57 +0000 (17:58 +0800)]
Enable cert install from sdcard in Settings...
And remove ADD_CREDENTIAL intent from AndroidManifest.xml.
Chung-yih Wang [Wed, 16 Sep 2009 07:34:32 +0000 (15:34 +0800)]
Aggregate the security settings for WiFi network configuration.
* Merge WPA and WPA2 PSK.
* Merge WPA-EAP and IEEE8021X.
* Remove unused field "private key password" in EAP configuration.
Chung-yih Wang [Wed, 16 Sep 2009 06:40:38 +0000 (23:40 -0700)]
am
dd498f90: Merge change 24870 into eclair
Merge commit '
dd498f901efd7984c38e18b548927c19c2b607f0' into eclair-plus-aosp
* commit '
dd498f901efd7984c38e18b548927c19c2b607f0':
Transient patch for the WifiConfiguration change.
Android (Google) Code Review [Wed, 16 Sep 2009 06:35:42 +0000 (02:35 -0400)]
Merge change 24870 into eclair
* changes:
Transient patch for the WifiConfiguration change.
Jaikumar Ganesh [Tue, 15 Sep 2009 21:40:32 +0000 (14:40 -0700)]
am
a383452a: Merge change 25125 into eclair
Merge commit '
a383452afd6576da5a56c8b1ef73750892e43636' into eclair-plus-aosp
* commit '
a383452afd6576da5a56c8b1ef73750892e43636':
Show name for incoming pairing requests.
Android (Google) Code Review [Tue, 15 Sep 2009 21:36:52 +0000 (17:36 -0400)]
Merge change 25125 into eclair
* changes:
Show name for incoming pairing requests.
Jaikumar Ganesh [Tue, 15 Sep 2009 21:07:22 +0000 (14:07 -0700)]
Show name for incoming pairing requests.
Settings apps invalidates its cache whenever a new scan is started.
When there is a new incoming pairing request, we will not get a DeviceFound
signal, because its not due to a inquiry scan. Thus when the pairing request
is displayed, the settings app doesn't have it in cache and hence will
just display the address. Make it query the framework when it doesn't have the name.
Mike Lockwood [Tue, 15 Sep 2009 20:46:37 +0000 (13:46 -0700)]
am
cd03f532: Move backlight brightness from HardwareService to PowerManager
Merge commit '
cd03f5320d42290b1619933954a344b59dc55f4f' into eclair-plus-aosp
* commit '
cd03f5320d42290b1619933954a344b59dc55f4f':
Move backlight brightness from HardwareService to PowerManager
Nick Pelly [Tue, 15 Sep 2009 20:15:45 +0000 (13:15 -0700)]
am
f9dce06d: am
d6375e97: Merge change 24726 into eclair
Merge commit '
f9dce06d5ee028335ff445335303464ebb403901'
* commit '
f9dce06d5ee028335ff445335303464ebb403901':
Update AndroidManifest.xml for new Intent locations.
Xianzhu Wang [Tue, 15 Sep 2009 20:13:42 +0000 (13:13 -0700)]
am
e8b40cb8: am
88651a0b: Regenerate timezones.xml after adding Asia/Shanghai timezone for mainland China, using cldr 1.7.1 and merging translations for "Beijing".
Merge commit '
e8b40cb857bfaab26f64d688d98b592cca70b089'
* commit '
e8b40cb857bfaab26f64d688d98b592cca70b089':
Regenerate timezones.xml after adding Asia/Shanghai timezone for
Mike Lockwood [Tue, 15 Sep 2009 18:39:47 +0000 (14:39 -0400)]
Move backlight brightness from HardwareService to PowerManager
to prevent apps from changing the hardware behind its back.
Fixes b/
2041941 Lock screen flashes the screen very bright before dimming
Change-Id: Ic4faa008357fd3d74225ba90f05801c5127fd8c0
Signed-off-by: Mike Lockwood <lockwood@android.com>
Dan Murphy [Tue, 15 Sep 2009 14:33:14 +0000 (07:33 -0700)]
am
a096888f: apps/settings: Add auto/manual brightness control to Brightness settings
Merge commit '
a096888f3c7e14723168c323f0ffdb2473adf5d3' into eclair-plus-aosp
* commit '
a096888f3c7e14723168c323f0ffdb2473adf5d3':
apps/settings: Add auto/manual brightness control to Brightness settings