Commit Graph

6772 Commits

Author SHA1 Message Date
Dan Murphy
72233c9d02 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
2009-09-25 14:18:56 -07:00
Dan Murphy
22e186898e 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>
2009-09-25 11:36:45 -07:00
Amith Yamasani
89052cbe6d 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.
2009-09-25 11:16:06 -07:00
Amith Yamasani
cfe3c5fcaa 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
2009-09-25 10:53:45 -07:00
Roy West
a400dd3275 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.
2009-09-25 10:53:07 -07:00
Amith Yamasani
7a6341b076 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.
2009-09-24 18:59:55 -07:00
Amith Yamasani
f73cdd4dd0 New icon for Privacy.
Also, forgot to remove Factory reset from About phone.
2009-09-24 18:41:40 -07:00
Amith Yamasani
ef83ad69c7 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
2009-09-23 15:32:53 -07:00
Amith Yamasani
e65c943f97 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
2009-09-23 15:01:11 -07:00
Roy West
e7f230a363 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.
2009-09-23 14:52:24 -07:00
Roy West
0ce6f6dbc8 Search and rewrite some uses of select and disable for touch and use. 2009-09-23 13:07:19 -07: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
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
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
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
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
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
Romain Guy
f48fb571e9 am 9da119df: Merge change 25387 into eclair
Merge commit '9da119dff89ca8433e253dd1df19eaceba8e9641' into eclair-plus-aosp

* commit '9da119dff89ca8433e253dd1df19eaceba8e9641':
  Fix broken 9patch for hdpi.
2009-09-17 08:42:22 -07:00
Dan Murphy
a1e0455013 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
2009-09-16 23:57:34 -07:00
Hung-ying Tyan
2044fa9f06 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.
2009-09-16 23:54:02 -07:00
Romain Guy
32b31cacc5 Fix broken 9patch for hdpi.
Change-Id: I88c1bde1b0a19ccd9084889313e64a0a924f4bb0
2009-09-16 16:39:07 -07:00
Jaikumar Ganesh
435ad270b5 resolved conflicts for merge of 1b7ffcf4 to master 2009-09-16 11:56:11 -07:00
Chung-yih Wang
9752a84445 am dd1bb33e: Merge change 24646 into eclair
Merge commit 'dd1bb33e017a10f800a6da37042a91859acf56e9' into eclair-plus-aosp

* commit 'dd1bb33e017a10f800a6da37042a91859acf56e9':
  Aggregate the security settings for WiFi network configuration.
2009-09-16 03:32:58 -07:00
Chung-yih Wang
98f447fe2d 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.
2009-09-16 15:34:32 +08:00
Xianzhu Wang
8f873a9a5e 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
2009-09-15 13:13:42 -07:00
Dan Murphy
661df9b62a 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
2009-09-15 07:33:14 -07:00
Dan Murphy
a096888f3c apps/settings: Add auto/manual brightness control to Brightness settings
Add changes to have the ability to turn on and off the
automatic light sensing for the device.  This is fully configurable
and is by default not  present.  Vendors should override the ALS setting
to enable the automatic lighting controls.

These changes will add a check box to the Brightness settings menu to give control
to the user to allow the device's display lighting to be controlled via the slide bar
or the auto lighting system.

If the user selects auto then the slide bar will become invisible.  Manual mode
will present the slide bar to the user.

Change-Id: I512c9d5dd72ddd831b33eb8fcd4680e2fc7f786e
Signed-off-by: Dan Murphy <D.Murphy@motorola.com>
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-09-14 21:42:56 -04:00
Hung-ying Tyan
7c20380ee1 am a3aaf19e: Fix setting passwd string and vpn checkbox titles.
Merge commit 'a3aaf19e09806f7e56c59621fc6c17e4429b2e6d' into eclair-plus-aosp

* commit 'a3aaf19e09806f7e56c59621fc6c17e4429b2e6d':
  Fix setting passwd string and vpn checkbox titles.
2009-09-13 23:08:01 -07:00
Jaikumar Ganesh
1b7ffcf495 am 5f23cb39: Modify settings for 2.1
Merge commit '5f23cb39a1bd9c319383108c209fca7f0256894b' into eclair-plus-aosp

* commit '5f23cb39a1bd9c319383108c209fca7f0256894b':
  Modify settings for 2.1
2009-09-13 23:07:55 -07:00