Commit Graph

44 Commits

Author SHA1 Message Date
Fabrice Di Meglio
d407f2a05c Fix DisplaySettings indexing for Search
- was missing the KEY_SCREEN_SAVER case as this Preference
can be removed

See bug: #12910134 Implement Search into the Settings App

Change-Id: I6c6fde41d0208a2e87e7fb1239c0909e034e5b0d
2014-06-09 10:13:43 -07:00
Adrian Roos
8ab0954a24 Follow up to "A better brightness"
Original change I122e1218dd0072c979a59bdafd3e0b6f4eec99ab was missing
search provider logic adjustments and length limits on the added strings.

Bug: 15313133
Change-Id: I8910dd60111c87f5494db7bac76a351e89c1a99b
2014-06-03 00:00:11 +02:00
Adrian Roos
244e8ce7ab A better auto brightness
Bug: 14927472
Change-Id: I122e1218dd0072c979a59bdafd3e0b6f4eec99ab
2014-05-14 14:03:35 +02:00
Dan Sandler
347f944a22 Finally, a place for notification settings.
Consolidated under the new Notifications settings are:

  - Ringtone (from Sound)
  - Zen Mode (from Sound)
  - Pulse LED (from Display)
  - Heads-Up Notifications (from Display)
  - Notification Access (from Security)
  - Show when locked (from Security)

Change-Id: I214d03ba1e356e088323a3058d98d390b8a8f988
2014-03-12 14:15:09 -04:00
Chris Wren
18765d7094 rename heads up global setting: app part
Bug: 13208692
Depends-On: Ia020e4d63552ab4b8cbb8a37622c36776800a790
Change-Id: I73755ea40d7e741e9036a245bd9c70c976aeef1a
2014-03-01 10:36:01 -05:00
Chris Wren
ad1b7eb398 add a setting for the heads up: app part
Bug: 13208692
Depends-On: I6847f7a5f275aee2f608de0237dab0e45c39b33f
Change-Id: Ia410a473492aa7637449ba5a5dc068f98618ad03
2014-02-28 17:19:00 -05:00
John Spurlock
26c3b25ac3 Remove rotation-lock from Display settings.
Ability to lock device to natural orientation is still available
under Accessibility.

Bug:11062710
Change-Id: I2045e16cfc676ee75d4d42b0cd652433b2f12715
2013-12-19 16:57:50 -05:00
Jeff Brown
0df39f39fc am 2fba8be9: am 4e54c2a1: Integrate remote display routes into screen cast settings UI.
* commit '2fba8be9c0c9da814e40af00847f3f2d28cf7f01':
  Integrate remote display routes into screen cast settings UI.
2013-11-11 10:27:24 -08:00
Jeff Brown
4e54c2a177 Integrate remote display routes into screen cast settings UI.
Merged remote display route selection into the existing wifi
display preference UI.  Moved the on/off toggle over to a menu item.

The preference page is now mainly implemented in terms of the
media router.  It only interacts with the display manager for the purpose
of pairing with new devices or making wifi display certification
controls available.

This means that the observed state is now completely consistent across
the system ui, settings, and applications that use the media router.

Bug: 11257292
Change-Id: I3705570812384fef4bfffeccaaccf7895d370d12
2013-11-10 21:20:16 -08:00
Elliott Hughes
c26cdd10cf am 98f5e186: am c3a6cd6e: Merge "Move a line into try block"
* commit '98f5e1861da4d708e7199b5d563895cf4d2c8db7':
  Move a line into try block
2013-11-05 10:35:25 -08:00
Shuhrat Dehkanov
7e77699895 Move a line into try block
Currently, NumberFormatException is never handled as
Integer.parseInt() is called outside try block.
This moves that line inside try block.

Change-Id: I54544f5a665ca0f821de5351001755cb965078dc
Signed-off-by: Shuhrat Dehkanov <k@efir.uz>
2013-11-01 17:39:44 +09:00
Amith Yamasani
78b8265b17 Select max timeout, if it's in the timeout list
Bug: 10192592
Change-Id: I21ec208abf0c8659233cdb5219d9b226528aa1d4
2013-08-16 16:35:54 -07:00
Svetoslav
e8253dd8b3 Remove Auto-rotate screen setting if a required feature is missing.
It is possible that a device running Android does not support rotation,
for example a Google TV box. The change adds a check to the rotation
policy to take this into account.

bug:8051556

Change-Id: I60a2a35da148271a18873f6c70556dacab29dae9
2013-04-30 16:02:04 -07:00
Amith Yamasani
64516a191f Fixes an AIOOBE when device admin enforces a small timeout for screen lock
Bug: 7378871

If the timeout choices are empty, set an empty summary.

Change-Id: I20dbe61af56f9c41337a7c284580511322e5a45e
2012-10-22 16:38:02 -07:00
John Spurlock
d983e1d1a5 Settings: Use new shared dream setting defaults.
Bug:7373284
Change-Id: I12d00b45d0bada5207af3a7bda906370e7a87413
2012-10-19 11:27:22 -04:00
Daniel Sandler
c825bc8e17 More descriptive summary for "Sleep Mode" pref.
It will either show "Off" or the name of the selected dream.

Also, move "When to sleep" out onto the visible part of the
action bar if there's room, making it much easier to discover.

Bug: 7320701
Change-Id: I1d4e2c17b764b8ee054dbb17c23f559d735e3450
2012-10-18 11:38:28 -04:00
Amith Yamasani
9627a8ea15 Show more settings and add restrictions/dialogs for secondary users
Bug: 7213029 crash in About>Status
Bug: 7212495 hide System updates for second user
Bug: 7212230 nickname editor should select the text
Bug: 7160487 TTS settings
Bug: 7129411 Settings needs visibility changes for secondary users

Change-Id: Ia2d1229c08b392edfa6b671fce4a382410405b14
2012-09-23 18:43:31 -07:00
Jeff Brown
9e143f5e9d First draft of wifi display settings UI.
All of the functionality is in place but the UI is
not fully polished yet.

Bug: 7178216
Change-Id: Id76843bff05cc71e5c02a31bc97c7070d58fff10
2012-09-19 21:37:20 -07:00
John Spurlock
6df18e2713 New dream settings - first cut
First draft implementation of mocks for dream settings.

Want to merge for the weekly build, so a few things remain, namely:
  - flat style for preview/settings buttons + dividers
  - animation between dream row expanded/collapsed state
  - wire up the help url
  - possibly ditch the non-standard style
  - add logging
  - refresh when packages are installed/uninstalled

Bug:7010260
Change-Id: I96e3ab944170925bd76edf7b8b1127adfffc6262
2012-08-29 16:41:01 -04:00
John Spurlock
d541b6fd1c Re-enable dreams: Settings
Re-arrange settings and captions for dreams.  Activation on sleep
and activation on dock now independent. Sleep activation defaults to off,
dock activation defaults to on (replacing dock mode).

Also use dream manager service for testing dream preference, and properly
disable preferences if both dream activations are disabled.

Change-Id: I76f5ba115c7678826a09077dd393acc55c2bca26
Bug: 6921930
2012-08-02 16:49:23 -04:00
Jeff Brown
10fbf52ccb Implement new rotation policy.
Show "auto-rotate screen" option in Display only if the Rotation Lock
feature is not available on the device.

When the "auto-rotate screen" option is disabled in Accessibility or
Display settings, hide the Rotation Lock feature.

Use new RotationPolicy class to adjust rotation settings.

Bug: 6523269
Change-Id: Ifa89ff055e5ad0a00888e10720dd76b0054fe290
2012-06-05 17:53:35 -07:00
Jeff Brown
62a6f626da Revert "Settings: "Rotation lock" retains existing orientation."
Bug: 6523269
This reverts commit 523d5a6e04.
2012-06-05 17:45:35 -07:00
Jeff Brown
56c58d5aef Revert "Rename and flip meaning of auto-rotate to rotation lock."
Bug: 6523269
This reverts commit b944171092.
2012-06-05 17:45:07 -07:00
John Spurlock
523d5a6e04 Settings: "Rotation lock" retains existing orientation.
Enabling "Rotation lock" when in landscape will stay in landscape
instead of forcing to portrait.

Bug: 6481542
Change-Id: Ide6171437a207f97a8fc3123ad8b2fe27323336f
2012-05-22 09:51:02 -04:00
Amith Yamasani
b944171092 Rename and flip meaning of auto-rotate to rotation lock.
Bug: 6485348
Change-Id: I17359db3156641a69f6841d4e0c48708b5fafe4e
2012-05-15 16:15:40 -07:00
Amith Yamasani
980a6c3c4b Fix NPE in Display Settings.
Handle occasional race in delivering change notifications.

Bug: 6012882
Change-Id: Ic9eff72920ff65a2c8ab85f4af59ba438cd8f99f
2012-05-14 17:46:23 -07:00
Daniel Sandler
47c991f78c Update Settings for new Dreams architecture.
Additionally, hide all Dreams settings if the feature is
disabled (R.bool.config_enableDreams).

(Depends on change Idfe9d430)

Change-Id: Ifa05f125e411ca58605c33481de26cd29a926807
2012-04-10 04:15:21 -04:00
Daniel Sandler
6f0ea441e4 Settings changes for Android Dreams (now Screen Candy).
- new preference design
- remove candy-specific timeout
- use new settings keys

Requires Change I31f31b3

Bug: 5591015
Change-Id: I45cb6ea5c68f9932c6d4e65e2b219331d48a62d6
2011-11-17 21:06:29 -08:00
Jeff Brown
cbf312ec29 Use WM APIs to change rotation preference.
Bug: 5371750

Changing the system setting directly results in inconsistent
behavior among the three different places where "auto-rotate"
settings appear in the UI.  Use the WM APIs instead.

Change-Id: I1a8239af66b1cc3aeec8310383e72fc96c878d73
2011-10-05 16:12:27 -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
Gilles Debunne
698c24fcf0 Part of Bug 5252423: Crash in summary text when time out is 0
Negative value will show no summary.

Zero is no longer a special case. It will display the first summary, like any
value below it.

Change-Id: I88d49cac844fb2dc347bef94ac033df9255d748f
2011-09-02 15:47:26 -07:00
Christopher Tate
8a510c57dc Report current font size in the 'Font size' setting summary
Bug 5022057

Change-Id: I74a266bc70fd885fd15ac09915b205b9b3e10679
2011-07-29 16:16:22 -07:00
Dianne Hackborn
92c8ebacc1 Fix issue #4976176: Font size setting does not persist
Change-Id: Ie36c97680f43414b5cdc1615519527ba5e8fa902
2011-07-19 14:59:01 -07:00
Gilles Debunne
737c81c775 Bug 5003461 - Removed animation option
Associated change in DatabaseHelper to reset this value in the database.

Change-Id: I530da617c44773fad31e62f595d0c335daf64148
2011-07-08 11:56:48 -07:00
Daniel Sandler
2943cfa606 Dream (screensaver) settings.
Depends on change Ied691856 for
Settings.Secure.DREAM_TIMEOUT and
Settings.Secure.DREAM_COMPONENT.

Change-Id: Ib6f74b74036e12637efb891b97e459a4e33444e7
2011-05-26 11:32:06 -04:00
Amith Yamasani
be606d6d0e Fix possible NPE when Screen settings is launched quickly in succession.
Bug: 3368440
Change-Id: Icbcd0474978e20a055ec27f5960e9a4b98f4a68a
2011-03-11 13:55:29 -08:00
Dianne Hackborn
6677e56f45 Add font size preference.
Shamelessly stolen from SpareParts.

Change-Id: I5bcdc5c738a0b2af7e7bd8dae303997c28298086
2011-03-04 17:30:54 -08:00
Amith Yamasani
26a1f898e0 Track changes to brightness and orientation lock in Settings.
Bug: 3491814
Bug: 3482859
Bug: 3497535

Since the system bar can now change brightness and orientation lock, Settings needs to listen
to changes to those settings and reflect in the UI.

Also fix a problem with restoring state on cancel when the brightness dialog is invoked a
second time.

Change-Id: I3ada6e77df9a6b013a16061877fcb6b55c94a903
2011-02-28 17:27:04 -08:00
Jim Miller
9391b9545f Fix 3333434: Rename "Display" to "Screen" and make dynamic
This changes the setting "Display" to "Screen" and updates
the timeout summary to reflect the current setting.

Change-Id: Id8209d445f65a0908ae8093a8f5f7f951f333053
2011-01-09 14:26:54 -08: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
Jim Miller
fc5a02225e Fix 2582241: Update selection based on user setting instead.
When the user adds a DPM, Settings removes all display
timeout options with t > maxTimeout. It was incorrectly
setting the preference to maxTimeout.

The corrected code picks the user's preference if less
than maxTimeout or nothing otherwise.

Change-Id: I5a47fdce89f4cf216fd76bb585c3c0120b39db92
2010-04-13 15:31:41 -07:00
Jim Miller
d90b5a84d8 Fix 2527411: Remove unusable display timeouts from Settings.
This fix removes unusable display timeouts from Settings when
a device policy is enabled.

Patch 3 catches the case where not having any active policies clears the list.

Change-Id: I5b08d420c73b1c2e6fe2bb4e65656790290574cd
2010-03-29 22:16:55 -07: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
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