Commit Graph

76 Commits

Author SHA1 Message Date
Fan Zhang
44931d1e96 Properly suppress zen mode entry from soundsetting page.
Change-Id: If2c033232b05753f3ba52bb986dd6c85cab6e452
Fixes: 72748524
Test: robotests
2018-06-05 15:10:45 -07:00
Fan Zhang
752350c8d8 Suppress prevent ringer gesture parent page in search.
The full page verion of prevent ringing is still searchable.

- Created a new controller for parent entry.
- On the child controller, inherit the same getAvailabilityStatus() but
  override AVILABLE_UNSEARCHABLE to AVAILABLE so it becomes searchable.

Fixes: 72748524
Test: existing robotests for PreventRingingPreferenceController

Change-Id: Id2454db110c81b59fa4a98338602b03de0812f8a
2018-06-05 15:10:45 -07:00
Antony Sargent
97e418f45c Merge "Update sound settings icons" into pi-dev am: 2e0709b3b8
am: 75ffd61ee3

Change-Id: I60c903d44a89e09eadd469d67d6351efcb2b9721
2018-05-24 23:50:12 -07:00
Antony Sargent
75ae43b5cc Update sound settings icons
In several places we were referencing private icons from
frameworks/base/core instead of versions we already had in
settings. Also add in a "media stream off" icon to match the one we
already had for "media stream on".

Bug: 77982107
Test: manual (Settings->Sound, then use hardware controls to modify
media and ring volumes)

Change-Id: I3a1d808b3028bb4f2feae4536194dc58c3177a66
2018-05-23 15:44:53 -07:00
Beverly
7e99c0d595 Merge "Get rid of divider above ringtone selector" into pi-dev am: 24bbc4bfe1
am: 976c1d9dd3

Change-Id: If38b79abb72a10cc7f42c5b8e8359682c3a0dc1d
2018-05-17 07:00:36 -07:00
TreeHugger Robot
24bbc4bfe1 Merge "Get rid of divider above ringtone selector" into pi-dev 2018-05-17 13:34:34 +00:00
TreeHugger Robot
a0f9241400 Merge "Support Vibrate for calls in Settings Slices" into pi-dev 2018-05-16 18:48:14 +00:00
Beverly
3f42a23816 Get rid of divider above ringtone selector
Change-Id: I939d1ab061fb55853fbc0505b8d9025715b9df97
Fixes: 79480349
Test: manual
2018-05-16 14:28:15 -04:00
Fan Zhang
7d6539d09b Merge "Support Vibrate for calls in Settings Slices" 2018-05-16 17:22:29 +00:00
joeshih
a025eb2b35 Support Vibrate for calls in Settings Slices
Use TogglePreferenceController instead of AbstractPreferenceController
for VibrateWhenRingPreferenceControllr

Bug:74915140
Test: make RunSettingsRoboTests
Change-Id: Ib06126324516826411a7d50a2bd8a790bfd477c7
Merged-In: I501a1470da7dc1ff582c2a90b5235b25036caefc
2018-05-16 11:36:45 +08:00
joeshih
5d772136e1 Support Vibrate for calls in Settings Slices
Use TogglePreferenceController instead of AbstractPreferenceController
for VibrateWhenRingPreferenceControllr

Bug:74915140
Test: make RunSettingsRoboTests
Change-Id: I501a1470da7dc1ff582c2a90b5235b25036caefc
2018-05-15 12:03:35 +08:00
Beverly
07724bdb18 Gets rid of dividers in sound settings
Change-Id: I71a5e37a48cb6366a161ccc6cf456960f1491eec
Fixes:79480349
Test: visual inspection (Settings > Sound)
2018-05-14 17:13:43 -04:00
ryanywlin
156fd91fbd Add call volume in sound settings
* Add call volume slider
* move "Take call" controller from "Ring volume" to "Call volume"

Bug: 77254162
Test: make -j50 RunSettingsRoboTests

Change-Id: I3443021c1557f42293e9b7772fe9072e5a966cf8
2018-05-11 17:56:16 +08:00
android-build-team Robot
8e55299f98 Merge "Revert "Get rid of charging sounds toggle"" into pi-dev 2018-04-30 21:08:51 +00:00
Beverly Tai
6761acdd33 Revert "Get rid of charging sounds toggle"
Bug: 77912907
This reverts commit fbe721b1b3.

Reason for revert: negative dogfood feedback

Change-Id: I8485a379eafee0a4fcd599e9b1c47aee7dd3c6ad
2018-04-30 20:01:40 +00:00
Katsiaryna Naliuka
79019e474d Increase number of lines before the fold to make sure Now Playing is visible.
Change-Id: Ic9a891f6b44f2b5e057b35f4dca6f2063231449f
Fixes: 64065365
Test: flashed locally built image and tested manually.
2018-04-18 20:03:10 +02:00
TreeHugger Robot
adec029f70 Merge "Get rid of charging sounds toggle" into pi-dev 2018-04-17 19:13:11 +00:00
Beverly
fbe721b1b3 Get rid of charging sounds toggle
Users can no longer toggle on/off the charging sound.

Test: manual
Bug: 77912907
Change-Id: Ie050acab3972cb1fa6716c70afb6403db4d9c887
2018-04-16 12:35:59 -04:00
ryanywlin
63bdfa8998 Add audio switch UI in sound settings
- Build two controller to control list preferences.

- MediaOutputPreferenceController which allows switching
the media output between current device and connected
BT device supporting A2DP. It also controls disabling
media output switching during a call or cast mode.

- HandsFreeProfilePreferenceController which allows
switching between HFP-connected BT devices while in
on-call state.

- Add test cases for controllers.

Bug: 74130772
Test: make RunSettingsRoboTests ROBOTEST_FILTER="MediaOutputPreferenceControllerTest" -j56
Test: make RunSettingsRoboTests ROBOTEST_FILTER="HandsFreeProfileOutputPreferenceControllerTest" -j56
Test: make RunSettingsRoboTests ROBOTEST_FILTER="AudioOutputSwitchPreferenceControllerTest" -j56

Change-Id: I37f5418442ce77e72cdff07f071ea519ab1047f3
2018-04-16 11:52:44 +08:00
ryanywlin
751a3953da Shuffle sound settings UI arrangment
- Move "Ring volume" and "also viberate for calls" below to "Media volume"
- Add divider between "Media volume" and "Ring volume"
- Add divider between "also viberate for calls" and "Alarm volume"

Bug: 74130772
Test: rebuild
Change-Id: Ie274c0174d828a0804b8551760c407579585bd1b
2018-04-13 05:55:04 +08:00
Julia Reynolds
584aba1f2b Prevent ringing updates
- Add video
- Update text
- Link from Sound settings
- Inherit from BasePreferenceController

Test: make -j RunSettingsRoboTests
Change-Id: If8cd9efd4e6034e6f6864a142a86cbc23bf59dc3
Fixes: 76832936
Fixes: 74410634
2018-04-10 17:32:06 -04:00
Julia Reynolds
560637970f Make volume sliders sliceable
Test: make -j RunSettingsRoboTests
Change-Id: I8495770792dfdada54174ca61937f336e4fc219c
Fixes: 67997207
2018-04-05 14:47:44 -04:00
Shawn Ding
c4f12f6de2 Update "Vibrate on tap" string
Update string "Vibrate on tap" to "Touch vibration"
,and add subtitle "Haptic feedback for tap, keyboard, and more"
into the current vibration setting.

Change-Id: I333a10080d170b7305b7e995e703c40130d0348f
Fixes: 74264519
Test: Manual test
2018-03-19 10:55:52 +08:00
Katsiaryna Naliuka
64a89bc9a7 Made ordering in the Sound settings page more sparse to allow injecting
tiles in arbitrary positions.

Also increased a number of settings that are not hidden behind the
overflow to accommodate 1 more line.

Bug: 64065365

Test: manual
Change-Id: I3ac8dfd4802967e02bebc6558a5b96d68cb2ea34
2018-03-13 21:02:55 +01:00
Fan Zhang
33d5a76c6f Remove "emergency alert" from Sound settings
It's already in "App & notification" page

Change-Id: I858999f8e097d5712eee1b8d34f47e0e900bf859
Fixes: 71813931
Test: rebuild/visual/atest UniquePreferenceTest
2018-01-16 14:04:18 -08:00
Fan Zhang
74c61d1fef Use res-auto as app xml namespace instead of settings.
This is necessary for SettingsIntelligence to parse settings:keywords
when indexing search stuff.

Bug: 64938328
Test: rerun tests
Change-Id: I0d8885c854852020dfa0b9faa3044d4a1b82f8f2
2017-11-17 16:49:54 -08:00
Doris Ling
8b14a1a7a6 Change to use the expand button in support lib.
- functionality for hiding portions of the preferences in the preference
screen is added to the support lib. So, changing the settings
implementation to use the feature from the support lib instead.
- remove ProgressiveDisclosureMixin and the related code

Fixes: 63985174
Test: make RunSettingsRoboTests
Change-Id: Ib1d39b2db93d78a56c7adf90abcae5226f9564c2
2017-10-27 13:16:38 -07:00
Fan Zhang
823dde54c7 Misc clean up in search
- Remove updateFromClassNameResource() because it's just a no-op method.
- Simplify SearchIndexResources
- Update some pref pages to have unique keys.

Change-Id: I51e542d9947aafd046861ce7be0b4c7213fcd01d
Fixes: 64951285
Test: UniquePreferenceKeyTest
Test: robotest
Bug: 67852637
2017-10-26 17:54:45 -07:00
TreeHugger Robot
47775667b8 Merge "Add work-only-category controller" 2017-10-17 19:10:29 +00:00
Fan Zhang
1bde0d84b0 Add work-only-category controller
The controller will hide category if there is no child in it.

Change-Id: I9bbcc4115b991574e608933f98857b0b4eb2ed7d
Fixes: 62185871
Test: robotests
2017-10-17 10:34:36 -07:00
Doris Ling
893bdba206 Update tile limit for Sound settings.
Pull the notification and alarm ringtone out of the preference category
and update the tile limit to 1, so that only the first preference
category will be displayed initially.

Change-Id: I9ae7669fb2b688560a3fc228274ea44f225b262f
Fixes: 67750626
Test: visual
2017-10-13 11:45:30 -07:00
Fan Zhang
0d64577205 Fix search indexing for game controller "use vibrator"
Change-Id: I34848a58b5ac4cdf58c7dd5f40677b78e764f2dc
Fix: 64035933
Test: robotests
2017-07-26 21:51:57 +00:00
Fan Zhang
2e72dda1aa Add ordering attribute to sound setting preferences.
The ordering helps injected settings show up before work profile
settings.

Change-Id: Id840b721fc3ef82f53591a16b385965f7a719b67
Fix: 62997256
Test: visual
2017-06-28 18:14:18 -07:00
Matthew Fritze
ed761c4e74 Revert "Revert "Revert "Replace dynamic summary text for SettingPref"""
This reverts commit c1e9f8787f.

Reason for revert: There is an issue when dropdown menu text has a '%' sign in it.
Despite testing it on my own devices, the bug did not show up immediately.

Instead of continuing down this path for OC, we'll just revert
this patch, and then as an ugly, band-aid solution, check the
summary text for the "%s" substring, and hide it when found.
In O-DR onward, we'll look for a more permanent solution.

Change-Id: Ia7a04bfb7b09c436dc0f13564f2134a1f0c436e2
Bug: 36101902
Fix: 62211676
2017-06-06 17:20:30 +00:00
Matthew Fritze
c1e9f8787f Revert "Revert "Replace dynamic summary text for SettingPref""
This reverts commit 8061aaef62.
Test: make RunSettingsRoboTests
Fixes: 36101902
Change-Id: Ide74780153fc7f36d897f559c7a3c138190e3320
2017-05-23 22:04:58 +00:00
Matthew Fritze
8061aaef62 Revert "Replace dynamic summary text for SettingPref"
This reverts commit 03dfa50996.

Change-Id: I1f7188b35ad657f3d9721bab3bbdec697d3c1ae3
Bug: 36101902
Fixes: 38352100
2017-05-17 02:56:28 +00:00
Matthew Fritze
03dfa50996 Replace dynamic summary text for SettingPref
All SettingPrefs that have dynamic summaries are replaced
by placeholder text. Changes are for:
- Battery Saver "Turn on automatically"
- Notification "Dock speaker plays"
- Notification "Emergency tone"

Bug: 36101902
Test: make RunSettingsRoboTests
Change-Id: Ic2556055c155989015dbef6b507d3e3b45b779b5
2017-05-11 12:11:05 -07:00
Doris Ling
df4c67cc69 Update Sound settings.
- change the summary to show the automatic rules info instead.
- removed ringtone preference category
- add dividers above DND and Emergency broadcast

Change-Id: Iee497d194b70af72cfd69b315d639ca62720643b
Fix: 34975939
Test: make RunSettingsRoboTests
2017-03-24 15:46:09 -07:00
Fan Zhang
320d60f0ad Fix some animation janks during code start.
- Create a   summary placeholder for preferences with summary.
- Create a totally empty summary for prefernces without summary.
- For all dynamic prefs that has *no* SummaryLoader, add meta to set
their summary to empty.
- Other dynamic perfs has   as initial summary.

By doing this, all dynamic pref's height is fixed and will not change as
we update summaries, thus eliminating jank during cold start in each
page.

Also removed DashboardAlias for notification preference and default apps as a side fix.

Change-Id: Iec98b7ffef4e920bf573b2244ad04124c1c5d154
Fix: 36414481
Test: make RunSettingsRoboTests
2017-03-21 13:20:18 -07:00
Fan Zhang
dc9a82f5b0 Fix a crash when resuming sound setting with AfW on Ryu
Also renamed a few xmls

Change-Id: I8ff5a778a39ea45471a27048be4ea2f21075872a
Fix: 36357493
Test: make RunSettingsRoboTests
2017-03-16 11:26:33 -07:00
Doris Ling
4731167500 Remove old code from SoundSettings not used in new IA.
- remove the old sound settings xml
- merge Sound Dashboard metadata into SiybdSettingsActivity instead
and remove Sound Dashboard.
- remove OtherSoundSettings

Bug: 35764802
Test: make RunSettingsRoboTests
Change-Id: I25bb94b375cfe0277b3c961e4bee6fec9a14fb98
2017-02-28 14:02:54 -08:00
Fan Zhang
1c118b5f2a Always reserve space for preference icons.
This aligns text on preferences on the same screen when some of them
don't have icons.

- Use a custom layout for
  preference
  EditPreference
  switch preference
  VolumeSeekPreference
  DialogPreferencei
  Restricted*Preference
  DropdownPreference

- Moved related style defs into a new file styles_preference.xml,
  because current styles file is too large to read.
- Switch <PreferenceScreen ...> to <Preference ...> for a bunch of
  regular preferences.
- Also removed some dead style.

Bug: 33430928
Test: runtest --path packages/apps/Settings/tests/app/src/com/android/settings/dashboard/PreferenceThemeTest.java

Change-Id: Ic9b75d3f133f2a83cd999297b8596253d4b10161
2016-12-12 16:02:45 -08:00
Fan Zhang
7aae6746b1 Prevent height change in default ringtone preferences.
- Added a placeholder summary text in ringtone preferences so the height
  is reserved while we load ringtone names.

Bug: 28075406
Test: Visually inspected
Change-Id: Ia4022679fcc9d6992c3bb9439f7bfce9bb552ea1
2016-09-15 13:12:22 -07:00
Andy Hung
f892e21696 Remove mono audio from SoundSettings
Mono audio will move to AccessibilitySettings only.
This reverts commit 0863ea40cd.

Bug: 15283594
Change-Id: I2cc744c96a9f6a6454b0bf533a44bb2eb56b745a
2016-02-26 14:17:29 -08:00
Jason Monk
31c7c32fcc Broadscale logging for Settings
Bug: 26687914
Change-Id: Ida75ccf95376538e2ba95d212d333c40fd2dd6e0
2016-01-30 10:38:43 -05:00
Sudheer Shanka
ba1a68b8ab Add preference summary when disabled by admin.
Change-Id: Iaa84e66b0abe0fccde50f116cbf6e68c6abbabc0
2016-01-25 22:39:34 +00:00
Sudheer Shanka
682a916836 Add padlocks to preferences that can be disabled by policy.
Change-Id: I43b6b5954ef6ec65b86d99321cabab9f49df842d
2016-01-20 17:48:27 +00:00
Julia Reynolds
193e7b044d Add default alarm ringtone to sound settings.
Bug: 25957833
Change-Id: I68d6747894665c97853eabac7edb0f751d1fdcc1
2016-01-20 11:10:49 -05:00
Andy Hung
0863ea40cd Add mono audio to SoundSettings
Bug: 15283594
Bug: 22700363
Change-Id: Ic4571dee4567a94265bbcf11d08108b19687b284
2016-01-06 16:01:19 -08:00
Julia Reynolds
8c0a423865 Split Sound & notification settings.
Bug: 25860852
Change-Id: If88daf6fd50b5abf86fb86f3590361f0118172a1
2015-11-30 11:21:41 -05:00