Commit Graph

605 Commits

Author SHA1 Message Date
TreeHugger Robot
e9a3a14330 Merge "Add ability to show/hide individual settings in Sounds page." 2018-01-12 20:11:30 +00:00
TreeHugger Robot
6c14a6a699 Merge "Zen Mode messages + calls are ListPreferences (radio button dialog)" 2018-01-12 15:33:14 +00:00
Beverly
daa13a969f Zen Mode messages + calls are ListPreferences (radio button dialog)
Bug: 63077372
Test: ZenModeCallsPreferenceControllerTest
Test: ZenModeMessagesPreferenceControllerTest
Change-Id: I5d2516402b261413c51a1b4eba5153ffadf1459b
2018-01-12 14:52:17 +00:00
Ben Lin
921e3d14b8 Add ability to show/hide individual settings in Sounds page.
This adds the following 7 new boolean flags:
config_show_alarm_volume
config_show_charging_sounds
config_show_media_volume
config_show_notification_ringtone
config_show_notification_volume
config_show_screen_locking_sounds
config_show_touch_sounds

Which when set to false, will hide the respective preferences in Sounds
page.

Bug: 69813881
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=com.android.settings.notification all pass.

Change-Id: I84a2ce66b07c00d658422ce1a0eacaf9a01fae8a
2018-01-10 13:58:58 -08:00
Beverly
02b81c137e DND string fixes
Bug: 63077372
Test: make ROBOTEST_FILTER=ZenModeRepeatCallersPreferenceControllerTest RunSettingsRoboTests -j40
Change-Id: Ib2002c75fe86e829bfbbca947affc28dc801cedd
2018-01-09 17:49:04 -05:00
Beverly Tai
5c182d6d14 Merge "ZenModeBackend gets newest notification policy" 2018-01-09 19:18:36 +00:00
TreeHugger Robot
b8b9b283fe Merge "Merge sub pages for lock/unlock into 1 xml." 2018-01-05 00:36:17 +00:00
TreeHugger Robot
2c3c8c8537 Merge "Support getDynamicSummary in BasePreferenceController" 2018-01-05 00:02:48 +00:00
Fan Zhang
928ddbe731 Merge sub pages for lock/unlock into 1 xml.
And create PreferenceControllers for each setting

The page is still pretty janky and controllers are invoked manually.
Next CL will clean these up.

Bug: 32953042
Test: TODO
Change-Id: I1d7478324f5de4fdb464d79f89086f7e79c0ee67
2018-01-04 15:02:36 -08:00
Matthew Fritze
c69f73f4d1 Support getDynamicSummary in BasePreferenceController
Adds dynamic summary getter in relevant BasePreferenceControllers.
Preferece controllers that don't have dynamic summaries or which
are not yet BasePreferenceControllers are not changed right now.

Change-Id: I435ccab7758d90515583fd8ca10a9b1ef0c858b9
Fixes: 71514936
Test: robotests
2018-01-04 13:58:01 -08:00
Julia Reynolds
3527ef7c29 Notification settings updates
- Text changes
- Show channels on the app settings screen (again)
- Hide most of the channel settings under 'advanced' (note: this hides
  the footer preference(s) also, at the moment. the functionality
  to exclude those is coming in a later cl)
  - Add a 'show notifications' toggle for each app created group

Bug: 63927402
Test: make RunSettingsRoboTests

Change-Id: I9906ef943d05e1915061b59294a25d81c4e6cbb5
2018-01-02 15:34:58 -05:00
Tony Mantler
09d2d71760 Move ServiceListing to SettingsLib
Also tidy things up a bit

Bug: 70902607
Test: RunSettingsRoboTests
Change-Id: Id641beb601513bb4e34a098bf2729eb98954175d
2017-12-21 09:49:44 -08:00
Beverly
bd775d9f62 ZenModeBackend gets newest notification policy
Previously, notification policy wouldn't be updated
so behavior zen mode settings pages wouldn't update
when an app changed the notification policy.  Now
notification policy will be updated on updateState of
each AbstractZenModePreferenceController.

Bug: 70662324
Test: make RunSettingsRoboTests -j40
Change-Id: Ibee20e4f27e0c833e05230ea8a3ea2cc75ae6bf0
2017-12-14 15:59:46 -05:00
Beverly
69294a5d5c Simplify DND Behavior secondary text
Bug: 63077372
Change-Id: I0ac305ff429de27a65667441703b938305d8a03f
Fixes: 70627215
Test: make ROBOTEST_FILTER=ZenModeSettingsTest RunSettingsRoboTests -j40
2017-12-13 15:23:03 -05:00
Beverly
2c5895d615 Default DND rules show at top and can't be deleted
Test: make ROBOTEST_FILTER=ZenModeAutomaticRulesPreferenceControllerTest RunSettingsRoboTests -j40
Bug: 63077372
Change-Id: I43e7e2a70df5defe931a7ecedc6f946853dab476
2017-12-06 14:53:09 -05:00
Beverly
323522171d Updates to automatic rule pages in Settings
- Re-added metrics for zen behavior preference controllers
- Dialogs in zen mode settings are rotate-friendly
- Automatic rules are refreshed on update state
- User-created (and default) automatic rules are always priority only and user cannot change this
- Automatic rules redesigned to have headers

Test: make ROBOTEST_FILTER=ZenModeAutomaticRulesPreferenceControllerTest RunSettingsRoboTests -j40
Bug: 63077372
Fixes: 68324465
Fixes: 69057696
Change-Id: I163acef2715dd4e60bfc08207f0e22352c4c0e28
2017-12-06 10:14:08 -05:00
Beverly
b7b74226c3 Added footers to zen mode settings
ZenModeSettings Footer displays when DND will end
ZenModeBehaviorSettings Footer describes why dnd behavior cannot be changed when
in alarms only or total silence mode

Test: make RunSettingsRoboTests -j40
Bug: 63077372
Change-Id: Iefbb3995da4af2b210c8e0c3c3a798d3c613e275
2017-12-05 14:35:31 -05:00
TreeHugger Robot
312d6c4912 Merge "ZenPreferences observe zen changes from USER_ALL" 2017-12-03 16:24:46 +00:00
Beverly
71a191c222 ZenPreferences observe zen changes from USER_ALL
Zen manual rule changes are changed by USER_SYSTEM, so Zen Preference
Controllers must register their content observers for zen changes and
zen config changes to USER_ALL instead of just their own user id.

Change-Id: I75194b62ab5e5b21dffbf04bba5009659bb41d81
Fixes: 70028673
Test: make ROBOTEST_FILTER=ZenModeButtonPreferenceControllerTest RunSettingsRoboTests -j40
2017-12-01 13:08:20 -05:00
TreeHugger Robot
4031bc78e4 Merge changes from topic "settings_presubmit_instr_test"
* changes:
  Refactor help menu stuff into a controller
  Fix UniquePreferenceTest
2017-11-30 01:38:33 +00:00
Fan Zhang
e0b0e9f902 Refactor help menu stuff into a controller
This is a clean up to action bar menu item pattern, we will use the same
pattern to build search icon on all pages in a later change.

Bug: 68814716
Test: robotests
Change-Id: Iedd3ec263e8ccb63ed75ec7a95b28c00878b1de4
2017-11-29 15:51:04 -08:00
Fan Zhang
1ae1e17199 Fix indexing in cast and zen mode settings
- Fragment should either not implement serach provider or return a valid
  xml. Search provider with 0 resource is invalid.

Change-Id: Ie87c739bf72c926cecf48d271c6c2d72459787c4
Fixes: 69864274
Test: robotests
2017-11-28 17:50:15 -08:00
jeffreyhuang
b83fd6c3d1 Update tests to sdk 26
Test: make RunSettingsRoboTests -j40
Change-Id: Ib344f0622dfa3b9f9a8fdd6736bc34cb4f536db8
2017-11-27 14:57:32 -08:00
Julia Reynolds
a87cee11b6 Restore group block button.
Test: RunSettingsRoboTests
Bug: 63927402
Change-Id: I2e8163082d81d696dce2082be49a16c85458672b
2017-11-20 09:11:57 -05:00
Beverly
495c646744 Code cleanup in Zen Mode Settings
Changes in response to code review from automerged commit ag/3171711

Test: make -j40 RunSettingsRoboTests
Bug: n/a
Change-Id: I5df3db4e8ff421ca9911c84ae3f621a0e3d08092
2017-11-17 11:05:34 -05:00
TreeHugger Robot
d76496dca1 Merge "Added zen settings messages and calls preferences." 2017-11-15 21:59:47 +00:00
Beverly
a58e52a0be Added zen settings messages and calls preferences.
- Made ZenModeSettings and ZenModeBehaviorSettings a DashboardFragment
- Switches in ZenModeBehaviorSettings all have their own preference controllers
- Instead of a dropdown, messages & calls have their own pages & preference controllers
- Added basic turn on/off DND button in settings (dialog not yet implemented)

Bug: 63077372
Fixes: 69057767
Test: make -j40 RunSettingsRoboTests
Change-Id: I1c70f77053713f66f873ee578477f23cfd7985bb
2017-11-14 14:16:26 -05:00
Doris Ling
4a01283309 Remove the feature flag for using new title.
- remove all code that check for the feature flag, and use the new logic
by default.

Change-Id: I7fbe60da84c1c0f35e7241402a71d2bc4cd300e6
Fixes: 64564191
Test: make RunSettingsRoboTests
2017-11-13 17:58:13 -08:00
TreeHugger Robot
bb09fd8425 Merge "Use setVisible instead of removePreference everywhere." 2017-11-10 00:02:58 +00:00
Fan Zhang
a72620b67b Use setVisible instead of removePreference everywhere.
Change-Id: I2e8084b23d3cb2c0a31a38c01716fc76236734ea
Fixes: 68956750
Test: robotests
2017-11-09 13:22:36 -08:00
Matthew Fritze
f6cf598d03 Prevent crash in Search from Stack overflow
NotificationSettingBase's getPreferenceController call
is recursive with no base case which crashes search.

Root cause here is that NotificationSettingsBase should
not be indexed for seacrh but was probably failing the
code inspection test. Added NotificationSettingsBase
child classes to grandfather list of classes that
should be ignored for search.

Change-Id: I04ed242db3a394b88e0d0ac420aaaff6f9301cb5
Fixes: 69096424
Test: robotests
2017-11-09 10:40:14 -08:00
Julia Reynolds
ac3f7e80dc PreferenceControllers are the way of the future.
Migrates Notification settings (app level, group level, and channel
level) into PreferenceControllers (and most importantly:
PreferenceControllerTest)

Note: this removes the 'Advanced' preference group, but does
not yet use the standard system 'Advanced' grouping as it does
not currently support our use case (where we don't know how many
fields to show outside of 'Advanced' until onResume() and also
where we need fields to show below the 'Advanced' group).

Test: make RunSettingsRoboTests
Change-Id: Iddd1b4771922db322e5f73562e9d63ed077c5396
2017-11-06 13:50:26 -05:00
Fan Zhang
1c3a4de93d Switch to use small icon for most app related pages
- Renamed AppProgressPreference to AppPreference to handle most app
  related prefs
- Add ed AppSwitchPreference - the same layout as AppPreference except
  it's a SwitchPreference
- Use above 2 prefs in most app related pages.
  - Everything under special access pages
  - Recent app list in App & notifications
  - App data usage detail page
  - Default app picker pages

Bug: 65182905
Test: robotests
Change-Id: I96c980ba1db49e36dabe25b5eade1197215aad11
2017-10-30 12:20:49 -07: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
TreeHugger Robot
295a6b42f4 Merge "Moved zenMode visual effects + automatic rule page" 2017-10-27 15:23:19 +00:00
Beverly
4359d4b9c9 Moved zenMode visual effects + automatic rule page
- Automatic zen rules have their own page like in N
- Minor string changes to page and add rule dialog
- Zen mode visual effects was moved into behavior settings

Bug: 63077372
Test: $ make SettingsUnitTests -j40
$ adb install -r ${OUT}/data/app/SettingsUnitTests/SettingsUnitTests.apk
$ adb shell am instrument -w com.android.settings.tests.unit/android.support.test.runner.AndroidJUnitRunner

Change-Id: I9635f8f7969b76d036bc06ec44705815e540777a
2017-10-27 09:49:04 -04:00
Doris Ling
ed4685fafb Update activity titles for fragments without preference screen.
1. Move getPreferenceScreenResId() from individual subclass to
InstrumentedPreferenceFragment.

2. Removed InstrumentedPreferenceFragment.getTitle() and let the
preference fragments that do not have preference screen set the activity
title directly instead.

3. Removed OptionsMenuFragment as all it does is call
setHasOptionMenu().
- changed subclasses of OptionsMenuFragment to extend from
InstrumentedPreferenceFragment directly.
- none of the exisitng subclasses actually implements the option menu
related methods to provide any option menu. So, the setHasOptionMenu()
call is not added to the subclasses.

4. Update Languages preference title.
- launch the fragment from the preference controller instead of from the
default handling, as we need the title res id at launch time to get it
work properly when retrieving the title from back stack.

Bug: 64564191
Test: blaze-bin/screenshots/android/i18nscreenshots/i18nscreenshots
Change-Id: Ibecdcab32cbaed8bf604ec5ebe0a926b4e489a7d
2017-10-26 12:01:06 -07:00
TreeHugger Robot
2bb74379e5 Merge "Update preference screen title." 2017-10-25 20:30:31 +00:00
Doris Ling
03a3b518de Update preference screen title.
- Add missing title to preference screen xml so that they will be used to
set the activity title when the fragment is launched.
- Also updated some incorrect preference screen titles.
- Overrides getTitle() in preference fragments that do not use the
preference screen xml.

Bug: 64564191
Test: blaze-bin/screenshots/android/i18nscreenshots/i18nscreenshots
Change-Id: Id72d5ddf18f0962bc484de8bbd847a2e55d6371e
2017-10-25 11:02:07 -07:00
Fan Zhang
25f29bf126 Only allow Settings app launch search result page
Bug: 68199963
Test: robotest
Change-Id: I0018e9c60b0dd46fc2420a563a93b706bf252dc4
2017-10-24 16:27:47 -07:00
Fan Zhang
89b8e5c103 Deprecate resId field in SearchIndexableResources
Change-Id: Ie69a68beae51e35c7bc861cd124d8195c1ed39dd
Bug: 37741509
Test: robotests
2017-10-24 09:59:16 -07:00
Doris Ling
4930065f3a Update tile limit for Sound settings. am: 893bdba206
am: 15d06244d3

Change-Id: Ib307fc04adea4b7371f5234fa0c5c0813ff7b41e
2017-10-15 05:33:47 +00: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
Beverly Tai
f424c3fa90 Merge "Replaced dnd priority setting page w/ behavior." 2017-10-12 13:20:41 +00:00
Beverly
ad898e6928 Replaced dnd priority setting page w/ behavior.
Bug: 63077372
Test: manual, make -j20 RunSettingsRoboTests
Change-Id: I79fd431da0cbed1407f0dab38e64f0bdb3ff3feb
2017-10-11 17:55:00 -04:00
liurong
20965328db [Settings]Crashed when 3rd-party app call ZenModeScheduleRuleSettings directly
Fix the issue that some 3rd-party apps call ZenModeScheduleRuleSettings directly
without set the extra ConditionProviderService.EXTRA_RULE_ID. It will raise the
exception and make settings crash.

Test: 1. Install the app "QuickShortcutMaker"
      2. Following the steps descripted in the issue:
         https://issuetracker.google.com/issues/37977351
      3. make ROBOTEST_FILTER="(ZenModeScheduleRuleSettingsTest)" RunSettingsRoboTests

Change-Id: Ia7de0e691eef6d0da26e629ff0c6af7006757623
Signed-off-by: liurong <liurong@xiaomi.com>
2017-10-09 14:12:17 -07:00
Svet Ganov
9bbc0cc38a Merge "Use new no overlay flag instead app ops" into oc-mr1-dev am: 9cb867d6e3
am: 6adbad6937

Change-Id: I0b60e9cd77643f5b2a22c5d09ddb2994d28ec82a
2017-10-04 21:01:27 +00:00
TreeHugger Robot
9cb867d6e3 Merge "Use new no overlay flag instead app ops" into oc-mr1-dev 2017-10-04 20:38:58 +00:00
Svet Ganov
e53d1caedc Use new no overlay flag instead app ops
Test: updated DrawOverlayDetailsTest passes

bug:66936547

Change-Id: I7c17c95a2b44fd2ffd593a6eb03a16be034e9192
2017-10-02 21:00:43 -07:00
Alison Cichowlas
ad1158169c Notification importance/selected sound conflict fixes.
- When you've selected "Silent" as your sound, update notification
importance messaging to match.
- When you explicitly move from a silent type of notifications to a
loud type, but have "Silent" selected as the sound, change the
sound to the default notification sound also.

Change-Id: I462785d593e1d6c7d1e87388aeee1bdcbcf6aa3d
Fixes: 63109928
Test: RunSettingsRoboTests, manual
2017-09-22 10:55:27 -04:00