Commit Graph

517 Commits

Author SHA1 Message Date
Julia Reynolds
153578ebc3 Merge "Remove automatic rule icons" into oc-dr1-dev am: 0ed32cae99
am: 1f14e49fa5

Change-Id: I16bf3668f5ba49d7ff471322bd68937c6da23d0d
2017-07-14 16:54:58 +00:00
Julia Reynolds
1c3a291ffb Remove automatic rule icons
Test: code inspection
Change-Id: I7e585f485d3ba9318bf533e07e9fa7f1e1874d51
Fixes: 63623747
2017-07-14 10:03:56 -04:00
Fan Zhang
75bee9bf98 App header cleanup
- Refactor the entity header layout to use LinearLayout and add id to
  content area
- Remove now unused AppHeader class
- Make entire icon+text area clickable and link to app info page
  Refactor the binding logic from bindButton to its own method.
- Remove unused MultiLinePreference

Fix: 62705377
Test: make RunSettingsRoboTests

Change-Id: I6db554695410e71b669f6fdba29d98fedc3364b9
2017-07-06 13:23:38 -07:00
TreeHugger Robot
b5ef73ebcb Merge "Add ordering attribute to sound setting preferences." 2017-06-29 17:12:36 +00:00
Maurice Lam
21bd3994c4 Merge "Read theme for lock screen flows" into oc-dr1-dev am: 864d5c96d7
am: d3d1210fad

Change-Id: I6f689b5242b122eb2f4388de10acb7e4c7e3b81e
2017-06-29 02:07:19 +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
Maurice Lam
9990f39722 Read theme for lock screen flows
Move the applyThemeResource calls up from the setup wizard specific
subclasses up to the settings classes so that it will get GLIF v2
theme on devices that request it.

Test: Manual
Bug: 62906814
Change-Id: I6ff4ff8d9ed3e6090b35b4ae7197e5d01f5a61f8
2017-06-28 15:06:09 -07:00
Tony Mantler
1d583e125f Make PreferenceController a mixin
Bug: 62912136
Test: Existing tests in BaseSearchIndexProviderTest
Change-Id: Ieda359806c09a019840b2005446c7ec8b61fdb00
2017-06-26 10:58:36 -07:00
Julia Reynolds
559bd3651e Disable managed services special access screens...
... on low ram devices.

- Remove them from the 'Special app access' screen
- Display an error message if an app intents directly to
them

Bug: 35219985
Test: visual, and runtest --path ManagedAccessSettingsLowRamTest.java,
when the device is in low ram mode and when it's not.
Change-Id: Ied919cb248ae56683a00e3492c4737dfd00449ac
2017-06-23 15:44:43 -04:00
Alison Cichowlas
4fe455de57 Notification settings to match ixd mocks:
- added default sound config to general notification settings page
- reordered items to match docs

Bug: 37481153
Test: RunSettingsRoboTests; manual

Change-Id: I2404f0a3f97601c8b3a9d15de58e1d53bf801c45
2017-06-22 10:44:27 -04:00
Julia Reynolds
c429ffb592 Merge "Migrate from setting to NotificationManager." 2017-06-19 17:59:03 +00:00
Alison Cichowlas
1a74eefb54 Merge "Notification settings update." into oc-dr1-dev am: cd9224a058
am: eeda4ae540

Change-Id: I3139992a754e69e8ef1e2da858403a0e3b3f3b79
2017-06-19 15:15:31 +00:00
Alison Cichowlas
7b0a8b6815 Notification settings update.
- Use "what happens" descriptors instead of priority level names in summary
- Group some settings under Advanced header.

Bug: 62705435
Test: make RunSettingsRoboTests; manual verification
Change-Id: Iac31575d894d7f3532c8e631ee9d77ee21830b29
2017-06-19 08:53:45 -04:00
Fan Zhang
fdcb8b1dc8 Hide app info button from app notification settings header
Change-Id: I10803e78fe4f30c2d84ec795c343ed660aab7762
Bug: 62708686
Test: visual and runtest --path AppNotificationSettingsTest.java
(cherry picked from commit 5d811c40d3)
2017-06-16 22:30:31 +00:00
Fan Zhang
5d811c40d3 Hide app info button from app notification settings header
Change-Id: I10803e78fe4f30c2d84ec795c343ed660aab7762
Bug: 62708686
Test: visual and runtest --path AppNotificationSettingsTest.java
2017-06-16 13:12:44 -07:00
Alison Cichowlas
d58d342967 Add separator line in notification settings,
above link to in-app settings.

Test: make RunSettingsRoboTests
Bug: 62543732
Change-Id: Ibf4f08c3d5feba90598d71f48c050e87ab9c3fdf
2017-06-15 15:11:19 +00:00
Julia Reynolds
ee4b6ba6ae Migrate from setting to NotificationManager.
Test: manual; changing settings and confirming with bugreport
Change-Id: I1595fc3ceca8cd31d5bece52dff75aebe29d2ae3
2017-06-14 11:34:47 -04:00
Alison Cichowlas
665384a8eb Limit unconfigurability to specified channels.
am: 80fa6b5833

Change-Id: I63c40ae241f6891fa1e6b85a78dc78d2b918ca6d
2017-06-13 01:45:10 +00:00
Alison Cichowlas
80fa6b5833 Limit unconfigurability to specified channels.
Bug: 62426259
Test: Unit test in NotificationBackendTest.java
Change-Id: I79d069cee0b641d520b02f8a25751ec3e0d4632d
2017-06-12 23:17:11 +00:00
Alison Cichowlas
bbd4fc124a Limit unconfigurability to specified channels.
Bug: 62426259
Test: Unit test in NotificationBackendTest.java
Change-Id: I79d069cee0b641d520b02f8a25751ec3e0d4632d
2017-06-12 13:44:38 -04:00
Alison Cichowlas
a90a144ef3 Merge "If two groups are posted to settings, remove old group and log." into oc-dev am: 9fa5e66a66
am: 59b4e5b6c4

Change-Id: I0661ae34df7dcca80b394e9751ce91dd2f5f25e1
2017-06-07 00:11:08 +00:00
TreeHugger Robot
9fa5e66a66 Merge "If two groups are posted to settings, remove old group and log." into oc-dev 2017-06-06 23:34:44 +00:00
Alison Cichowlas
130a028f33 If two groups are posted to settings, remove old group and log.
Bug: 62136650
Test: manual: set debugger in asynctask at line 110 to force
race condition, triggered task twice then released both.
also ran existing tests with no new failures.
Change-Id: I8508fe9f191ca6cd0bb6dfbc62d884420d3fd747
2017-06-06 17:02:23 -04:00
Matthew Fritze
84ef9daa4f Merge "Revert "Revert "Revert "Replace dynamic summary text for SettingPref"""" into oc-dev am: b8028f63ec
am: 64736b6ae1

Change-Id: I7267309d17ae503144eb11789888937af6c8a0e1
2017-06-06 18:13:41 +00:00
TreeHugger Robot
b8028f63ec Merge "Revert "Revert "Revert "Replace dynamic summary text for SettingPref"""" into oc-dev 2017-06-06 17:44:23 +00: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
Julia Reynolds
d85ff59ce7 String changes
- channel summaries
- Notification listener name
- notifications app page title

Change-Id: I0745c06aad44bfa7636ee2b10be9387313093fe3
Fixes: 36529184
Fixes: 38178073
Test: manual
2017-06-05 11:05:43 -04:00
Alison Cichowlas
0f7e904dbe Merge "Delay adding app settings link until data fetch returns, to avoid reordering/visible misplaced "additional settings in the app" during transition." into oc-dev am: e811873b4e
am: f62c6372e8

Change-Id: Ic1434ccc7a4ec01957a7d1219fa5cf6cc1f84948
2017-06-02 18:52:33 +00:00
TreeHugger Robot
e811873b4e Merge "Delay adding app settings link until data fetch returns, to avoid reordering/visible misplaced "additional settings in the app" during transition." into oc-dev 2017-06-02 18:42:25 +00:00
Alison Cichowlas
5cdcb40cd3 Merge "Disallow buzz/beep/disturb changes for notifications with locked importance." into oc-dev am: 3efc502840
am: 5698552021

Change-Id: Ib0a9db86ea0191c4cd487842eb9ce49b9e6db2e0
2017-06-02 17:02:30 +00:00
TreeHugger Robot
3efc502840 Merge "Disallow buzz/beep/disturb changes for notifications with locked importance." into oc-dev 2017-06-02 16:46:52 +00:00
Alison Cichowlas
4b29f593f0 Merge "Add group name into channel summary, if applicable." into oc-dev 2017-06-02 15:39:44 +00:00
Sheng Wang
fd1a02d914 Merge "Volume can not be updated in Sound&notification" am: c0fdbab185 am: 161e3d14e1 am: 9dbd34a3d9
am: 61a420df95

Change-Id: I0ed31e1c4e8b1a74a2aca2288876ca57f05ca79c
2017-06-02 00:57:09 +00:00
Sheng Wang
61a420df95 Merge "Volume can not be updated in Sound&notification" am: c0fdbab185 am: 161e3d14e1
am: 9dbd34a3d9

Change-Id: I50a30452b6e0162070960ffdc35197ddef785609
2017-06-02 00:27:56 +00:00
Sheng Wang
8c329af634 Volume can not be updated in Sound&notification
After "onActivityPause()" is invoked and "onActivityResume()"
is invoked again, "mVolumizer" is not empty object,
so volume is not updated.

To fix this issue, set "mVolumizer" is null in "onActivityPause()",
if "onActivityResume()" is invoked again, recreate "mVolumizer"
and update volume.

Bug: 37558283
Test: manual, cherrypicking from AOSP
Change-Id: Id91064ea32305b5bf203f34e31988ac923beee6d
2017-06-01 16:35:03 -07:00
Alison Cichowlas
8ad2fa6865 Add group name into channel summary, if applicable.
Bug: 36642898
Test: ran integration & robo tests (no new failures); verified manually with apps with channels & without.

Change-Id: I16a255b0e5d929f4485d3725bd18179e6f411c03
2017-06-01 17:04:36 -04:00
Alison Cichowlas
afe44799f7 Delay adding app settings link until data fetch returns,
to avoid reordering/visible misplaced "additional settings
in the app" during transition.

Bug: 62051521
Test: manual with transition scale turned to 10x sloooow.
Change-Id: I50666fbcb2a14344bbdbb2f4347c8470edb96619
2017-06-01 16:07:32 -04:00
Alison Cichowlas
9f36db1f4c Disallow buzz/beep/disturb changes for notifications with locked importance.
If mAppRow.lockedImportance (which comes from the whitelist config_nonBlockableNotificationPackages), don't allow sound, vibration, or override dnd to be changed.

Bug: 38480212
Test: manually verified for now
Change-Id: I04aa7f15f2480472ec6ee487472098e81ab3d99f
2017-06-01 10:52:15 -04:00
Alison Cichowlas
2280afc54e Add group name into channel summary, if applicable.
Bug: 36642898
Test: ran integration & robo tests (no new failures); verified manually with apps with channels & without.

Change-Id: I16a255b0e5d929f4485d3725bd18179e6f411c03
2017-05-31 15:12:25 -04:00
Julia Reynolds
f1239e1b84 Merge "Allow some system channels to be blocked" into oc-dev am: 540e8f50e3
am: 166a994a4c

Change-Id: Ide3aeac0c328f08becc693795ef5553fa0c9a281
2017-05-26 15:02:40 +00:00
Julia Reynolds
540e8f50e3 Merge "Allow some system channels to be blocked" into oc-dev 2017-05-26 14:39:31 +00:00
Fan Zhang
879f079e04 Show setting for work profile lock screen notification
- Add work profile notification setting to security_lockscreen_setting
- Modify the preference controller to stop hardcode preference keys.

Merged-In: I779590e34c1eca2dab5b62dda473cfa4371fc064
Change-Id: I5966d82f6373b3bf784385423b87fb4d26aecf0e
Fix: 62051309
Fix: 62045663
Test: make RunSettingsRoboTests
2017-05-25 11:49:56 -07:00
Fan Zhang
33c493777b Show setting for work profile lock screen notification
- Add work profile notification setting to security_lockscreen_setting
- Modify the preference controller to stop hardcode preference keys.

cherry-pick of: ag/2315314

Bug: 62051309
Bug: 62045663
Test: make RunSettingsRoboTests
Change-Id: I779590e34c1eca2dab5b62dda473cfa4371fc064
2017-05-25 11:49:10 -07:00
Julia Reynolds
3a77e1d4a0 Allow some system channels to be blocked
Test: manual
Bug: 38428796
Change-Id: If6853f1d847ade968d2bd3a7454ddce0fdda62f0
2017-05-25 14:26:58 -04:00
Matthew Fritze
1dd31158a8 Merge "Revert "Revert "Replace dynamic summary text for SettingPref""" into oc-dev am: ae0886c9f7
am: 934a04509f

Change-Id: Iff239e99df07cf425f650fbdb9cfb72a3fc40182
2017-05-24 17:18:58 +00:00
TreeHugger Robot
ae0886c9f7 Merge "Revert "Revert "Replace dynamic summary text for SettingPref""" into oc-dev 2017-05-24 17:12:35 +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
TreeHugger Robot
b53938ff29 Merge "Add summary text to Apps & notifications -> Notifications" 2017-05-23 18:48:52 +00:00
Doris Ling
929bc614de Add summary text to Apps & notifications -> Notifications
Share the summary provider for Apps & notifications -> Notifications ->
Notifications with Apps & notifications -> Notifications so that the
upper level also shows the corresponding notification summary.

Change-Id: Id6879d9a6b00237781320c18591703b3031c9627
Fix: 36376411
Test: make RunSettingsRoboTests
2017-05-23 10:15:26 -07:00
Fan Zhang
841d1d5aab Show shadow when entity header starts scrolling.
- Add a controller to manage add/remove onScrollChangedListener to
  recyclerviews.
- When recyclerview on each screen is scrolled to top, set actionbar
  elevation to 0, otherwise set it to non-zero.
- When screen is moved to background, detach the listener.
- Use the controller in entity header.

Change-Id: Iecf194d885098c98c392810f62893ae9189f3936
Fix: 37670670
Test: make RunSettingsRoboTests
2017-05-22 17:16:24 -07:00