Commit Graph

1113 Commits

Author SHA1 Message Date
TreeHugger Robot
5aa24d76ab Merge "Use DEFAULT_LIST contact intent" into rvc-dev am: 07a3b1c6ed am: e15d04acf1 am: 767d51e123 am: 20074d4c41
Change-Id: I8ee88fb72f11ed870bd585ed258efe5ecf6372e6
2020-03-31 18:44:12 +00:00
Beverly
82e7bc46cf Use DEFAULT_LIST contact intent
Test: manual
Fixes: 152733367
Change-Id: Ib2addc353298e593160500347d0a9bbfa85d1e0b
2020-03-31 11:09:50 -04:00
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
43848a4093 Merge "Remove bubble settings from channel pages" into rvc-dev am: 56d45997b3 am: 52b375b242 am: fdf32b618c am: 2db927cb79
Change-Id: I70729282db462779734fc7e29ae6a43d2e8eef70
2020-03-31 05:00:45 +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
Julia Reynolds
56d45997b3 Merge "Remove bubble settings from channel pages" into rvc-dev 2020-03-30 20:01:17 +00:00
Julia Reynolds
b3f2c0d528 Merge "Conversations can't individually bypass dnd" into rvc-dev 2020-03-30 19:57:48 +00:00
TreeHugger Robot
3b0e0f6b60 Merge "Fix the ringtone subtext is empty" into rvc-dev am: 83dfe52029 am: 68a77ceb47 am: 54058eedca am: e705d2ce91 am: 1fd4ebb841
Change-Id: I42cd43c19e765a85b72da1ec4c8470cc6dc70689
2020-03-30 19:05:25 +00:00
TreeHugger Robot
bb2a4aa264 Merge "Only request focus if change was self-triggered" into rvc-dev am: c22d90cb1b am: 5093ea158d am: 052610467e am: a2b560931a am: b569a4db40
Change-Id: I400f28d517347cd318b00bc5d7e3cc75c31d2515
2020-03-30 19:04:24 +00:00
Julia Reynolds
cb355e0fb8 Merge "Remove items from the 'last 24 hours' history on swipe" into rvc-dev am: dad135f4ed am: fe8ad05005 am: 5ba1c6e55d am: 380bb6d519 am: 1a4c34029b
Change-Id: I997bc55f7ba1a9d87071826cd887350f98352ef7
2020-03-30 19:04:06 +00:00
TreeHugger Robot
63420a1f66 Merge "Add tap targets to top 2 sections" into rvc-dev am: 9db658bfe0 am: 9d9504f951 am: 99ab33a0fa am: 4448e97222 am: 430a95ab19
Change-Id: Ide6f46939421ac2c620047055651919c71b2ecf0
2020-03-30 19:02:01 +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
138518141b Remove bubble settings from channel pages
It's only relevant for conversations

Test: manual
Fixes: 152764095
Change-Id: I31b342396ac3e66652ffc1457321594c55bbe0f3
2020-03-30 13:20:10 -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
TreeHugger Robot
83dfe52029 Merge "Fix the ringtone subtext is empty" into rvc-dev 2020-03-30 16:45:32 +00:00
Tsung-Mao Fang
61e352bba7 Fix the ringtone subtext is empty
Because ag/10750991 change the controller key in xml,
the controller can get a correct preference.

In order to fix this problem, change the key to correct one.

Test: Rebuilt rom, and see the subext
Fix: 162593762
Change-Id: I0226ece059944655a25af48a603916a14cede2e0
2020-03-30 22:48:05 +08:00
TreeHugger Robot
c22d90cb1b Merge "Only request focus if change was self-triggered" into rvc-dev 2020-03-30 13:35:23 +00:00
Julia Reynolds
eabc1904a7 Remove items from the 'last 24 hours' history on swipe
And make it resiliant to duplicate data from the backend.

Test: manual
Fixes: 148956400
Change-Id: I650c89242c257df1ec34b2879f544d9a5211019a
2020-03-27 17:13:22 -04:00
Beverly
f736532a9d Only request focus if change was self-triggered
For a11y we want to accomplish two things:
1. Keep focus on the button if the button was just pressed. This
requires buttons in settings to be focusableInTouchMode and then request
focus when the buttons are updated.
2. When the setting is changed outside of the settings page (ie: from
Quick Settings), we don't want to re-announce on talkback the button that is
updated on the Settings page. Therefore, to maintain #1, we add a
boolean to check whether or not the updateButton change was triggered by
a click to the button preference or not. Only request focus if the
button was triggered by the settings button (and not when triggered by
other things like QS).

Test: manual
Fixes: 147992252
Change-Id: I505de0585bac38a2f59062743d9d6b75861c3d32
2020-03-27 14:12:08 -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
Julia Reynolds
4eb430585a Add tap targets to top 2 sections
Test: manual
Fixes: 152538014
Change-Id: I4495a6cd75d73425690876d901ae6a73ccdda056
2020-03-27 12:25:37 -04:00
Julia Reynolds
83d0de8d07 Fix broken test
Test: this
Fixes: 152374833
Change-Id: I9065f6b3700fa288cb3fd65ef2b24c2821325e51
2020-03-27 09:36:18 -04: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
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
Automerger Merge Worker
987441d843 Merge "Merge "Add metric logs for special cases in Display and Battery page" into rvc-dev am: 1a9e99b2b1 am: 920924f5fe" into rvc-d1-dev-plus-aosp am: 6217097f81 am: 3773751627
Change-Id: If7607352a3d7441d357e8fc6b457f1546c16bd04
2020-03-26 10:41:03 +00:00
Jason Chiu
26343b82ee Add metric logs for special cases in Display and Battery page
Bug: 137559984
Test: robotest
Change-Id: I60f6237ac2c533306879f46ee4c25d54002cf0e9
2020-03-26 11:31:39 +08:00
Vince Leung
f93c47c0a0 Merge "Use super method for Vibration preferences" 2020-03-25 06:29:15 +00:00
Philip P. Moltmann
7443e3de6e Merge "Send attributionTag to notification APIs" into rvc-dev 2020-03-24 23:53:51 +00:00
Julia Reynolds
79fd5811cd Merge "Update all conversations screen" into rvc-dev 2020-03-24 21:33:53 +00:00
Julia Reynolds
8d3741fbca Merge "Notification history updates" into rvc-dev 2020-03-24 21:07:35 +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
Philip P. Moltmann
288491c724 Send attributionTag to notification APIs
Test: TH
Bug: 136595429
Change-Id: I4a5bb43a4aa5bfd88646771a0d1a2394d40e82e2
2020-03-24 11:46:48 -07:00
Julia Reynolds
8222a9a650 Notification history updates
- New strings
- Fix a crash

Test: manual
Fixes: 151833727
Change-Id: I3b0ef5cd9b221be917c71043e5217a43bc5891d0
2020-03-24 09:25:58 -04:00
TreeHugger Robot
a33c8e8048 Merge "Update DND people Settings pages" into rvc-dev 2020-03-24 05:56:29 +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
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
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
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
Julia Reynolds
44b5b7c575 Update empty state for apps bypassing dnd
Test: atest
Fixes: 150346679
Change-Id: Iccc5f1fb3dd7ee2c114f8757a020833b3b41e91d
2020-03-11 18:09:47 +00:00
Vince Leung
eb27aefa32 Use super method for Vibration preferences
onDisplayPreferenceDialog is overriden to handle BT related preferences
but VibrationPreferences require the super method of
onDisplayPreferenceDialog. Therefore if VibrationPreferences wants to
display a dialog, use the super method instead of the overriden method.

Bug: 150661723
Change-Id: I3f8e86e1d1f32fa6eae2798d3bad3cb48402db7b
2020-03-10 14:00:02 -07:00
Julia Reynolds
78b1848509 Log errors on history load
Test: manual
Bug: 150336474
Change-Id: I10e0e5ab9d51d88b67678be0f7040c360dcbcbe4
2020-03-06 10:05:30 -05:00
Julia Reynolds
5879a2c8b4 Use contrasted color icons
Test: manual in dark mode
Fixes: 150411005
Change-Id: I850cf89fce79131f57f9e390225be91ad6cf3274
2020-03-03 16:18:19 -05:00
Julia Reynolds
291ee404c2 Fix notification history crash & layout
- Fix occasional crash on device boot
- No more overlapping text

Test: manual
Fixes: 150326599
Fixes: 149767075
Change-Id: I3032a2913f2ca4ce57af596c180faa819e4c9363
2020-02-28 16:16:44 -05: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