PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
63,726 Commits 1 Branch 0 Tags
0e0b6b2dd9e96e848c3d91acee0c5f17f20f9901
Commit Graph

338 Commits

Author SHA1 Message Date
TreeHugger Robot
bc1687c94f Merge "Don't filter demoted conversation from app subtext" into rvc-dev am: 6f837d10bf am: f61da397fd am: 8b94c0e4a3 am: 1b29a5a2ba 
Change-Id: Ia90ec22e76476867615f4482e27c55434e50bb10
 2020-03-31 05:01:12 +00:00
Julia Reynolds
139f0ccf07 Merge "Conversations can't individually bypass dnd" into rvc-dev am: b3f2c0d528 am: 6d30804cec am: 639b6f89ea am: 41874f9f73 
Change-Id: Ic0b0645779a3ca80c841b83c21f2f93cc2bdf5c5
 2020-03-31 05:00:16 +00:00
TreeHugger Robot
6f837d10bf Merge "Don't filter demoted conversation from app subtext" into rvc-dev 2020-03-30 20:03:45 +00:00
Beverly
ef2c91c9a3 Don't filter demoted conversation from app subtext 
If the notification channel is a demoted converation, we still want to
include it as a notification channel that can bypass DND under the
"apps" preference for DND.

Test: manual, make RunSettingsRoboTests7
Fixes: 152765113
Change-Id: Ief072b19280b0dc6e6c37d2d46d51f045d42bb4e
 2020-03-30 14:01:38 -04:00
Julia Reynolds
56d0f6b03a Conversations can't individually bypass dnd 
Test: atest
Fixes: 152482973
Change-Id: I19432b79724beca46974c1c88d42a231f0703dc7
 2020-03-30 13:18:38 -04:00
Julia Reynolds
d9fe7b36d3 Merge "Fix broken test" into rvc-dev am: 5a950b763f am: 275f372a72 am: ade39e479f am: 364690d789 
Change-Id: I0afef276606a4784d0d33bc09f8c133478185e66
 2020-03-27 16:50:57 +00:00
TreeHugger Robot
9d0098bcc2 Merge "Add mocked main looper to test" into rvc-dev am: 493bf6697f am: 857392d25b am: 063208c56c am: 8ad2e1dd29 
Change-Id: I8210b58e009bc10c82e34ecfc898c633f9aa6ea3
 2020-03-27 13:52:23 +00:00
Julia Reynolds
83d0de8d07 Fix broken test 
Test: this
Fixes: 152374833
Change-Id: I9065f6b3700fa288cb3fd65ef2b24c2821325e51
 2020-03-27 09:36:18 -04:00
TreeHugger Robot
493bf6697f Merge "Add mocked main looper to test" into rvc-dev 2020-03-27 13:00:21 +00:00
TreeHugger Robot
ebe03ee645 Merge "DND Bypassing Apps redesign" into rvc-dev am: 7440bf7034 am: 300b3742fd am: 23188466eb am: ea2948eaaa 
Change-Id: I844e7151e9f23a0d1ce6cb6b04432d80bb3a1cbe
 2020-03-26 22:10:28 +00:00
Beverly
37462ff959 Add mocked main looper to test 
Toasts were updated in frameworks/base and now will try to get
the main looper when trying to create an AccesssibilityManager. Add this
mock to avoid a null pointer when trying to post a ShadowToast.

Fixes: 151844983
Test: atest make RunSettingsRoboTests7
Change-Id: I4cb6fe44506097b52ce1bb0c8ae7a502d0901f64
 2020-03-26 16:26:44 -04:00
Beverly
f707950ee7 DND Bypassing Apps redesign 
- Add link in DND Conversations Page to the overall conversations list
Settings page
- Add custom_rule xml pages for custom schedule rule settings for
messages and calls (so the UI is the same as before the message/calls
redesign)
- Change app exceptions to display apps with subtext indicating which
notitfication channels are allowed to bypass dnd (previously, would
display each channel individually)
- Add individual AppBypassDnd channel pages where users can decide which
channels will bypass DND for an app on a single page
(AppChannelsBypassingDndSettings)
- Only remove dnd bypassing apps preferences from the preference list if the list changed,
else just update the preference itself to avoid the list from flashing

Test: make RunSettingsRoboTests7
Bug: 151845457
Change-Id: If12d8921e1405aefb1066acc2ef5c55d216fe47a
 2020-03-26 16:49:17 +00:00
Julia Reynolds
aaa0cc5238 Merge "Update all conversations screen" into rvc-dev am: 79fd5811cd am: 941d437df6 am: cff74feef2 am: 03c0421dc4 
Change-Id: I23c953ca75db72ecbbe754d59a83cdb9b6e90441
 2020-03-24 22:00:27 +00:00
Julia Reynolds
2f0bd6552c Update all conversations screen 
Update text, and filter the lower section to match the new
header

Test: atest
Fixes: 151765526
Change-Id: I5bc052813745908df8602bf397434a76b294ba6c
 2020-03-24 19:37:13 +00:00
TreeHugger Robot
55fa8229a7 Merge "Update DND people Settings pages" into rvc-dev am: a33c8e8048 am: c21f849fe7 am: f5eac3f0cf am: 95d85c0e34 
Change-Id: I7335593a093a8e25c0296434e710f7ccd667d140
 2020-03-24 06:52:32 +00:00
TreeHugger Robot
a33c8e8048 Merge "Update DND people Settings pages" into rvc-dev 2020-03-24 05:56:29 +00:00
TreeHugger Robot
9b9b83f3cd Merge "Redesign individual conversation page" into rvc-dev am: 43d9013aaa am: 7866eddfa5 am: fea8da24ee am: bc35ad85b8 
Change-Id: I141a416ad6c63161c8049193def2c2385a66d2bb
 2020-03-23 17:45:45 +00:00
TreeHugger Robot
43d9013aaa Merge "Redesign individual conversation page" into rvc-dev 2020-03-23 16:31:27 +00:00
TreeHugger Robot
4d4c55ad72 Merge "Updates main page for Do Not Disturb" into rvc-dev 2020-03-23 14:01:46 +00:00
Beverly
5cfb5aa52d Updates main page for Do Not Disturb 
Settings > Sound > Do Not Disturb
- Update strings, more descriptive summary for DND Apps summary
- Move top-level ordering of preferences
- Remove old unused DND strings

Test: make RunSettingsRoboTests7
Test: make ROBOTEST_FILTER=ZenModeBypassingAppsPreferenceControllerTest RunSettingsRoboTests
Test: manual
Bug: 151845457
Change-Id: I9c23c558a9d764702e966d22e5c6e5c5425e4d32
 2020-03-23 01:41:45 +00:00
Julia Reynolds
94b04df4b4 Redesign individual conversation page 
Test: atest
Fixes: 151765526
Change-Id: I98d45222104eb03449e469bcd80fd5f23c2935ca
 2020-03-20 18:34:24 -04:00
Beverly
e65db314f1 Update DND people Settings pages 
Settings > Sound > Do Not Disturb > People
- Redesign of messages + calls settings pages
- Redesign of conversations page
- Added strings for Apps page

Test: make RunSettingsRoboTests7
Bug: 151845457
Change-Id: I58d22a31c398418c053e06a4c6bf5ed8c482ee35
 2020-03-20 19:37:59 +00:00
Beverly
509273cc03 Updates main page for Do Not Disturb 
Settings > Sound > Do Not Disturb
- Update strings, more descriptive summary for DND Apps summary
- Move top-level ordering of preferences
- Remove old unused DND strings

Test: make RunSettingsRoboTests7
Test: make ROBOTEST_FILTER=ZenModeBypassingAppsPreferenceControllerTest RunSettingsRoboTests
Test: manual
Bug: 151845457
Merged-In: I9c23c558a9d764702e966d22e5c6e5c5425e4d32
Change-Id: I9c23c558a9d764702e966d22e5c6e5c5425e4d32
 2020-03-20 17:12:55 +00:00
Hall Liu
900ccba596 Merge "Rename NotificationChannel#setBlockableSystem" into rvc-dev am: 64e48c2061 am: f0f5796b95 am: a81102b92c am: 30de5f4593 
Change-Id: I18ffb79438ebc5cfb22b748953501f6a72ebf107
 2020-03-19 21:54:53 +00:00
Hall Liu
64e48c2061 Merge "Rename NotificationChannel#setBlockableSystem" into rvc-dev 2020-03-19 21:06:54 +00:00
Hall Liu
45e4b8948c Rename NotificationChannel#setBlockableSystem 
Rename the method to setBlockable. Also rename isBlockableSystem in the
same way.

Bug: 151311073
Test: atest NotificationChannelTest
Change-Id: I0504f8043dc864fe6677f2e65783068ffa3437ba
 2020-03-13 13:54:10 -07:00
Automerger Merge Worker
7e427ab997 Merge "Fix tests" into rvc-dev am: 6d8e0fed61 am: f08d965b53 am: 648fe31181 am: 053b614f70 
Change-Id: Ia20cbab27b29416dd55923bfb993e4d91dab8059
 2020-03-13 10:19:57 +00:00
Tsung-Mao Fang
bac694f2a1 Ignore broken test case 
Bug: 151279674
Test: Run robo test
Change-Id: I6777c126a084fc22a34c76d14f004e75a99dcd9f
 2020-03-13 17:33:40 +08:00
Julia Reynolds
49f40ee77b Fix tests 
Fixing one of them by removing an unneeded setting

Test: RunSettingsRoboTests2
Fixes: 151279674
Change-Id: If2b513ba7b4bf8ec5183e2a9457caab3d3e06dc4
 2020-03-12 17:27:35 -04:00
Daniel Sandler
c1f6891ef3 Merge "Support updated rendering of conversation icons." into rvc-dev 2020-02-28 00:26:10 +00:00
Dan Sandler
f9a8552f74 Support updated rendering of conversation icons. 
Note that changes to channel settings now generate
onResume() for all available controllers to ensure they get
the updated drawable.

Bug: 149747760
Change-Id: I3f73c025b1d32194e3d5147d03cb781e370f2a1b
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.notification"
 2020-02-26 11:09:38 -05:00
Julia Reynolds
bc0c7a626d Stop controller from steal preference clicks 
Test: atest
Fixes: 150175360
Change-Id: Ia22058df0ddbd1a274a508e2600d12aa1b67a343
 2020-02-25 10:49:23 -05:00
Julia Reynolds
cb9f444849 Merge changes from topics "jr-all-convo", "jr-default-vic" 
* changes:
  Add a default behavior setting for VICs
  Add screen for all conversations
 2020-02-19 12:24:57 +00:00
Julia Reynolds
8949d87be7 Add a default behavior setting for VICs 
Test: atest
Bug: 149696991
Change-Id: Ica06f80a02d65294a7b503fd3556add644c61bd7
 2020-02-18 09:25:52 -05:00
Julia Reynolds
1ee9dce20c Add screen for all conversations 
Test: atest
Bug: 149583455
Change-Id: I9704082d097ef2bb17c051703e380f573056318c
 2020-02-17 20:16:23 -05:00
timhypeng
716777d3ad Replace preference with remote media preference group in xml 
-remove previous preference controller and its test cases
-update sound setting test case

Bug: 147395289
Test: make -j42 RunSettingsRoboTests
Change-Id: I9e383e11370a13868fdbcb76eafef5aedad895c5
 2020-02-12 04:57:18 +00:00
TreeHugger Robot
7b036f36e1 Merge "Add a settings for notification history" 2020-02-11 20:50:18 +00:00
Julia Reynolds
28bc10faba Add a settings for notification history 
Test: atest
Bug: 137396965
Change-Id: Id575bd8ef34f977200384f95c0244cbbb073e027
 2020-02-10 12:04:10 -05:00
TreeHugger Robot
978b19ec63 Merge "Implement remote media preference in Sound Setting" 2020-02-10 01:48:37 +00:00
Julia Reynolds
976a07baa6 Separate conversations from channels 
Test: atest
Bug: 137397357
Change-Id: I15c360e8ef89f9fcb8db92678dd02a2c6fe083c5
 2020-02-07 09:45:30 -05:00
timhypeng
b545599933 Implement remote media preference in Sound Setting 
-Add test cases

Bug: 147395289
Test: make -j42 RunSettingsRoboTests
Change-Id: I7a3a2312e5f777cc22afb7a33df52afcc7707dc7
 2020-02-07 14:21:16 +08:00
Julia Reynolds
1cba784014 Merge "Support new conversation DND options" 2020-02-05 12:21:25 +00:00
Yiwen Chen
3099df31d4 Merge "Implement new vibrate for calls in Settings." 2020-02-04 22:55:57 +00:00
Yiwen Chen
4b4c6c2c7b Implement new vibrate for calls in Settings. 
Test: built and tested on device
Change-Id: Ia6ca7eb54472d44a9934d7f125a9f71e42c616a3
 2020-02-03 13:32:58 -08:00
Julia Reynolds
7c5ac8fdac Support new conversation DND options 
Test: atest
Bug: 137397357
Change-Id: I52420ffdc4b6618e66354a9c1bb99b0296bc4ea4
 2020-02-03 11:09:20 -05:00
TreeHugger Robot
1767201534 Merge "Use MasterSwitchPref vs subclass" 2020-01-29 19:20:48 +00:00
Julia Reynolds
82433b0239 Use MasterSwitchPref vs subclass 
MasterSwitchPrefence changed in an incompatible way, but also
added functionality so we no longer need to subclass it.

Test: atest
Fixes: 146503141
Change-Id: I2441c8c265370c138ced13741aa5afd5c2088917
 2020-01-29 17:11:45 +00:00
Julia Reynolds
86c0007e1d Add setting to hide silent notifs in status bar 
Test: atest
Bug: 148444551
Change-Id: If7171ed36984b76552f3f795f0b4652dce5daad3
 2020-01-29 11:25:18 -05:00
Julia Reynolds
b5ea53a981 Visual updates for DND screens 
(part 1), emphasizing People

Test: atest, manual
Bug: 137397357
Change-Id: I5672462feb480ea2fced70470ed7c2c8116fadfd
 2020-01-11 17:03:22 +00:00
Alex Mang
8f966787d9 Add flag to allow NAS to peform ranking 
This will be used by implementations of NotificationAssistantService to
rerank notifications within the same importance bucket.

Bug: 146443378
Test: atest
Change-Id: I95e45081ae90f1e60de86b1b850ad18f33eb803b
 2019-12-17 20:33:40 +00:00