Commit Graph

54699 Commits

Author SHA1 Message Date
Android (Google) Code Review
031ba6a364 Merge change 26365 into eclair
* changes:
  SecuritySettings: use Credentials instead of CertTool.
2009-09-22 12:03:17 -04:00
Android (Google) Code Review
59d1977ccd Merge change 26363 into eclair
* changes:
  WifiSettings: use Credentials instead of CertTool.
2009-09-22 12:02:57 -04:00
Android (Google) Code Review
cb41032d85 Merge change 26186 into eclair
* changes:
  Settings: revise VpnSettings.
2009-09-22 12:02:34 -04:00
Chia-chi Yeh
9cec698a1f SecuritySettings: use Credentials instead of CertTool.
Also remove unused classes which will be replaced by CertInstaller.
2009-09-22 23:59:01 +08:00
Chia-chi Yeh
fc0139aa28 WifiSettings: use Credentials instead of CertTool. 2009-09-22 23:44:17 +08:00
Dianne Hackborn
f5e888cf50 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).
2009-09-21 17:46:45 -07:00
Ken Shirriff
a291e525af am 6b0d2f2c: am 7d1e0865: Adjust widget size.
Merge commit '6b0d2f2c09860c012fa1bebcd34feb4350b7dcbb'

* commit '6b0d2f2c09860c012fa1bebcd34feb4350b7dcbb':
  Adjust widget size.
2009-09-21 17:46:41 -07:00
Dianne Hackborn
30f8a38786 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).
2009-09-21 17:39:53 -07:00
Ken Shirriff
6b0d2f2c09 am 7d1e0865: Adjust widget size.
Merge commit '7d1e086504c6bd3bdeb52f137fde1380d1288aa1' into eclair-plus-aosp

* commit '7d1e086504c6bd3bdeb52f137fde1380d1288aa1':
  Adjust widget size.
2009-09-21 17:39:49 -07:00
Dianne Hackborn
8c212ef4cf Remove long animation setting (standard length is now longer).
Also a few tweaks to the running services UI.

Change-Id: I160dc5fd52a865ca95288aad787e28b814080c53
2009-09-21 15:52:04 -07:00
Chia-chi Yeh
c00b656196 Settings: revise VpnSettings. 2009-09-22 03:05:50 +08:00
Suchi Amalapurapu
fd400d37ff 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
2009-09-21 09:36:04 -07:00
Ken Shirriff
7d1e086504 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.
2009-09-21 09:32:11 -07:00
Suchi Amalapurapu
5466090cb8 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
2009-09-21 09:30:20 -07:00
Android (Google) Code Review
9e7105108b 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.
2009-09-21 12:23:14 -04:00
Chung-yih Wang
833dab7d13 am 451ada66: am e32e8baa: Fix the typo in phase2 options.
Merge commit '451ada665d6cc85b0a77643c59a752f7099db812'

* commit '451ada665d6cc85b0a77643c59a752f7099db812':
  Fix the typo in phase2 options.
2009-09-21 03:53:18 -07:00
Chung-yih Wang
451ada665d am e32e8baa: Fix the typo in phase2 options.
Merge commit 'e32e8baa44f10749518cffdc6a9a47130fb3e19d' into eclair-plus-aosp

* commit 'e32e8baa44f10749518cffdc6a9a47130fb3e19d':
  Fix the typo in phase2 options.
2009-09-21 03:49:13 -07:00
Chung-yih Wang
e32e8baa44 Fix the typo in phase2 options.
MSCHAP2 => MSCHAPV2
2009-09-21 18:42:55 +08:00
Amith Yamasani
660a872c27 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.
2009-09-20 17:08:08 -07:00
Amith Yamasani
35b21807e8 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.
2009-09-20 17:03:52 -07:00
Amith Yamasani
d459bebd89 Use the ratio of different CPU speeds to compute CPU power consumption per app. 2009-09-20 15:57:39 -07:00
Suchi Amalapurapu
fe4a2bc43f 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.
2009-09-20 15:11:44 -07:00
Ken Shirriff
10d9845288 am 06a20451: am 8cd8b0b7: Merge change 25969 into eclair
Merge commit '06a20451d88f93fc03367231a8cb97bc793194bf'

* commit '06a20451d88f93fc03367231a8cb97bc793194bf':
  Fix power widget dimensions.
2009-09-20 13:32:56 -07:00
Ken Shirriff
06a20451d8 am 8cd8b0b7: Merge change 25969 into eclair
Merge commit '8cd8b0b7edca98b84c5a1f6223ac0b343eb26e8d' into eclair-plus-aosp

* commit '8cd8b0b7edca98b84c5a1f6223ac0b343eb26e8d':
  Fix power widget dimensions.
2009-09-20 13:25:03 -07:00
Android (Google) Code Review
8cd8b0b7ed Merge change 25969 into eclair
* changes:
  Fix power widget dimensions.
2009-09-20 16:17:52 -04:00
Ken Shirriff
f16b2e9b63 Fix power widget dimensions.
The widget was taking 2 units vertically on some devices.
2009-09-20 11:04:05 -07:00
Benny Wong
63a43f496c 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
2009-09-18 10:12:09 -07:00
Benny Wong
6c1ac291d9 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
2009-09-18 10:07:00 -07:00
Benny Wong
dc543d2898 Fix the issue WiFi UI IP settings lost when change slider state before save IP settings
Original GID: 1062
2009-09-18 07:54:53 -07:00
Dianne Hackborn
87f23e728e am 9341f5d8: am f66beeae: Follow along with startActivityPendingIntent() change.
Merge commit '9341f5d81cffd972281e25b414ecaeb716ab16a8'

* commit '9341f5d81cffd972281e25b414ecaeb716ab16a8':
  Follow along with startActivityPendingIntent() change.
2009-09-17 18:13:10 -07:00
Dianne Hackborn
9341f5d81c am f66beeae: Follow along with startActivityPendingIntent() change.
Merge commit 'f66beeaea7d3654bee280644f4edc6d7215b0ee5' into eclair-plus-aosp

* commit 'f66beeaea7d3654bee280644f4edc6d7215b0ee5':
  Follow along with startActivityPendingIntent() change.
2009-09-17 18:08:35 -07:00
Dianne Hackborn
f66beeaea7 Follow along with startActivityPendingIntent() change.
Change-Id: I6d804af66deeaf87339eeb548b6a3d2965262f02
2009-09-17 18:01:57 -07:00
Eric Fischer
c419908de7 am 8b2397f7: (-s ours) am 909a9450: Import revised translations. DO NOT MERGE
Merge commit '8b2397f734fe0e541eb1629e24b9447e6d482df9'

* commit '8b2397f734fe0e541eb1629e24b9447e6d482df9':
  Import revised translations.  DO NOT MERGE
2009-09-17 15:26:40 -07:00
Eric Fischer
8b2397f734 am 909a9450: Import revised translations. DO NOT MERGE
Merge commit '909a945031ec5ec372991de1d2ea1718f494ab9c' into eclair-plus-aosp

* commit '909a945031ec5ec372991de1d2ea1718f494ab9c':
  Import revised translations.  DO NOT MERGE
2009-09-17 15:15:27 -07:00
Eric Fischer
909a945031 Import revised translations. DO NOT MERGE 2009-09-17 14:35:43 -07:00
Dianne Hackborn
69cdd4f865 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.
2009-09-17 12:27:09 -07:00
Dianne Hackborn
87f0c26b31 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.
2009-09-17 12:20:04 -07:00
Amith Yamasani
92ee780ecd am 88da45e5: am 985f5efc: Add "settings" to a bunch of screens. Fix 2110077, 2115734, 2101651
Merge commit '88da45e51ba137a7e83992efc9b63babad42d57c'

* commit '88da45e51ba137a7e83992efc9b63babad42d57c':
  Add "settings" to a bunch of screens. Fix 2110077, 2115734, 2101651
2009-09-17 12:17:56 -07:00
Suchi Amalapurapu
4a73085440 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.
2009-09-17 12:09:38 -07:00
Romain Guy
5c2919d6ae am f48fb571: am 9da119df: Merge change 25387 into eclair
Merge commit 'f48fb571e96696b26c1a0b2badb62bd38fe57a2d'

* commit 'f48fb571e96696b26c1a0b2badb62bd38fe57a2d':
  Fix broken 9patch for hdpi.
2009-09-17 12:09:34 -07:00
Jaikumar Ganesh
18f9d189ba am e60a8ebd: am bb334392: Merge change 25354 into eclair
Merge commit 'e60a8ebd0e2a1911c0c5ac5f5b1d3e8f1c212cb1'

* commit 'e60a8ebd0e2a1911c0c5ac5f5b1d3e8f1c212cb1':
  Fix string name for bluetooth pairing and fix NPE
2009-09-17 12:09:30 -07:00
Debajit Ghosh
2633e39108 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
2009-09-17 12:09:26 -07:00
Dianne Hackborn
3faa23a2b0 Use new memory API; show memory used by bg and fg processes.
Change-Id: I449eba1aa4bc1de7537f8c526e27d32c1979d823
2009-09-17 12:07:00 -07:00
Amith Yamasani
88da45e51b 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
2009-09-17 10:46:44 -07:00
Amith Yamasani
985f5efc82 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.
2009-09-17 10:39:10 -07:00
Chung-yih Wang
9e1b267ebb am 9752a844: am dd1bb33e: Merge change 24646 into eclair
Merge commit '9752a84445f224c28514c19645e8d640068d9df9'

* commit '9752a84445f224c28514c19645e8d640068d9df9':
  Aggregate the security settings for WiFi network configuration.
2009-09-17 09:52:42 -07:00
Mike Lockwood
dc4a724c84 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.
2009-09-17 09:52:38 -07:00
Hung-ying Tyan
ccaeeb6e1d am e74b1c6a: am 10d3cf50: Enable cert install from sdcard in Settings...
Merge commit 'e74b1c6ae4c21d81ad7343e8ac53c259b2b869cf'

* commit 'e74b1c6ae4c21d81ad7343e8ac53c259b2b869cf':
  Enable cert install from sdcard in Settings...
2009-09-17 09:52:33 -07:00
Chung-yih Wang
5143dcb0b3 am 7b22c686: am dd498f90: Merge change 24870 into eclair
Merge commit '7b22c686854263194e37250117c62457f9ba6e89'

* commit '7b22c686854263194e37250117c62457f9ba6e89':
  Transient patch for the WifiConfiguration change.
2009-09-17 09:52:10 -07:00
Suchi Amalapurapu
04f3b82137 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.
2009-09-17 08:46:20 -07:00