Commit Graph

237 Commits

Author SHA1 Message Date
Kenny Root
273464d5a1 am aa1f8aee: Clarify backup setting
Merge commit 'aa1f8aeeea1c27fe88270cc8b5df970d9f292385' into froyo-plus-aosp

* commit 'aa1f8aeeea1c27fe88270cc8b5df970d9f292385':
  Clarify backup setting
2010-06-03 15:02:13 -07:00
Kenny Root
aa1f8aeeea Clarify backup setting
Change-Id: Ifb4497e4ea1453b1afbdd08ed08fddb9055b7251
2010-06-03 13:42:12 -07:00
Amith Yamasani
e7739d1ab5 Added an Input Method selector in Language settings
Bug: 2132207 - Settings UI has no way to change IME
2010-06-01 10:22:30 -07:00
Robert Greenwalt
482eadeae8 am e434bfb2: String change - wifi tether = hotspot
Merge commit 'e434bfb216682a6ca331fa54ce58a2bff7adf8d7' into froyo-plus-aosp

* commit 'e434bfb216682a6ca331fa54ce58a2bff7adf8d7':
  String change - wifi tether = hotspot
2010-05-10 10:14:36 -07:00
Robert Greenwalt
e434bfb216 String change - wifi tether = hotspot
bug:2664412
Change-Id: I6ca955e7fcc299ae1d69892c93c9250229610b19
2010-05-08 17:20:26 -07:00
Amith Yamasani
567ca0805e am 64ab5338: Fix regression in removing settings that aren\'t relevant for a platform.
Merge commit '64ab5338cb0f90f8ee0787b0b98611670e6dee7e' into froyo-plus-aosp

* commit '64ab5338cb0f90f8ee0787b0b98611670e6dee7e':
  Fix regression in removing settings that aren't relevant for a platform.
2010-04-27 15:08:20 -07:00
Amith Yamasani
64ab5338cb Fix regression in removing settings that aren't relevant for a platform.
Bug: 2630695

The PreferenceCategories added into the hierarchy caused removePreference() to
not work, since the preferences to be removed were not immediate children of
the preference screen.

Create empty PreferenceCategory elements and pull the preferences to the same
depth as the categories.

Change-Id: I34826ea4d84cda0ecab75c66a73febe3d51e7c68
2010-04-27 13:35:12 -07:00
Daniel Sandler
dd3791844f am f0746678: Merge "Redesign vibration settings." into froyo
Merge commit 'f07466782bb25ce4f2738133d0992f3531af28e5' into froyo-plus-aosp

* commit 'f07466782bb25ce4f2738133d0992f3531af28e5':
  Redesign vibration settings.
2010-04-21 18:15:40 -07:00
Daniel Sandler
9e2810bbed am 19340d21: Merge "Labeled categories to help clarify Sound prefs." into froyo
Merge commit '19340d213c4bd4428f940a12d82a494f9e7cfaa6' into froyo-plus-aosp

* commit '19340d213c4bd4428f940a12d82a494f9e7cfaa6':
  Labeled categories to help clarify Sound prefs.
2010-04-21 18:15:38 -07:00
Daniel Sandler
2c917847f5 Redesign vibration settings.
Under the hood there remain three axes:
 1. Are we in silent mode now?      | RINGER_MODE_{VIBRATE,SILENT}
 2. Do we vibrate in silent mode?   | VIBRATE_IN_SILENT == 1
 3. Do calls vibrate:     | getVibrateSetting(VIBRATE_TYPE_RINGER)
    - always              |    == VIBRATE_SETTING_ON
    - never               |    == VIBRATE_SETTING_OFF
    - only in silent      |    == VIBRATE_SETTING_ONLY_SILENT

We now expose this to the user much more simply by
collapsing (2) and (3) above, and discarding states that
don't make sense:
  - VIBRATE_SETTING_OFF + VIBRATE_IN_SILENT
  - VIBRATE_SETTING_ONLY_SILENT + !VIBRATE_IN_SILENT

Now we offer the user four choices:

    Phone vibrate:
    * "Never"
        --> VIBRATE_IN_SILENT=0, VIBRATE_SETTING_OFF
    * "Always"
        --> VIBRATE_IN_SILENT=1, VIBRATE_SETTING_ON
    * "Only in silent mode"
        --> VIBRATE_IN_SILENT=1, VIBRATE_SETTING_ONLY_SILENT
    * "Only when not in silent mode"
        --> VIBRATE_IN_SILENT=0, VIBRATE_SETTING_ON

This should make it easier to choose exactly the behavior
the user wants as well as avoid nonsensical combinations of
settings.

Bug: 2598014
Change-Id: I9244d25ec97a3e2b572b71b521049debd22fa4e0
2010-04-21 15:29:34 -04:00
The Android Open Source Project
2c3265af74 merge from open-source master
Change-Id: I9d308271306bfcbdc0ef461605f800e5d48334a3
2010-04-21 09:46:57 -07:00
Daniel Sandler
8ad849ca26 Labeled categories to help clarify Sound prefs.
Bug: 2598014
Change-Id: Ia846367fc479345bfd02c10fe1860373719334eb
2010-04-21 08:52:59 -04:00
Mike Lockwood
68b8069862 Display current IP address in advanced Wifi settings screen
Change-Id: I47c6eece376e712b73add72057462926f7b2349f
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-04-20 13:52:38 -04:00
Jim Miller
bbb4afa19f Fix 2579923: Make changing lock screen method more discoverable.
This changes the organization of lock screen security settings
to make choosing an alternate unlock method more discoverable.

Instead of having to disable the old lock method to use a new
one, the user now just has one set/change option in lock settings,
with a list of method-specific setting below it.

In addition, we ask the user to confirm their old credentials
before prompting them to choose a new one, which eliminates one
source of confusion.

Also, ChooseLockGeneric now shows a UI if quality isn't specified.
Any unlock method less secure than minimum specified by
DevicePolicyManager (if active) is greyed out.

Change-Id: Iecc6f64d4d3368a583f06f8d5fe9655cc3d5bd3b
2010-04-11 23:28:33 -07:00
Charles Chen
8c8185b260 Fixing bugs 2577511 and 2581920.
Making sure that the language, country, and variant defaults are always
set to something to ensure that there won't be an NPE.
Dismissing the ListPreference dialogs before a rotation to avoid list
data corruption caused by the list being displayed while its data is
being re-initialized.

Change-Id: Iecdb3b4d415542dc8a4db162c930e6a6570a55f2
2010-04-08 16:51:35 -07:00
Daniel Sandler
7811009111 Restore dependency between volume settings and silent mode.
Volume (of the ringer, notifications, media, and alarms) may
no longer be adjusted while the phone is in silent mode.
This was the behavior in Eclair and earlier releases.

This rolls back a small portion of change I724c43aa in the
interest of stability (see bugs listed below for weirdness
that occurs when the ringer's SeekBarVolumizer is visible
when the ringtone stream is muted).

Bug: 2552268
Bug: 2544706
Change-Id: I4858e6d85e5ec8c4bba83b649e24dd5915252eb2
2010-03-30 14:55:23 -04:00
Charles Chen
7ed0c47ce7 Fixing a bug that causes a crash when Install voice data is clicked
in the TTS settings.

Change-Id: Ia9992f105652518a37ba7e4c139810bfc76c6252
2010-03-18 18:50:32 -07:00
Charles Chen
9bb75d3677 Merge "Adding plugin specific settings to TTS settings + changing the UI to be more like the IME settings." 2010-03-16 20:53:56 -07:00
Charles Chen
0a0eb5f7e8 Adding plugin specific settings to TTS settings + changing the UI
to be more like the IME settings.

Change-Id: I0d26042262b4d9e636d3f456e867c725fa56ae55
2010-03-16 20:32:18 -07:00
Irfan Sheriff
47ebb78954 softAp UI changes
Remove channel settings
Add subtext error handling
Remove WEP, keep WPA2 only for now

Bug: 2413908
Change-Id: Ie867e84a0705f0d2185eeb3a4c86a8227446a338
2010-03-16 16:03:13 -07:00
Robert Greenwalt
c3c93e5c62 Add Tether Help UI.
Add a "Help" button to the tethering page that loads on-device html.

Change-Id: I816ec552a4433296a6cb57345a37611eb2a92b37
2010-03-15 17:21:16 -07:00
David Brown
6e101d125a Add "Power button ends call" accessibility setting.
This is part 3 of the fix for bug 2364220 "Accessibility improvements for
ending calls".

This change adds a checkbox under "Accessibility settings" to control the
new Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR value, which allows the
user to specify that the Power button should hang up while in-call
(instead of just turning off the screen.)  The checkbox is only shown on
devices that actually have a POWER button.

Yeah, it's a little strange having this under Accessibility (since it's not
that obvious *why* this feature is accessibility-related), but there's no
obvious better place.  See discussion in the bug for more info.

Bug: 2364220

Change-Id: I0fd7cf357972519b390575b9c06a4bbe46ff1c9b
2010-03-11 17:39:11 -08:00
Irfan Sheriff
41297ef73a Fix Wi-Fi title reference in settings
Change-Id: Ia17df113bb6dfdc6af1b5d3632a7594f21365485
2010-03-09 13:58:04 -08:00
Robert Greenwalt
204e7c1a6e Clean up the tethering settings screen a bit.
Change-Id: Iadd1cf9245a5ccd38537050a6b6c9d9390400b20
2010-03-09 11:19:37 -08:00
Daniel Sandler
0be152c9bc Remove dependencies within Sound settings.
All checkboxes and other settings will be available to the
user regardless of whether the device is in silent mode.
(Previously, settings such as ringtone and volume were
dimmed if the phone was silent, which was inconvenient.)

Bug: 2496164
Change-Id: I724c43aa4f5b1a12b95097381844a47c5dcf1e0d
2010-03-08 15:50:34 -05:00
Robert Greenwalt
209177aac6 Update Tethering UI
Finalizing some strings and changing the error handling.
2010-03-04 18:24:11 -08:00
Irfan Sheriff
2ae37e8ce0 Get all strings in for Wifi tethering
Bug: 2413908
Change-Id: I3d28fcfcb4a6e4eaf03e57d69f9d2c92730b12e5
2010-03-04 17:40:43 -08:00
Irfan Sheriff
65cff17722 Add AP support for tethering
First phase of the AP support in
UI and framework
Bug: 2421638

Change-Id: I0b6c31be5fe79bd4d33c292464d271b054754e8d
2010-03-04 14:34:52 -08:00
Robert Greenwalt
0affd6a002 Update Tether Settings UI.
Remove the USB notification option.
2010-03-04 12:52:28 -08:00
Daniel Sandler
fc01d062c1 Add a checkbox to the Dock settings to control insertion/removal sound effects.
The sounds are present in the build but are turned off by
default (and there isn't currently a UI to turn them on).

(Mentioned in http://b/2469862)

Change-Id: I9ded1d67cc19204113047aeb8fc8b0123cea1427
2010-03-04 14:06:06 -05:00
Daniel Sandler
385a9e52be Merge "Support new vibrate/silent behavior." 2010-03-01 17:17:08 -08:00
Daniel Sandler
58cf8299d3 Support new vibrate/silent behavior.
The updated settings tree looks like this:

	[ ] Silent mode (unchanged)
	[ ] Allow vibration in silent mode (new)
		Phone vibrate: (changed from boolean)
		( ) Always
		( ) Only in silent mode
		( ) Never

See change I14cf91b0 for explanation & framework support.

Change-Id: I22ba7bcfa5ddf4e545800083c6e80fb655f211e5
2010-02-26 21:01:59 -05:00
Amith Yamasani
1d5c898a3d Fix for 2284833 : Remove big brightness icon and make it a small one on the title bar. 2010-02-26 14:09:37 -08:00
Oscar Montemayor
a110a718ba Apps on SD Card project.
Settings for Manage Applications that allow the user to choose default application installaction location.
Options are: internal flash, SD card, or automatic.
2010-02-22 16:13:36 -08:00
Daniel Sandler
1b35d6dbae Merge "Checkbox (in Sound settings) to control new lockscreen sfx." 2010-02-18 06:21:03 -08:00
Amith Yamasani
0f2e6dec7c Show current locale as summary for Select language setting.
Bug: 2402834
2010-02-17 16:02:39 -08:00
Daniel Sandler
231d880df3 Checkbox (in Sound settings) to control new lockscreen sfx. 2010-02-17 16:41:26 -05:00
Robert Greenwalt
c4764d2483 Update Settings UI regarding tethering.
If tethering is disabled (build var or a gservices property) for the device,
don't show any of the tethering options.  If Usb Tethering is disabled (config.xml) don't show
Usb Options.  If Wifi Tethering is disabled (config.xml) don't show Wifi Options.
2010-02-16 16:56:43 -08:00
Mike LeBeau
766a19b278 Dynamically populate a list of available recognition services in voice settings,
only showing the option to choose if there is more than one to choose from. Use
the new settingsActivity meta-data to target the appropriate settings activity
for the chosen recognizer.
2010-02-12 13:45:04 -08:00
Jim Miller
122b6c85a9 Fix 2332563: Update logic for lockscreen in Settings. 2010-02-11 15:02:11 -08:00
Bjorn Bringert
30e4d96512 Remove USE_LOCATION_FOR_SERVICES from Settings
This has been moved to GoogleSettingsProvider
as part of unbundling.

Part of http://b/issue?id=2383870

Change-Id: Ia8e5725b1749fa95436fade0ea23061eb2ca4822
2010-02-08 21:26:49 +00:00
Robert Greenwalt
3901edbdf5 First pass at USB-only tether settings.
bug:2281900
2010-02-04 09:17:41 -08:00
Christopher Tate
a5a67306a4 Add 'restore on app install?" to Privacy settings UI
Change-Id: I6fe4b05596881ae26ebf536d9774fb3033aa15f3
2010-02-03 15:09:20 -08:00
Chia-chi Yeh
065cd4be64 WifiSettings: rename WifiSettings2 to WifiSettings. 2010-02-03 15:56:55 +08:00
Chia-chi Yeh
df90dd9f55 WifiSettings: remove dead code. 2010-02-03 15:16:54 +08:00
San Mehat
4a3d713f3a Settings: Refactor for new API & remove obsolete setting
Signed-off-by: San Mehat <san@google.com>
2010-02-02 11:24:29 -08:00
Chia-chi Yeh
48090d4066 WifiSettings: revise and add support for editing EAP networks.
Use arrays.xml to store translations for enumerations;
avoid race conditions happened when pop up menu or dialog;
avoid saving configurations with networks disabled;
use the same layout for all the dialogs;
support editing EAP networks;
only unlock keystore before connecting;
and many bug fixes I cannot remember.

The number of lines in the new code is about 1/3 of the old one,
and it improves the readability a lot!
2010-02-02 18:31:58 +08:00
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
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
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