Commit Graph

19514 Commits

Author SHA1 Message Date
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
TreeHugger Robot
300b3742fd Merge "DND Bypassing Apps redesign" into rvc-dev am: 7440bf7034
Change-Id: If875b3ad36863daff5e408a142caade2b44a3f18
2020-03-26 21:06:31 +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
Alex Johnston
99a1185744 Merge "Fix keyboard overlap in work challenge landscape view" into rvc-dev am: a9bd149983 am: 5ccaa7e741 am: f44f0fba0e am: 059dafa336
Change-Id: I31fc4c669470053b55f9023d40ffdf02545f5180
2020-03-26 10:40:42 +00:00
Jason Chiu
920924f5fe Merge "Add metric logs for special cases in Display and Battery page" into rvc-dev am: 1a9e99b2b1
Change-Id: Ib03b1c15256365b1b18f3d0b76e4d567fb3880d0
2020-03-26 09:53:28 +00:00
Jason Chiu
1a9e99b2b1 Merge "Add metric logs for special cases in Display and Battery page" into rvc-dev 2020-03-26 09:47:18 +00:00
Alex Johnston
5ccaa7e741 Merge "Fix keyboard overlap in work challenge landscape view" into rvc-dev am: a9bd149983
Change-Id: Ieeff9f5cd40716539fc9d13fb81701d1bcd7b3d9
2020-03-26 09:42:05 +00:00
Alex Johnston
a9bd149983 Merge "Fix keyboard overlap in work challenge landscape view" into rvc-dev 2020-03-26 09:40:20 +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
TreeHugger Robot
0747e57f25 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-03-25 23:47:17 +00:00
TreeHugger Robot
3b3ad21237 Merge "Extend char limit for size-compat freeform option" 2020-03-25 22:01:02 +00:00
TreeHugger Robot
34f2281e5a Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-03-25 20:30:09 +00:00
Alex Johnston
6faed3c69b Fix keyboard overlap in work challenge landscape view
* Remove layout sud_glif_blank_template and add layout
  weight in land/confirm_lock_password.xml.

Bug: 152054458
Test: manual testing
Change-Id: I8d4329b141e1fe24d5b8d66e8e7971fe951d6af2
2020-03-25 19:58:38 +00:00
Bill Yi
2c88a99fdc Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: Ie5e62dbe8cc347f803e6568938a106c6d34d6842
2020-03-25 12:28:09 -07:00
Bill Yi
757d40d2f1 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I06a147512e756eaaf03ba00012e386b7b26940f1
2020-03-25 11:50:25 -07:00
Lais Andrade
0d08bf287f Merge "Add help uri placeholder for vibration settings" into rvc-dev am: d9a498057e am: 7b6d857d73 am: 3f37c05c0d am: 3ca3dedc34
Change-Id: Iecdd167bc79deca228db6d2c06515c95f36cfacf
2020-03-25 16:37:39 +00:00
Lais Andrade
7b6d857d73 Merge "Add help uri placeholder for vibration settings" into rvc-dev am: d9a498057e
Change-Id: I9f7d292fbf0254cf973b2906e470234a938994ac
2020-03-25 15:19:21 +00:00
Lais Andrade
d9a498057e Merge "Add help uri placeholder for vibration settings" into rvc-dev 2020-03-25 15:08:13 +00:00
Menghan Li
81204e8f28 Merge "Enlarge the touch area of edit shortcut dialog" into rvc-dev am: f9f732e3be am: f84c49f13a am: cc7f9e781f am: ee6b74de12
Change-Id: I1d6e78f6e8f6dec8681f73a4ac8ebf49a2b67944
2020-03-25 06:22:13 +00:00
Menghan Li
f84c49f13a Merge "Enlarge the touch area of edit shortcut dialog" into rvc-dev am: f9f732e3be
Change-Id: Idc56795f80561051b73cc36cb6c3174b67626815
2020-03-25 05:36:20 +00:00
Menghan Li
f9f732e3be Merge "Enlarge the touch area of edit shortcut dialog" into rvc-dev 2020-03-25 05:23:44 +00:00
menghanli
bd09e28a84 Enlarge the touch area of edit shortcut dialog
Bug: 148837311
Test: Manual test
Change-Id: I54ca93ccaa87514bf4d201b95ed855003d1c164c
2020-03-25 11:20:32 +08: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
e23b91a9b3 Merge "Notification history updates" into rvc-dev am: 8d3741fbca am: 31f9705a60 am: 7cad4c67df am: 465b7a2c95
Change-Id: I39da1000218400d1c1253f5f42e88ba981fb8d04
2020-03-24 21:59:32 +00:00
Julia Reynolds
941d437df6 Merge "Update all conversations screen" into rvc-dev am: 79fd5811cd
Change-Id: I065eb16003c13ed562242e1d9d2eb5deb6870415
2020-03-24 21:42:44 +00:00
Julia Reynolds
b5d726003f Merge "Update all conversations screen" into rvc-dev am: 79fd5811cd
Change-Id: Icf2ce73480b62fb1853e0798b890cfbcbccc0191
2020-03-24 21:42:03 +00:00
Julia Reynolds
79fd5811cd Merge "Update all conversations screen" into rvc-dev 2020-03-24 21:33:53 +00:00
Julia Reynolds
f611025053 Merge "Notification history updates" into rvc-dev am: 8d3741fbca
Change-Id: Ia281dc883825831c64e9f12b2b5c82e42333e047
2020-03-24 21:17:27 +00:00
Julia Reynolds
31f9705a60 Merge "Notification history updates" into rvc-dev am: 8d3741fbca
Change-Id: If1386c89f4e0e90c84d57950351509c2b9a4173f
2020-03-24 21:16:41 +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
Lais Andrade
5695b43077 Add help uri placeholder for vibration settings
Fixes: 150915047
Test: manual
Change-Id: I69d26298d953f28639925c45999518a44881a657
2020-03-24 17:21:11 +00: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
Ben Murdoch
16398e5564 Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599 am: 63aded6f67 am: cdcf827947 am: 7c7b42d06d
Change-Id: I03fb1a0f60fac8c8ce9260331894b947bf0cd371
2020-03-24 11:28:22 +00:00
Ben Murdoch
7b2154d996 Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599
Change-Id: I4a67e3a9d94d63f0cc9cb6942acabd1e9c32b936
2020-03-24 10:45:49 +00:00
Ben Murdoch
63aded6f67 Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599
Change-Id: I822c63ede7d0f92dbfe724731350fc140db88ef5
2020-03-24 10:45:25 +00:00
Ben Murdoch
7afced3599 Merge "Move strings related to user creation to SettingsLib." into rvc-dev 2020-03-24 10:25:21 +00:00
Arc Wang
766e874428 Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev am: e4b0989766 am: e446e42d63 am: 660cacfa0d am: 787f8a7635
Change-Id: I394d039cd49428709ce3405d4461bc4c71c7b3b5
2020-03-24 08:28:45 +00:00
Arc Wang
f47f38c9a2 Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev am: e4b0989766
Change-Id: If075945a85a830f214b2d8a33bdba165593f0705
2020-03-24 07:46:28 +00:00
Arc Wang
e446e42d63 Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev am: e4b0989766
Change-Id: Ic73404a2c3392f1049786b5601a72316086eb900
2020-03-24 07:46:26 +00:00
Arc Wang
e4b0989766 Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev
* changes:
  [Wi-Fi] Fix ignored tests in WifiDetailPreferenceController2Test - II
  [Wi-Fi] Fix ignored tests in WifiDetailPreferenceController2Test - I
2020-03-24 07:25:17 +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
437b0b66d4 Merge "Update DND people Settings pages" into rvc-dev am: a33c8e8048
Change-Id: I15d091a2b9354b2f6039abc5d7f8d26befde577a
2020-03-24 06:09:06 +00:00
TreeHugger Robot
c21f849fe7 Merge "Update DND people Settings pages" into rvc-dev am: a33c8e8048
Change-Id: Ie488350d8a6ca7016bbaf7ace6bd7aed70568d49
2020-03-24 06:08:49 +00:00
TreeHugger Robot
a33c8e8048 Merge "Update DND people Settings pages" into rvc-dev 2020-03-24 05:56:29 +00:00
TreeHugger Robot
ad20ab50e5 Merge "Add strings for power menu settings" into rvc-dev am: a3fccb9cc0 am: 3052c27768 am: 008ce5e6e0 am: c9a3bbea99
Change-Id: I723b4b699fa32dc2c06e873b6fce91fecafa256f
2020-03-23 22:57:28 +00:00
TreeHugger Robot
8490a15ad9 Merge "Add strings for power menu settings" into rvc-dev am: a3fccb9cc0
Change-Id: I93891a124e8237dbb5fe51408ef3b4ceae4d1965
2020-03-23 18:35:57 +00:00
TreeHugger Robot
3052c27768 Merge "Add strings for power menu settings" into rvc-dev am: a3fccb9cc0
Change-Id: I852b01136c7313ea2ce274b7508a555b75808a38
2020-03-23 18:35:18 +00:00
TreeHugger Robot
a3fccb9cc0 Merge "Add strings for power menu settings" into rvc-dev 2020-03-23 18:09:37 +00:00