Commit Graph

569 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
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
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
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
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
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
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
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
Hung-ying Tyan
a3aaf19e09 Fix setting passwd string and vpn checkbox titles.
* Add min length requirement in setting passwd string.
* Do not change vpn checkbox title with state changes.
2009-09-14 11:54:29 +08:00
Jaikumar Ganesh
5f23cb39a1 Modify settings for 2.1
Add incoming pairing dialog
Add DisplayPasskey handling of pairing keyboards with 2.1 devices.
Modify code path to show errors when bonding request fails.
Misc fixes like string changes.
2009-09-11 12:00:14 -07:00
Dianne Hackborn
21ee9c2403 am cded8478: Merge change 24553 into eclair
Merge commit 'cded847838c726342bfe56e69d417d160c73f212' into eclair-plus-aosp

* commit 'cded847838c726342bfe56e69d417d160c73f212':
  Make running services show dependent processes.
2009-09-10 13:05:53 -07:00
Dianne Hackborn
85710167c6 Make running services show dependent processes.
And other various improvement and cleanup.

Change-Id: I0a33ab2876c8f409cd3cfecbbac574563ef1a162
2009-09-10 12:08:53 -07:00
Hung-ying Tyan
6cdd5e8bc4 am f71c8b40: Add install-cert-from-sdcard in Security settings
Merge commit 'f71c8b40b5a92e21d09dd75880e16aa857c1b6cb' into eclair-plus-aosp

* commit 'f71c8b40b5a92e21d09dd75880e16aa857c1b6cb':
  Add install-cert-from-sdcard in Security settings
2009-09-10 02:06:34 -07:00
Hung-ying Tyan
f71c8b40b5 Add install-cert-from-sdcard in Security settings
Also:
* Resume keystore states in SecuritySettings.onResume().
* Use action strings defined in CertTool and Keystore.
2009-09-10 12:50:10 +08:00
Jaikumar Ganesh
c93110409c am 6ee7dd09: Merge change 24435 into eclair
Merge commit '6ee7dd09138363737805ae1e6e93649959c6ab83' into eclair-plus-aosp

* commit '6ee7dd09138363737805ae1e6e93649959c6ab83':
  Fix display strings and enter passkey handling.
2009-09-09 15:14:00 -07:00
Jaikumar Ganesh
67efa271bb Fix display strings and enter passkey handling. 2009-09-09 15:03:24 -07:00
Dianne Hackborn
b7558f3700 am 76315391: Improve running services to services managed by the system.
Merge commit '76315391f07d022e31c176633ae3aeaee5bb14ec' into eclair-plus-aosp

* commit '76315391f07d022e31c176633ae3aeaee5bb14ec':
  Improve running services to services managed by the system.
2009-09-03 14:42:34 -07:00
Dianne Hackborn
76315391f0 Improve running services to services managed by the system.
Also a little tweak to the animations preference.

Change-Id: I3183ef21e687a3b120d02c79e7388300084b9202
2009-09-03 13:33:55 -07:00
Jean-Michel Trivi
089e08d8c9 am 5b41931e: Merge change 23701 into eclair
Merge commit '5b41931e1f94b2051b7c015081465f19a33096f9' into eclair-plus-aosp

* commit '5b41931e1f94b2051b7c015081465f19a33096f9':
  Fix bug 2088099 where the TTS example doesn't play in the Settings app
2009-09-03 09:22:38 -07:00
Android (Google) Code Review
5b41931e1f Merge change 23701 into eclair
* changes:
  Fix bug 2088099 where the TTS example doesn't play in the Settings app when the UI is in Japanese. Rewrite of the initialization of the default language in the TTS Settings. The previous implementation had the following issues: - the "Listen to an example" didn't use the default settings - the string used for the example didn't match the selected language  (this was in order to not imply that TTS is doing translation, but   that proved confusing to users). The language initialization is now implemented in initDefaultLang() and ensures that the default locale is one supported in the array of available locales. The speech rate is also initialized from the settings or the default rate (if no value was stored in the settings).
2009-09-03 09:20:15 -07:00
Jean-Michel Trivi
e8e23db707 Fix bug 2088099 where the TTS example doesn't play in the Settings app
when the UI is in Japanese.
Rewrite of the initialization of the default language in the TTS Settings.
The previous implementation had the following issues:
- the "Listen to an example" didn't use the default settings
- the string used for the example didn't match the selected language
 (this was in order to not imply that TTS is doing translation, but
  that proved confusing to users).
The language initialization is now implemented in initDefaultLang()
and ensures that the default locale is one supported in the array
of available locales.
The speech rate is also initialized from the settings or the
default rate (if no value was stored in the settings).
2009-09-02 15:48:32 -07:00
Michael Chan
054509a8d4 am 77395cc3: b/2050798 Bluetooth Passkeys should always be 6 digits so show leading zeros if needed. Removed extra new lines in the passkey and pin dialogs because the string didn\'t fit in landscape mode. (scrollbars to appeared)
Merge commit '77395cc39c88af0bb20ea18af532c87e934fb187' into eclair-plus-aosp

* commit '77395cc39c88af0bb20ea18af532c87e934fb187':
  b/2050798 Bluetooth Passkeys should always be 6 digits so show leading zeros if needed.
2009-09-02 14:11:57 -07:00
Michael Chan
77395cc39c b/2050798 Bluetooth Passkeys should always be 6 digits so show leading zeros if needed.
Removed extra new lines in the passkey and pin dialogs because the string didn't fit in landscape mode. (scrollbars to appeared)
2009-09-02 12:30:05 -07:00
Dianne Hackborn
feab7249a9 am c58c549c: New UI for viewing and stopping currently running services.
Merge commit 'c58c549cc963bd8946d332a0f9945d9a1ed19e99' into eclair-plus-aosp

* commit 'c58c549cc963bd8946d332a0f9945d9a1ed19e99':
  New UI for viewing and stopping currently running services.
2009-09-01 12:34:33 -07:00
Dianne Hackborn
c58c549cc9 New UI for viewing and stopping currently running services.
Change-Id: I86012262635c911be23513aa0b027174b490374d
2009-09-01 12:11:24 -07:00
Jean-Baptiste Queru
f602bc8bee merge from open-source master 2009-09-01 08:28:18 -07:00
Amith Yamasani
f411c9625c Show the Use location prompt only once if user agrees. Bug #1910370 2009-08-31 17:27:53 -07:00
Eric Fischer
fe4ddf853e Armor string format tokens with translation placeholders.
Change-Id: I17df22448834b6d8b35f1d9a803fb4d36dfbb1f2
2009-08-28 13:02:24 -07:00
Hung-ying Tyan
7ca3655dcb Handle two new err codes:
REMOTE_PPP_HUNG_UP and PPP_NEGOTIATION_FAILED.
Also refactor the dialog creation code to directly use the err code as
the dialog id and make it easier to tell which type of dialog (reconnect
or edit) is invoked for which err code.
2009-08-28 11:25:44 +08:00
Eric Fischer
d1de20d883 Fix strings whose apostrophes were eaten because of the lack of a backslash.
Change-Id: I11619ef7bdd0d418e701930ae46b2b9c93ca07ac
2009-08-27 13:52:31 -07:00
Joe LaPenna
626b4a191a Fix grammar in unknown sources dialog. issue 1938 2009-08-24 13:59:02 -07:00
Amith Yamasani
a0dc346f4c Remove summaries from top-level of settings. 2009-08-24 12:52:42 -07:00
Yue Lixin
a41e2f94b7 Implement Bluetooth device picker
Add Bluetooth device picker in Settings
- add resource to support device picker
- show different UI accroding to start Intent
- add OPP profile manager
2009-08-19 20:45:18 -07:00
Romain Guy
e140b09d1d Remove wallpapers picker 2009-08-13 12:52:06 -07:00
Dianne Hackborn
e25e4e4c57 Add new activity for picking live wallpapers. 2009-08-08 21:01:32 -07:00