Commit Graph

23 Commits

Author SHA1 Message Date
Eric Laurent
e00cd9ff60 added dock audio settings for non bluetooth docks
This is a quick implementation allowing support for non bluetooth
audio docks.

Longer term it would be better to generalize DockService to support
all kinds of docks.

Bug 7302106.

Change-Id: I2df31ddbd8057a7297b244ea6a9e2d5a6a39bf7f
2012-10-27 13:30:55 -07:00
Chris Wren
2bc32ae808 move remaining dock settings into sound settings fragment.
Bug: 7016769
Change-Id: I21a7bf6140f7470dbb9bebeda1ebcc3f17c481c6
2012-09-24 15:57:10 -04:00
Amith Yamasani
5d263ea489 No more silent-mode tristate in Sound Settings.
Delete delete delete.

Bug: 6036529
Change-Id: Ia1ec2a1740c3010ec4373bed18ce72bedcb9211b
2012-05-16 13:55:44 -07:00
Daisuke Miyakawa
16d91c19dc Modify menu layout for sound setting
- Move notification setting to "System" section
- Modify strings for category titles
- Change strings' names too to reflect their contents
-- sound_category_calls_and_notification_title
   -> sound_category_call_ringtone_vibrate_title
-- soud_category_feedback_title
   -> sound_category_system_title

Bug: 6036529
Change-Id: I7aaa83571ae3d69212e9debaec4f3b4ec60a281c
2012-05-14 15:08:19 -07:00
Daisuke Miyakawa
8b878db49d Introduce new "vibrate when ringing"
We once removed "vibrate and ring" option with
I7168ed140266a7c754fb3d7209cf12e73041c306, while we still need
vibration setting which only affects Phone app.

This depends on I850d27629a75615647883fdaa2933f337c4824d1
See also I3a4ed2bd5e4bde05dfb97c7bb20b9284d1c6f13f for Phone app
side change.

Bug: 6036529
Change-Id: Idb0453e187f8025565d6744cd774613531e7cb8b
2012-05-08 18:40:07 -07:00
Daisuke Miyakawa
b9bac4a98e Remove "Vibrate and ring" option
It will be part of Phone's settings. See Ifb19b53b850ee8a4c15

Bug: 6029673
Change-Id: I7168ed140266a7c754fb3d7209cf12e73041c306
2012-02-22 14:30:06 -08:00
Amith Yamasani
dfb654367d Overhaul vibrate and silent settings to match hard keys.
We go back to the old style of toggling between Mute/Vibrate/Normal.
There is an addition of a checkbox to indicate Vibrate on ring/notif.

Icons in volume dialogs are no longer touchable.

Bug: 5586083

This simplifies the logic in SoundSettings quite a bit, since there's a 1-1 mapping
with ringer mode.

Don't disable volume sliders when muted, so you can go to zero and back up by sliding
your finger. This is because the icons are not clickable anymore.

Change-Id: Ia7ce7e1bf108419eb107f03b7720101efe1598b1
2011-11-30 18:46:54 -08:00
Amith Yamasani
883d850ede Move "Pulse notification light" to Display settings.
Bug: 5242350
Change-Id: I91cb23ca8f49c1c053710031b0316b10d55fbab4
2011-09-20 14:41:03 -07:00
Amith Yamasani
c65bdfc362 Move notification LED setting down to SYSTEM section.
Bug: 5242350
Change-Id: I4dbefc4e7ba5a19e873c00ba1da84e7a900226cf
2011-09-08 13:46:10 -07:00
Amith Yamasani
7f0d760ea5 Volumes panel shouldn't depend on Silent mode setting.
Otherwise it wont be possible to adjust alarm and music volumes.
Also fixes an inconsistent state when screen is turned off and on.

Bug: 5128528
Bug: 5128850

Change-Id: I3bfae44956de291b086905b9f43ca4ff5c7b9bbf
2011-08-09 14:25:30 -07:00
Amith Yamasani
44f972dacc Remove unused string reference.
Change-Id: I411a924c22c84d1a62e0e42df7429e4d869fe3ed
2011-08-04 14:21:06 -07:00
Amith Yamasani
823bf0c155 Sound settings screen and volumes dialog reconfiguration.
Removed the "Notifications use ring volume" checkbox.

Show the current ringtones in the summary area.

Bug: 5032308
Change-Id: I17e63f32c1775dd2097904df1aa6aaf699bd8ae2
2011-08-02 18:59:43 -07:00
Marco Nelissen
6eca4b3b92 Add Settings item to select sound effects control panel.
Change-Id: I7952aad3afbc9dea8ea54be9afcad7969a0f23bc
2011-07-15 15:59:41 -07:00
Amith Yamasani
60133dd036 Conditionally remove settings that aren't required on the tablet.
Bug: 2985267

Changes not done : SD card related stuff, as we need some way still
to figure out if there is a real SD card in the device.

Change-Id: I21c41f18ebe6c050981918481a7f6d69f04b65d0
2010-09-11 14:58:01 -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
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
Daniel Sandler
8ad849ca26 Labeled categories to help clarify Sound prefs.
Bug: 2598014
Change-Id: Ia846367fc479345bfd02c10fe1860373719334eb
2010-04-21 08:52:59 -04: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
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
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
Daniel Sandler
231d880df3 Checkbox (in Sound settings) to control new lockscreen sfx. 2010-02-17 16:41:26 -05: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
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