Commit Graph

317 Commits

Author SHA1 Message Date
Dan Vacura
a89d3d3591 Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Settings into eclair-mr2-plus-aosp 2009-10-06 03:05:02 -07:00
Chia-chi Yeh
02f58e898d SecuritySettings: clean up. 2009-10-02 00:39:14 +08:00
Amith Yamasani
7c8a08d513 am ee52bed5: Merge change I39527366 into eclair
Merge commit 'ee52bed514cbee1fade95a9f862e238c4975cd8b' into eclair-plus-aosp

* commit 'ee52bed514cbee1fade95a9f862e238c4975cd8b':
  Use a custom system icon for native processes.
2009-09-30 21:15:52 -07:00
Mike Cleron
d6372e995c am c5648906: Merge change I00ab9f0b into eclair
Merge commit 'c564890637bf91e92ede27789e4d98863c46e681' into eclair-plus-aosp

* commit 'c564890637bf91e92ede27789e4d98863c46e681':
  Fix widgets
2009-09-30 21:15:36 -07:00
Android (Google) Code Review
ee52bed514 Merge change I39527366 into eclair
* changes:
  Use a custom system icon for native processes.
2009-09-30 21:43:48 -04:00
Amith Yamasani
395273662c Use a custom system icon for native processes.
New icons for system components in Battery Use screen.
2009-09-30 18:42:29 -07:00
Android (Google) Code Review
c564890637 Merge change I00ab9f0b into eclair
* changes:
  Fix widgets
2009-09-30 21:34:36 -04:00
Mike Cleron
00ab9f0b51 Fix widgets 2009-09-30 18:29:25 -07:00
Jaikumar Ganesh
8c5ff4b76a am 1eb1df08: Add strings for authentication type.
Merge commit '1eb1df082d59bdef8b3e0cda6d1af635449833ab' into eclair-plus-aosp

* commit '1eb1df082d59bdef8b3e0cda6d1af635449833ab':
  Add strings for authentication type.
2009-09-30 14:15:29 -07:00
Jaikumar Ganesh
1eb1df082d Add strings for authentication type.
A new field is going to be added to the APN editor.
Authentication type: 4 possible values - None, PAP, CHAP, PAP or CHAP
These strings are too technical for the end user, however these
fields will be pre-populated and the user would not have to change them.

Change-Id: I7df326722fc4aebfe68d2726e2695eda8ea798a9
2009-09-30 13:40:11 -07:00
Debajit Ghosh
a6ddefe68f am 99716fb4: updating sync settings icon
Merge commit '99716fb4b4b0b3ca411dd8e699f5bc34a9c8b1ba' into eclair-plus-aosp

* commit '99716fb4b4b0b3ca411dd8e699f5bc34a9c8b1ba':
  updating sync settings icon
2009-09-30 11:43:48 -07:00
Debajit Ghosh
99716fb4b4 updating sync settings icon 2009-09-30 11:01:26 -07:00
Mike Cleron
9c06c4b2df am 08df1488: Newer icons
Merge commit '08df148848eb72d16564264f02b5424c8203c746' into eclair-plus-aosp

* commit '08df148848eb72d16564264f02b5424c8203c746':
  Newer icons
2009-09-30 01:36:04 -07:00
Mike Cleron
08df148848 Newer icons 2009-09-30 01:18:17 -07:00
Dianne Hackborn
7865152372 am cabb147c: Improve running services info.
Merge commit 'cabb147ce57bdcbb6baa08686415ce03f97028d7' into eclair-plus-aosp

* commit 'cabb147ce57bdcbb6baa08686415ce03f97028d7':
  Improve running services info.
2009-09-29 18:15:38 -07:00
Dianne Hackborn
cabb147ce5 Improve running services info.
Change-Id: I797c76f322b9be7f25a1b695b0332b45bc7e9d4c
2009-09-29 18:04:36 -07:00
Mike Cleron
31794fa979 am 69c51fea: New icons
Merge commit '69c51fea86c1c29b801c2c369ba1a0ce68dfbaf6' into eclair-plus-aosp

* commit '69c51fea86c1c29b801c2c369ba1a0ce68dfbaf6':
  New icons
2009-09-29 00:51:39 -07:00
Mike Cleron
69c51fea86 New icons 2009-09-29 00:30:34 -07:00
Michael Chan
26917f1ddd am e1089ad3: b/2142065 Added Bluetooth API to allow developer to request the user\'s permission to enable discovery mode.
Merge commit 'e1089ad33896f4fe5b75e773813367d700773b6f' into eclair-plus-aosp

* commit 'e1089ad33896f4fe5b75e773813367d700773b6f':
  b/2142065 Added Bluetooth API to allow developer to request the user's permission to enable discovery mode.
2009-09-28 17:39:14 -07:00
Michael Chan
e1089ad338 b/2142065 Added Bluetooth API to allow developer to request the user's permission to enable discovery mode.
Change-Id: I6da1598661ad05b4cfd2b7cc81e05d3053df5777
2009-09-28 17:16:23 -07:00
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
Roy West
22762e6671 Correct "on-screen" to "onscreen"; fix tts screen title 2009-09-28 07:30:20 -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
Hung-ying Tyan
70cef693d1 Add CredentialInstaller. 2009-09-28 16:00:04 +08: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
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
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
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
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
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