Commit Graph

1580 Commits

Author SHA1 Message Date
Mike LeBeau
92c3352f89 Add a new "Voice input & output" top-level section of system settings.
This replaces the existing "Text-to-speech" section, placing that
inside, along with a link to the newly exposed voice search settings
(which will soon be expanded) and a link to the LatinIME settings
(pending a link to a new section in LatinIME for just voice settings,
including the comma setting and a new input language setting).

The VoiceSearch and LatinIME links are smart enough to remove themselves
if those don't exist on the device.
2010-01-25 19:30:30 -05:00
Amith Yamasani
7bc9b26b74 Merge "Refactor settings hierarchy and clump all volumes in one dialog." 2010-01-25 15:06:21 -08:00
Amith Yamasani
992f10240d Refactor settings hierarchy and clump all volumes in one dialog.
Bug:2362077 Bug:2312836 Bug:2166486

Split Sound and Display into separate top-level settings.
All volume settings (including Alarm volume) now in one Volume dialog.
Remove some sub-texts to reduce clutter.
2010-01-25 14:58:34 -08:00
Charles Chen
0acb377706 Merge "Changing TextToSpeechSettings to query for the sample text strings provided by plugins rather than using hardcoded sample text." 2010-01-25 14:04:41 -08:00
Charles Chen
4df6c79f41 Changing TextToSpeechSettings to query for the sample text
strings provided by plugins rather than using hardcoded sample
text.
2010-01-25 13:08:08 -08:00
Bjorn Bringert
edc585b644 Merge "Fix GoogleSettings check in PrivacySettings" 2010-01-25 12:45:17 -08:00
Bjorn Bringert
ecfeaffdfa Fix GoogleSettings check in PrivacySettings
GoogleSettingsProvider has moved to a new package as part of unbundling.
This broke the check used to decide whether to show the "Backup my
settings" preference. To make this more robust to package name changes,
I changed the code to look up the settings provider by authority
instead of looking for the package that contains it.

Fixes http://b/issue?id=2390945

Change-Id: Iaec3152faddbd938fc02f9f2dde748819c1d5cdf
2010-01-25 20:39:55 +00:00
Eric Fischer
3587f3d1bb am 6795dd59: (-s ours) am 359b2bcc: Check in translations for new Settings strings. DO NOT MERGE
Merge commit '6795dd59aa1a1d78ea0b3c7fc44107f38cae80d7'

* commit '6795dd59aa1a1d78ea0b3c7fc44107f38cae80d7':
  Check in translations for new Settings strings.  DO NOT MERGE
2010-01-25 09:09:23 -08:00
Michael Chan
4691219ce5 am fcd4e7fe: am 04bdae75: Merge "b/2332395 Fixed a bug where BT is not disabled if the phone was inserted and removed quickly." into eclair
Merge commit 'fcd4e7fec3c80d0a16630246c4942595d34c655c'

* commit 'fcd4e7fec3c80d0a16630246c4942595d34c655c':
  b/2332395 Fixed a bug where BT is not disabled if the phone was inserted and removed quickly.
2010-01-22 18:49:07 -08:00
Amith Yamasani
6043f7f0b3 am b9f29667: am 63c6a309: Merge "Add dock icon for top-level settings. #2367275" into eclair
Merge commit 'b9f2966707004b84760b498d8fc05b3c8f144f59'

* commit 'b9f2966707004b84760b498d8fc05b3c8f144f59':
  Add dock icon for top-level settings. #2367275
2010-01-22 12:36:04 -08:00
Michael Chan
d0c57fdc02 am 97ed3f4b: am 3fe86a34: b/2332395 Disable BT when undocked if BT was off to at docking time unless if 1) the user has manually turned off bt while docked or 2) there\'s a connect device at the time we are ready to turn off bt
Merge commit '97ed3f4b1ce40fd3ec8bc34bf2bfb7438b28afd7'

* commit '97ed3f4b1ce40fd3ec8bc34bf2bfb7438b28afd7':
  b/2332395 Disable BT when undocked if BT was off to at docking time
2010-01-22 12:35:59 -08:00
Amith Yamasani
d4237f884a am 942feaa2: am 6ff80dcf: Fix #2377870 : NPE in Dock settings
Merge commit '942feaa2eff1153564b98a01f644083c1b58cf2d'

* commit '942feaa2eff1153564b98a01f644083c1b58cf2d':
  Fix #2377870 : NPE in Dock settings
2010-01-21 17:54:53 -08:00
Amith Yamasani
2197f83b6b am 39c3d10b: am 0e2ab4f8: New top-level Dock in Settings and a Dock Settings screen with Audio item. #2367275
Merge commit '39c3d10bfccd74b26b045e3d6a712d282fba88d8'

* commit '39c3d10bfccd74b26b045e3d6a712d282fba88d8':
  New top-level Dock in Settings and a Dock Settings screen with Audio item. #2367275
2010-01-21 17:54:47 -08:00
Dianne Hackborn
abc3dc64cf Start hooking up password device policies
This introduces a new activity for changing the password, which takes
care of launching the correct password activity based on the caller's
request and active policy.  The security settings activity now uses
this, and it implements the API action for launching the password UI.
2010-01-21 13:54:44 -08:00
Irfan Sheriff
8e79fda826 am ad76f17a: Remove regulatory group setting in advanced wifi setting
Merge commit 'ad76f17a1c75447047fc2791b65e93341925998b' into eclair-plus-aosp

* commit 'ad76f17a1c75447047fc2791b65e93341925998b':
  Remove regulatory group setting in advanced wifi setting
2010-01-21 10:44:31 -08:00
Irfan Sheriff
ad76f17a1c Remove regulatory group setting in advanced wifi setting
Bug: 2378844
Change-Id: I2eefa73cca238ab04842ffc8f8968dac5f953456
2010-01-21 10:20:43 -08:00
Michael Chan
3a6b2df239 am 324ab848: Merge "b/2370089 Pop the dock dialog above the keyguard" into eclair
Merge commit '324ab8489cdc8ad4bff4e366940fa16e455f5933' into eclair-plus-aosp

* commit '324ab8489cdc8ad4bff4e366940fa16e455f5933':
  b/2370089 Pop the dock dialog above the keyguard
2010-01-20 16:10:29 -08:00
Michael Chan
324ab8489c Merge "b/2370089 Pop the dock dialog above the keyguard" into eclair 2010-01-20 16:06:44 -08:00
Eric Fischer
6795dd59aa am 359b2bcc: Check in translations for new Settings strings. DO NOT MERGE
Merge commit '359b2bccd9b96348d4bad949b000c8310ffe9386' into eclair-plus-aosp

* commit '359b2bccd9b96348d4bad949b000c8310ffe9386':
  Check in translations for new Settings strings.  DO NOT MERGE
2010-01-20 15:59:27 -08:00
Michael Chan
ae3311e5bd b/2370089 Pop the dock dialog above the keyguard
Change-Id: I958ac22defb057fd1ce98a711e3e92073588b1e8
2010-01-20 15:39:13 -08:00
Eric Fischer
359b2bccd9 Check in translations for new Settings strings. DO NOT MERGE 2010-01-20 15:38:48 -08:00
Jim Miller
4cc52da062 Merge "Fix 2385283: Add DevicePolicyManager calls to LockScreen." 2010-01-20 15:12:14 -08:00
Amith Yamasani
874372f8ca am 3b7ffa5e: am 01a868d7: Merge "Strings for new Dock settings screen, to get started on the L10N." into eclair
Merge commit '3b7ffa5eeff9fddbbfdf3c8bdff4b19b1eb7a4df'

* commit '3b7ffa5eeff9fddbbfdf3c8bdff4b19b1eb7a4df':
  Strings for new Dock settings screen, to get started on the L10N.
2010-01-20 14:36:08 -08:00
Michael Chan
4e5d33d49f am 49efbf8b: am c9b9f650: Merge "b/2367861 Auto connect if the user turns on BT while docked." into eclair
Merge commit '49efbf8b5b7a6817a4a1020982cb34f4ca226d48'

* commit '49efbf8b5b7a6817a4a1020982cb34f4ca226d48':
  b/2367861 Auto connect if the user turns on BT while docked.
2010-01-20 14:35:08 -08:00
Jim Miller
47d380f1e6 Fix 2385283: Add DevicePolicyManager calls to LockScreen. 2010-01-20 13:37:14 -08:00
Michael Chan
fcd4e7fec3 am 04bdae75: Merge "b/2332395 Fixed a bug where BT is not disabled if the phone was inserted and removed quickly." into eclair
Merge commit '04bdae750fe47d3a008af92c5bfb5eba1e0e6807' into eclair-plus-aosp

* commit '04bdae750fe47d3a008af92c5bfb5eba1e0e6807':
  b/2332395 Fixed a bug where BT is not disabled if the phone was inserted and removed quickly.
2010-01-20 11:54:51 -08:00
Michael Chan
04bdae750f Merge "b/2332395 Fixed a bug where BT is not disabled if the phone was inserted and removed quickly." into eclair 2010-01-20 11:51:02 -08:00
Amith Yamasani
b9f2966707 am 63c6a309: Merge "Add dock icon for top-level settings. #2367275" into eclair
Merge commit '63c6a30908a14cdc8cccee3f6a3e88275dcec30e' into eclair-plus-aosp

* commit '63c6a30908a14cdc8cccee3f6a3e88275dcec30e':
  Add dock icon for top-level settings. #2367275
2010-01-20 07:45:26 -08:00
Michael Chan
97ed3f4b1c am 3fe86a34: b/2332395 Disable BT when undocked if BT was off to at docking time unless if 1) the user has manually turned off bt while docked or 2) there\'s a connect device at the time we are ready to turn off bt
Merge commit '3fe86a346cdcd41fd9498591571d8b512a130240' into eclair-plus-aosp

* commit '3fe86a346cdcd41fd9498591571d8b512a130240':
  b/2332395 Disable BT when undocked if BT was off to at docking time
2010-01-20 07:45:23 -08:00
Amith Yamasani
63c6a30908 Merge "Add dock icon for top-level settings. #2367275" into eclair 2010-01-20 07:37:33 -08:00
Amith Yamasani
f7c5a11a03 Add dock icon for top-level settings. #2367275
Added mdpi and hdpi icons, and updated settings.xml to point to them.
2010-01-20 06:25:32 -08:00
Michael Chan
c93b82496e b/2332395 Fixed a bug where BT is not disabled if the phone was inserted and removed quickly.
Change-Id: Ifa721afa9c4a9d83a4dd70ed75f5d66ec06a01f6
2010-01-19 22:35:28 -08:00
Michael Chan
3fe86a346c b/2332395 Disable BT when undocked if BT was off to at docking time
unless if 1) the user has manually turned off bt while docked or
2) there's a connect device at the time we are ready to turn off bt

Change-Id: Ic27308688a525120a09a25c9416b3cdc477412ab
2010-01-19 16:15:44 -08:00
Amith Yamasani
942feaa2ef am 6ff80dcf: Fix #2377870 : NPE in Dock settings
Merge commit '6ff80dcf7a9e97545be90a4c8e9a85e8a311de96' into eclair-plus-aosp

* commit '6ff80dcf7a9e97545be90a4c8e9a85e8a311de96':
  Fix #2377870 : NPE in Dock settings
2010-01-18 23:43:05 -08:00
Amith Yamasani
39c3d10bfc am 0e2ab4f8: New top-level Dock in Settings and a Dock Settings screen with Audio item. #2367275
Merge commit '0e2ab4f884e549d7fb21d0227bf5ee61f9f7958a' into eclair-plus-aosp

* commit '0e2ab4f884e549d7fb21d0227bf5ee61f9f7958a':
  New top-level Dock in Settings and a Dock Settings screen with Audio item. #2367275
2010-01-18 23:42:44 -08:00
Dianne Hackborn
feff652132 Initial UI for managing device policies.
More to come...  what is here now is very ugly, and completely missing the
confirmation screen for setting a device administrator.
2010-01-16 18:30:05 -08:00
Amith Yamasani
6ff80dcf7a Fix #2377870 : NPE in Dock settings
If the Dock settings is launched after reboot but before it is docked,
the settings screen crashes because the dock status is not available.

This fixes the case where there was never a pending intent for dock status.
2010-01-15 19:10:55 -08:00
Chia-chi Yeh
feeb756132 WifiEnabler: add support to show supplicant state. 2010-01-16 07:09:20 +08:00
Amith Yamasani
0e2ab4f884 New top-level Dock in Settings and a Dock Settings screen with Audio item. #2367275
Add a new top-level setting for car/desktop dock settings.
Sub menu contains one item - Audio (settings)
Sub text for Audio shows current docked status and launches either the
 audio settings or a dialog saying that you're not docked and you need to
 buy a new dock from Google (kidding).
2010-01-15 11:53:42 -08:00
Amith Yamasani
3b7ffa5eef am 01a868d7: Merge "Strings for new Dock settings screen, to get started on the L10N." into eclair
Merge commit '01a868d73b2c0a8c969a4ad37af0e0a98a9eb156' into eclair-plus-aosp

* commit '01a868d73b2c0a8c969a4ad37af0e0a98a9eb156':
  Strings for new Dock settings screen, to get started on the L10N.
2010-01-14 17:04:45 -08:00
Amith Yamasani
01a868d73b Merge "Strings for new Dock settings screen, to get started on the L10N." into eclair 2010-01-14 16:33:15 -08:00
Amith Yamasani
237749dd85 Strings for new Dock settings screen, to get started on the L10N. 2010-01-14 16:27:37 -08:00
Michael Chan
49efbf8b5b am c9b9f650: Merge "b/2367861 Auto connect if the user turns on BT while docked." into eclair
Merge commit 'c9b9f650fcbce8ba2ab0b2e60e5334b02b4010e5' into eclair-plus-aosp

* commit 'c9b9f650fcbce8ba2ab0b2e60e5334b02b4010e5':
  b/2367861 Auto connect if the user turns on BT while docked.
2010-01-14 15:20:31 -08:00
Michael Chan
c9b9f650fc Merge "b/2367861 Auto connect if the user turns on BT while docked." into eclair 2010-01-14 15:17:30 -08:00
Chia-chi Yeh
b90452f3d2 Settings: revise WifiEnabler and BluetoothEnabler.
This mainly changes the way both enablers react to the airplane mode. Now
enablers show a toast message instead of disabling the check box directly. This
avoids the inconsistent state introduced by WirelessSettings which controls the
check box using layout dependency.

Related bug: 2053751
2010-01-15 06:12:29 +08:00
Michael Chan
845e740fc6 b/2367861 Auto connect if the user turns on BT while docked.
Change-Id: I855d0448af9c9c665fb8288c83cd13ae9c3d6050
2010-01-14 11:26:18 -08:00
Suchi Amalapurapu
e751e555f7 Merge "Change filter options from being menu items to tabbed views. Remove unused strings." 2010-01-12 16:41:21 -08:00
Suchi Amalapurapu
38b8970706 Change filter options from being menu items to tabbed views.
Remove unused strings.
2010-01-12 16:41:45 -08:00
Amith Yamasani
a2e2a21060 am 213c35c0: (-s ours) am d8d21279: Merge "Don\'t allow monkey to play with SIM lock settings. Bug # 2358489. DO NOT MERGE" into eclair
Merge commit '213c35c052375632487469c88227883ff1a0f1ac'

* commit '213c35c052375632487469c88227883ff1a0f1ac':
  Don't allow monkey to play with SIM lock settings. Bug # 2358489. DO NOT MERGE
2010-01-12 16:14:30 -08:00
Amith Yamasani
213c35c052 am d8d21279: Merge "Don\'t allow monkey to play with SIM lock settings. Bug # 2358489. DO NOT MERGE" into eclair
Merge commit 'd8d2127936faac93806e5a64447cee0fd8dd2d62' into eclair-plus-aosp

* commit 'd8d2127936faac93806e5a64447cee0fd8dd2d62':
  Don't allow monkey to play with SIM lock settings. Bug # 2358489. DO NOT MERGE
2010-01-12 16:12:28 -08:00