Commit Graph

26 Commits

Author SHA1 Message Date
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
b3e6afe029 Set the same vibrate settings for ringer and notifications.
Bug: 5586083
Change-Id: I113488d9d7b9c5bafdd30f69f4002c5f4a2f89a7
2011-12-01 15:32:35 -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
c86755bfd5 Handle unexpected null cursor and don't forget to close it.
Bug: 5406071
Change-Id: Ia40cf7e5a3e32d6f364e787ee66580c685507571
2011-10-04 15:00:21 -07: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
10826879a6 Use a new config flag to decide if notification led pulsing can be turned on/off.
Bug: 5242350
Change-Id: I6119abcfca01db4b937098a1a92233ba63f9cb29
2011-09-12 14:30:21 -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
Wink Saville
327147eb06 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
2011-02-02 11:30:25 -08:00
Joe Onorato
057f181f37 Get rid of the silent mode pref on xlarge.
Bug: 3344695
Change-Id: I55ccfd2b22ca4aa407646de54a8dd1dfe637c9bd
2011-01-12 15:35:47 -08:00
Amith Yamasani
eb99f2f3f4 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
2010-12-15 15:46:12 -08:00
Jean-Baptiste Queru
ff740d92a7 am b68b35dd: am 04b646df: Merge "Possible NumberFormatException of parseInt is outside try-catch"
* commit 'b68b35dd6a12b728924e5a7afc64ea58cd242c65':
  Possible NumberFormatException of parseInt is outside try-catch
2010-11-29 16:13:18 -08:00
Peter Kuterna
378b6f6740 Possible NumberFormatException of parseInt is outside try-catch
Change-Id: I77c1e41185a8d3a1724af848d6bbfbb1da816b55
2010-11-28 22:35:31 +01:00
Amith Yamasani
edac9af662 Conditional remove "haptic" settings if there's no vibrator
Bug: 3193801
2010-11-17 09:08:21 -08:00
Dianne Hackborn
0a115aae82 Remove vibrate setting if there is no vibrator.
Change-Id: I37e6f34ef0fb67ec0e75b83a3572bd5efc6b8d0e
2010-11-04 13:02:02 -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
d79934731c 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.
2010-08-18 22:59:33 -07:00
Ben Clark
844d2a34a2 Remove unused imports in SecuritySettings.java
Change-Id: Ibce3dbdd8ee8a6cd1727313f3a2502717ee7f30a
2010-07-24 23:06:16 +01: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
00290356b4 Ensure "vibrate in silent" box is never disabled.
Should complete the decoupling work started in change
I724c43aa4f5b1a12b95097381844a47c5dcf1e0d.

Change-Id: I3bad426534533149879fb098533a223cdcdb4d72
2010-03-10 10:56:23 -05:00
Daniel Sandler
4ce4f759bd Fix vibrate settings for incoming calls.
Bug: 2489593
Change-Id: Id0347bada808f604febc51c3d69d30442c3d51c4
2010-03-08 15:10:02 -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
1e60c9603e Settings: Refactor for new API and remove some unused references / imports
Signed-off-by: San Mehat <san@google.com>
2010-02-08 16:26:16 -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
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