Commit Graph

19537 Commits

Author SHA1 Message Date
Roy West
dcd813eac8 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
2009-09-28 13:44:51 -07:00
Android (Google) Code Review
c63742c8fa Merge change I87d7f224 into eclair
* changes:
  Correct "on-screen" to "onscreen"; fix tts screen title
2009-09-28 16:37:00 -04:00
Suchi Amalapurapu
b20be6e24a 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
2009-09-28 13:19:01 -07:00
Suchi Amalapurapu
78c69095ea 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
2009-09-28 11:28:58 -07:00
Hung-ying Tyan
1dad746978 am ad088b68: am 70cef693: Add CredentialInstaller.
Merge commit 'ad088b68b646bfc5195f04b1d7e96a68f8995c54'

* commit 'ad088b68b646bfc5195f04b1d7e96a68f8995c54':
  Add CredentialInstaller.
2009-09-28 10:06:01 -07:00
Roy West
22762e6671 Correct "on-screen" to "onscreen"; fix tts screen title 2009-09-28 07:30:20 -07:00
Wink Saville
1afdb9c13a am bfcb8900: am a40fb237: Add Safety information to Settings > About Phone
Merge commit 'bfcb8900804cc9e7e18ef60805d994dcf53a45c7'

* commit 'bfcb8900804cc9e7e18ef60805d994dcf53a45c7':
  Add Safety information to Settings > About Phone
2009-09-28 01:11:42 -07:00
Hung-ying Tyan
ad088b68b6 am 70cef693: Add CredentialInstaller.
Merge commit '70cef693d133bc66db029bf055c51733ac54c972' into eclair-plus-aosp

* commit '70cef693d133bc66db029bf055c51733ac54c972':
  Add CredentialInstaller.
2009-09-28 01:09:34 -07:00
Dianne Hackborn
185de9d574 am d13e95cc: am 9281c929: Explicitly show plugged state.
Merge commit 'd13e95cc2605c3ffe9d961d2e2c269c9179b5007'

* commit 'd13e95cc2605c3ffe9d961d2e2c269c9179b5007':
  Explicitly show plugged state.
2009-09-28 01:08:12 -07:00
Hung-ying Tyan
70cef693d1 Add CredentialInstaller. 2009-09-28 16:00:04 +08:00
Dan Murphy
ee42c9c1f1 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
2009-09-27 15:38:32 -07:00
Wink Saville
bfcb890080 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
2009-09-27 12:00:01 -07:00
Wink Saville
a40fb23734 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
2009-09-26 21:10:38 -07:00
Dianne Hackborn
d13e95cc26 am 9281c929: Explicitly show plugged state.
Merge commit '9281c929d6e4abf0ddf77d614b2eb57f7528397a' into eclair-plus-aosp

* commit '9281c929d6e4abf0ddf77d614b2eb57f7528397a':
  Explicitly show plugged state.
2009-09-26 13:02:59 -07:00
Dianne Hackborn
9281c929d6 Explicitly show plugged state.
Change-Id: I4592382cdcc9e116d3af102fd76057968a6ea874
2009-09-26 12:44:02 -07:00
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