Commit Graph

525 Commits

Author SHA1 Message Date
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
Xianzhu Wang
e8b40cb857 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 '88651a0b2a7a7038c8befb321100a64aec9933b8' into eclair-plus-aosp

* commit '88651a0b2a7a7038c8befb321100a64aec9933b8':
  Regenerate timezones.xml after adding Asia/Shanghai timezone for
2009-09-11 10:34:42 -07:00
Xianzhu Wang
88651a0b2a Regenerate timezones.xml after adding Asia/Shanghai timezone for
mainland China, using cldr 1.7.1 and merging translations for "Beijing".

Remove unused localized timezone "xml-no/timezones.xml".
"nb" is now used instead of the deprecated "no".
2009-09-11 14:41:05 +08:00
Dianne Hackborn
14d8062dc7 am 21ee9c24: am cded8478: Merge change 24553 into eclair
Merge commit '21ee9c240352b66f4f13a3fff80c7322e9745d7a'

* commit '21ee9c240352b66f4f13a3fff80c7322e9745d7a':
  Make running services show dependent processes.
2009-09-10 13:11:21 -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
386d7a004f am 6cdd5e8b: am f71c8b40: Add install-cert-from-sdcard in Security settings
Merge commit '6cdd5e8bc41b92fc8b56f38332f2b8bd9ff2bb66'

* commit '6cdd5e8bc41b92fc8b56f38332f2b8bd9ff2bb66':
  Add install-cert-from-sdcard in Security settings
2009-09-10 09:23:24 -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
5fb6c592de am c9311040: am 6ee7dd09: Merge change 24435 into eclair
Merge commit 'c93110409c05bef4be5428ef36099a586828cbb2'

* commit 'c93110409c05bef4be5428ef36099a586828cbb2':
  Fix display strings and enter passkey handling.
2009-09-09 16:31:11 -07: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
Eric Fischer
76872f5a12 am 140fb90a: Import revised translations. DO NOT MERGE
Merge commit '140fb90a5cfc6e146e006350edfb41a9978ad105' into eclair-plus-aosp

* commit '140fb90a5cfc6e146e006350edfb41a9978ad105':
  Import revised translations.  DO NOT MERGE
2009-09-08 17:09:19 -07:00
Eric Fischer
140fb90a5c Import revised translations. DO NOT MERGE 2009-09-08 16:55:50 -07:00
Dianne Hackborn
b0c72700e0 am b7558f37: am 76315391: Improve running services to services managed by the system.
Merge commit 'b7558f3700c6588e323975af2c24cd7f18ba007a'

* commit 'b7558f3700c6588e323975af2c24cd7f18ba007a':
  Improve running services to services managed by the system.
2009-09-03 14:44:18 -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
c67b4db9ed am 089e08d8: am 5b41931e: Merge change 23701 into eclair
Merge commit '089e08d8c9b323064a75434a68dd76bbbcddbe9f'

* commit '089e08d8c9b323064a75434a68dd76bbbcddbe9f':
  Fix bug 2088099 where the TTS example doesn't play in the Settings app
2009-09-03 09:53:13 -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
6a31073a39 am 054509a8: 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 '054509a8d420feac2b12c1aa46354dd6840505e1'

* commit '054509a8d420feac2b12c1aa46354dd6840505e1':
  b/2050798 Bluetooth Passkeys should always be 6 digits so show leading zeros if needed.
2009-09-02 14:13:38 -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
9e4391d413 am feab7249: am c58c549c: New UI for viewing and stopping currently running services.
Merge commit 'feab7249a970b0670513a35495cbc53bbf909f8e'

* commit 'feab7249a970b0670513a35495cbc53bbf909f8e':
  New UI for viewing and stopping currently running services.
2009-09-01 13:59:28 -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
Jean-Baptiste Queru
e8fa3ddc7a am f602bc8b: merge from open-source master
Merge commit 'f602bc8bee72c9845bd4c2319fdd149ff6861daf'

* commit 'f602bc8bee72c9845bd4c2319fdd149ff6861daf':
  Fix grammar in unknown sources dialog. issue 1938
  screenOrientation written as content instead of attribute by mistake
2009-09-01 12:14:37 -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
c8168ba06e am 71964dd6: Merge change 23372 into eclair
Merge commit '71964dd6598cf2b4744535e537ded21dbffe611c'

* commit '71964dd6598cf2b4744535e537ded21dbffe611c':
  Show the Use location prompt only once if user agrees. Bug #1910370
2009-08-31 17:43:29 -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
Daniel Sandler
bd839196cd am b89653cb: Missing images from change-id I2b9fd2d739085a297ec81ae73eebd60fed4c6896.
Merge commit 'b89653cb954e6945d78a3f2ed876a1760c5d5484'

* commit 'b89653cb954e6945d78a3f2ed876a1760c5d5484':
  Missing images from change-id I2b9fd2d739085a297ec81ae73eebd60fed4c6896.
2009-08-31 16:43:17 -07:00
Daniel Sandler
3cdbc2dfc1 resolved conflicts for merge of 2b9fd2d7 to master 2009-08-31 16:41:57 -04:00
Daniel Sandler
b89653cb95 Missing images from change-id I2b9fd2d739085a297ec81ae73eebd60fed4c6896. 2009-08-31 10:00:50 -04:00
Daniel Sandler
2b9fd2d739 Add missing hdpi frames of the unlock pattern animation. 2009-08-31 09:29:16 -04:00
Daniel Sandler
ca20eb42bc am 98fa0e29: Merge change 23149 into eclair
Merge commit '98fa0e2941a86284d3eaae8c60fbde4a2410b786'

* commit '98fa0e2941a86284d3eaae8c60fbde4a2410b786':
  High-resolution (hdpi) artwork from TAT for Settings.
2009-08-28 13:21:00 -07:00
Android (Google) Code Review
98fa0e2941 Merge change 23149 into eclair
* changes:
  High-resolution (hdpi) artwork from TAT for Settings.
2009-08-28 13:16:27 -07:00
Eric Fischer
22306cd2d1 am fe4ddf85: Armor string format tokens with translation placeholders.
Merge commit 'fe4ddf853e2f6a9797037171e218bf30a25a254f'

* commit 'fe4ddf853e2f6a9797037171e218bf30a25a254f':
  Armor string format tokens with translation placeholders.
2009-08-28 13:08:29 -07:00
Eric Fischer
fe4ddf853e Armor string format tokens with translation placeholders.
Change-Id: I17df22448834b6d8b35f1d9a803fb4d36dfbb1f2
2009-08-28 13:02:24 -07:00
Daniel Sandler
0a9359310d High-resolution (hdpi) artwork from TAT for Settings. 2009-08-28 15:02:50 -04:00
Hung-ying Tyan
174034f3a4 am 7ca3655d: Handle two new err codes:
Merge commit '7ca3655dcb620c8635ad84d1465ab2afc3ef31a0'

* commit '7ca3655dcb620c8635ad84d1465ab2afc3ef31a0':
  Handle two new err codes:
2009-08-27 20:31:17 -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
e0a57efd80 am d1de20d8: Fix strings whose apostrophes were eaten because of the lack of a backslash.
Merge commit 'd1de20d883725ce98931fbebeef9bed8c340352d'

* commit 'd1de20d883725ce98931fbebeef9bed8c340352d':
  Fix strings whose apostrophes were eaten because of the lack of a backslash.
2009-08-27 14:38:34 -07: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
Mike Lockwood
22dbcdc8f8 am cfb4089b: Merge change 22611 into eclair
Merge commit 'cfb4089b372ee6be1c803a7deae56b464dc5d004'

* commit 'cfb4089b372ee6be1c803a7deae56b464dc5d004':
  Hide the "Enable Assisted GPS" checkbox in security & location settings.
2009-08-25 11:58:53 -07:00
Mike Lockwood
7f894124f4 Hide the "Enable Assisted GPS" checkbox in security & location settings.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-25 11:34:56 -07:00