History log of /packages/apps/Settings/src/com/android/settings/SoundSettings.java
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
296d9bb61257ef84fbfae23dd594ba1a6f823eb5 20-Mar-2013 Eric Laurent <elaurent@google.com> Do not display volume settings if volume is fixed

When the configuration option config_useFixedVolume is true
indicating that stream volumes cannot be modified, the volume
settings submenu is not available.

Bug 8161458

Change-Id: I6d76a2f85c642778ae8c4caa7347b50f659c1def
/packages/apps/Settings/src/com/android/settings/SoundSettings.java
2ac8da37d8cc21d34e4232ea7ff0984d5d0e8c1d 27-Feb-2013 Henrik Baard <henrik.baard@sonymobile.com> Moved KEY_VIBRATE to NEED_VOICE_CAPABILITY

There is an array (NEED_VOICE_CAPABILITY) with all keys that
should not be present in a device that does not have voice
capability.

The key KEY_VIBRATE was not part of this array, it was handled
separately in the code.

Moved KEY_VIBRATE to NEED_VOICE_CAPABILITY and remove the
special treatement.

Change-Id: I96aa066cec373ccbfe89c46b530feb484f6f8164
/packages/apps/Settings/src/com/android/settings/SoundSettings.java
e00cd9ff60ee5c5769902c0e1d85764d17eccc03 27-Oct-2012 Eric Laurent <elaurent@google.com> 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
/packages/apps/Settings/src/com/android/settings/SoundSettings.java
860eceba2c1e5aea13eafb0d60b64abe9f7c700d 19-Oct-2012 Jeff Sharkey <jsharkey@android.com> More migration to Global settings.

Bug: 7375796
Change-Id: I43079368c32e91e8bb75b00377cd57d1766f15d4
/packages/apps/Settings/src/com/android/settings/SoundSettings.java
a8f3a204d908330e31c29a11d5a83b8ba40a9610 03-Oct-2012 Amith Yamasani <yamasani@google.com> Merge "Improved dialog management in Settings>Users" into jb-mr1-dev
c861cf84479d2bb289546e8c4f116beb794842c0 02-Oct-2012 Amith Yamasani <yamasani@google.com> Improved dialog management in Settings>Users

Bug: 7266284 Delete not functional after orientation change
Bug: 7266182 Set up now not functional after orientation change

Also remove "vibrate when ringing" on tablets
Bug: 7253081

Change-Id: Ie616747f2e3292c401613eb2041b5a5a289cde20
/packages/apps/Settings/src/com/android/settings/SoundSettings.java
a2c12a61ded1bad366fa1c23ae69302573df400d 01-Oct-2012 Jeff Sharkey <jsharkey@android.com> Migrate telephony settings to Global.

Bug: 7231764
Change-Id: Ic28dacda8372b7976b5aa36be82e98e5ad069f9a
/packages/apps/Settings/src/com/android/settings/SoundSettings.java
2bc32ae8088f6ae759668a0515b4fb418d99d967 24-Sep-2012 Chris Wren <cwren@android.com> move remaining dock settings into sound settings fragment.

Bug: 7016769
Change-Id: I21a7bf6140f7470dbb9bebeda1ebcc3f17c481c6
/packages/apps/Settings/src/com/android/settings/SoundSettings.java
5d263ea4896f87d736b21fb567d25cb44c212d3e 16-May-2012 Amith Yamasani <yamasani@google.com> No more silent-mode tristate in Sound Settings.

Delete delete delete.

Bug: 6036529
Change-Id: Ia1ec2a1740c3010ec4373bed18ce72bedcb9211b
/packages/apps/Settings/src/com/android/settings/SoundSettings.java
dba00b6097f04a4923169bd891a5d70c729b5d86 16-May-2012 Daisuke Miyakawa <dmiyakawa@google.com> Hide "Call ringtone & vibrate" when with no phone capability

Bug: 6502724
Change-Id: I61bb82bd6a974fb5242191c500f3f30c11d93655
/packages/apps/Settings/src/com/android/settings/SoundSettings.java
8b878db49d4631552b8279500549a7f7b59a3dd2 08-May-2012 Daisuke Miyakawa <dmiyakawa@google.com> 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
/packages/apps/Settings/src/com/android/settings/SoundSettings.java
b0b37ae21c172491bc170659b5f429601858ddc1 24-Apr-2012 Amith Yamasani <yamasani@google.com> Help menus for several screens.

Bug: 5144896
Change-Id: Ib2f5146f6f62f2a33261bb165c3bf1bf13b22f38
/packages/apps/Settings/src/com/android/settings/SoundSettings.java
b9bac4a98edc578d8cc0e34e3cc65a5848d0cf44 22-Feb-2012 Daisuke Miyakawa <dmiyakawa@google.com> Remove "Vibrate and ring" option

It will be part of Phone's settings. See Ifb19b53b850ee8a4c15

Bug: 6029673
Change-Id: I7168ed140266a7c754fb3d7209cf12e73041c306
/packages/apps/Settings/src/com/android/settings/SoundSettings.java
b3e6afe029a852d50bcba4dd6eca0d831db9d771 02-Dec-2011 Amith Yamasani <yamasani@google.com> Set the same vibrate settings for ringer and notifications.

Bug: 5586083
Change-Id: I113488d9d7b9c5bafdd30f69f4002c5f4a2f89a7
/packages/apps/Settings/src/com/android/settings/SoundSettings.java
dfb654367d4b65fb45089cd8d7d0905e3cd68ae3 30-Nov-2011 Amith Yamasani <yamasani@google.com> 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
/packages/apps/Settings/src/com/android/settings/SoundSettings.java
c86755bfd56ff620e740e7a99303b54350ebf164 05-Oct-2011 Amith Yamasani <yamasani@google.com> Handle unexpected null cursor and don't forget to close it.

Bug: 5406071
Change-Id: Ia40cf7e5a3e32d6f364e787ee66580c685507571
/packages/apps/Settings/src/com/android/settings/SoundSettings.java
883d850ede03968018587781a8e20683398d98fe 20-Sep-2011 Amith Yamasani <yamasani@google.com> Move "Pulse notification light" to Display settings.

Bug: 5242350
Change-Id: I91cb23ca8f49c1c053710031b0316b10d55fbab4
/packages/apps/Settings/src/com/android/settings/SoundSettings.java
10826879a6638173e7b4c7520d347a9934b27776 12-Sep-2011 Amith Yamasani <yamasani@google.com> Use a new config flag to decide if notification led pulsing can be turned on/off.

Bug: 5242350
Change-Id: I6119abcfca01db4b937098a1a92233ba63f9cb29
/packages/apps/Settings/src/com/android/settings/SoundSettings.java
823bf0c155fb481476cc3f755bdc12943ed5d4b8 02-Aug-2011 Amith Yamasani <yamasani@google.com> 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
/packages/apps/Settings/src/com/android/settings/SoundSettings.java
6eca4b3b927611795910908532fa927c9eea6faf 16-Jul-2011 Marco Nelissen <marcone@google.com> Add Settings item to select sound effects control panel.

Change-Id: I7952aad3afbc9dea8ea54be9afcad7969a0f23bc
/packages/apps/Settings/src/com/android/settings/SoundSettings.java
327147eb062a25ecab40d66ea14559070e0ecef3 02-Feb-2011 Wink Saville <wink@google.com> Have SecuritySettings and SoundSettings use getCurrentPhoneType

To preserve proper behavior now that getPhoneType can return
PHONE_TYPE_NONE use getCurrentPhoneType.

bug: 3198435
Change-Id: I39d385b17d746f3c7cdbc3e1869efa5d4e89230c
/packages/apps/Settings/src/com/android/settings/SoundSettings.java
057f181f3715e7340bf1618e86fdce118bbf952b 13-Jan-2011 Joe Onorato <joeo@google.com> Get rid of the silent mode pref on xlarge.

Bug: 3344695
Change-Id: I55ccfd2b22ca4aa407646de54a8dd1dfe637c9bd
/packages/apps/Settings/src/com/android/settings/SoundSettings.java
eb99f2f3f4a3e6d5e785867043e6069c89e8cd58 15-Dec-2010 Amith Yamasani <yamasani@google.com> Fixes a regression in launching certain settings activities.

Some undocumented settings and class names are being used by NotificationManagerService.
Added compatibility activities to handle them.

Bug: 3258668
/packages/apps/Settings/src/com/android/settings/SoundSettings.java
ff740d92a72a0cc010452b852896a95dd7d1571b 30-Nov-2010 Jean-Baptiste Queru <jbq@google.com> am b68b35dd: am 04b646df: Merge "Possible NumberFormatException of parseInt is outside try-catch"

* commit 'b68b35dd6a12b728924e5a7afc64ea58cd242c65':
Possible NumberFormatException of parseInt is outside try-catch
378b6f674064e373f1be4d230608be4d0bddbb4f 28-Nov-2010 Peter Kuterna <peter.kuterna@gmail.com> Possible NumberFormatException of parseInt is outside try-catch

Change-Id: I77c1e41185a8d3a1724af848d6bbfbb1da816b55
/packages/apps/Settings/src/com/android/settings/SoundSettings.java
edac9af662f01026fd2b4acf263e1b5d1dfdeaa9 17-Nov-2010 Amith Yamasani <yamasani@google.com> Conditional remove "haptic" settings if there's no vibrator

Bug: 3193801
/packages/apps/Settings/src/com/android/settings/SoundSettings.java
0a115aae82ea96bd9079bbb024e99330ea99df0a 04-Nov-2010 Dianne Hackborn <hackbod@google.com> Remove vibrate setting if there is no vibrator.

Change-Id: I37e6f34ef0fb67ec0e75b83a3572bd5efc6b8d0e
/packages/apps/Settings/src/com/android/settings/SoundSettings.java
60133dd03657354e06fa3aa7e6041862f8ce20a8 11-Sep-2010 Amith Yamasani <yamasani@google.com> 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
/packages/apps/Settings/src/com/android/settings/SoundSettings.java
d79934731c8d33f6fc63b21c120b9ffba5d06f54 18-Aug-2010 Amith Yamasani <yamasani@google.com> Refactor settings top level activities to use fragments.

Added a base class SettingsPreferenceFragment from which the settings activities should
be derived so that they can behave like fragments. It contains some commonly called
utility methods and dialog conversion to DialogFragment.

Some of the top-level activities can be launched directly without the left pane.
Settings.java acts as a proxy activity that contains just that settings fragment without
the left pane.

There are still a lot of second and third level activities that need to be fragmentized.
This is just the first pass to test the 2-pane layout.
/packages/apps/Settings/src/com/android/settings/SoundSettings.java
844d2a34a20e4e94927854f76c8963d95f2ad9f6 25-Jul-2010 Ben Clark <benbread@gmail.com> Remove unused imports in SecuritySettings.java

Change-Id: Ibce3dbdd8ee8a6cd1727313f3a2502717ee7f30a
/packages/apps/Settings/src/com/android/settings/SoundSettings.java
2c917847f520c59af84837d4514855ea01f0316c 21-Apr-2010 Daniel Sandler <dsandler@android.com> 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
/packages/apps/Settings/src/com/android/settings/SoundSettings.java
00290356b409e85ad4d4922398ef7ca12b0a4c72 10-Mar-2010 Daniel Sandler <dsandler@google.com> Ensure "vibrate in silent" box is never disabled.

Should complete the decoupling work started in change
I724c43aa4f5b1a12b95097381844a47c5dcf1e0d.

Change-Id: I3bad426534533149879fb098533a223cdcdb4d72
/packages/apps/Settings/src/com/android/settings/SoundSettings.java
4ce4f759bd3979de4b21e66a0f8c7ec2beb40a31 08-Mar-2010 Daniel Sandler <dsandler@google.com> Fix vibrate settings for incoming calls.

Bug: 2489593
Change-Id: Id0347bada808f604febc51c3d69d30442c3d51c4
/packages/apps/Settings/src/com/android/settings/SoundSettings.java
58cf8299d3ef347e3fd154b1439f50e62f7ca8bf 26-Feb-2010 Daniel Sandler <dsandler@google.com> 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
/packages/apps/Settings/src/com/android/settings/SoundSettings.java
231d880df31ea4817dc0c5f1acd66f12417f2044 17-Feb-2010 Daniel Sandler <dsandler@google.com> Checkbox (in Sound settings) to control new lockscreen sfx.
/packages/apps/Settings/src/com/android/settings/SoundSettings.java
1e60c9603e02f95158d21b4a2089dc45dffb41c1 05-Feb-2010 San Mehat <san@google.com> Settings: Refactor for new API and remove some unused references / imports

Signed-off-by: San Mehat <san@google.com>
/packages/apps/Settings/src/com/android/settings/SoundSettings.java
4a3d713f3aa1cb3b43343dd8af95ee858c8c6d8b 29-Jan-2010 San Mehat <san@google.com> Settings: Refactor for new API & remove obsolete setting

Signed-off-by: San Mehat <san@google.com>
/packages/apps/Settings/src/com/android/settings/SoundSettings.java
992f10240d0bfd78bb99855fe23ec7a1b61a2551 25-Jan-2010 Amith Yamasani <yamasani@google.com> 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.
/packages/apps/Settings/src/com/android/settings/SoundSettings.java