Commit Graph

61283 Commits

Author SHA1 Message Date
Julia Reynolds
17ee537e91 Merge "Remove bubble settings from channel pages" into rvc-dev am: 56d45997b3
Change-Id: Ib0e9448a41bcfdecfd2b541201ee79d6aaa883b4
2020-03-30 20:18:34 +00:00
TreeHugger Robot
f61da397fd Merge "Don't filter demoted conversation from app subtext" into rvc-dev am: 6f837d10bf
Change-Id: I0c72a61512a8faf17835b1b212b909de69980995
2020-03-30 20:18:29 +00:00
Julia Reynolds
1dc6ae3d5f Merge "Conversations can't individually bypass dnd" into rvc-dev am: b3f2c0d528
Change-Id: Ib1222663c41432bb4439f0fbf54c7effbae73809
2020-03-30 20:18:22 +00:00
Julia Reynolds
52b375b242 Merge "Remove bubble settings from channel pages" into rvc-dev am: 56d45997b3
Change-Id: Ibd13d19b4bf335c14a1063422943e8e65a549c4b
2020-03-30 20:18:22 +00:00
Julia Reynolds
6d30804cec Merge "Conversations can't individually bypass dnd" into rvc-dev am: b3f2c0d528
Change-Id: I3504ff5e96055ce63098d738f7390cb5c3c3569b
2020-03-30 20:18:13 +00:00
kholoud mohamed
4d0edf369f Show all apps that requested cross profile permission
show all apps that requested the permission, show the admin
restricted dialog if the app is not whitelisted by the admin,
and show a link to install the app if the app is missing in one
of the profiles.

Bug: 149742043
Test: make RunSettingsRoboTests ROBOTEST_FILTER=InteractAcrossProfilesPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=InteractAcrossProfilesControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=InteractAcrossProfilesSettingsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=InteractAcrossProfilesDetailsTest

Change-Id: I2bc86b9966a2e14a12ee8f4b7f1b75f866ed98e3
2020-03-30 21:10:40 +01: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
Julia Reynolds
19ba74919f Merge "Fix some history a11y issues" into rvc-dev am: 2f77fd08e9 am: 2b541018da
Change-Id: Iae4dcb0004b95080991b1fe694758a866de73ecd
2020-03-30 18:58:09 +00:00
Julia Reynolds
2b541018da Merge "Fix some history a11y issues" into rvc-dev am: 2f77fd08e9
Change-Id: I4bd2a3608df02dfaca852f009ac7b7cf37ddceb7
2020-03-30 18:57:37 +00:00
Julia Reynolds
77e6a449b0 Merge "Fix some history a11y issues" into rvc-dev am: 2f77fd08e9
Change-Id: I2890909359c71ace7883191d8633657f4d43ef87
2020-03-30 18:57:33 +00:00
TreeHugger Robot
8703e457e0 Merge "Fix the ringtone subtext is empty" into rvc-dev am: 83dfe52029 am: 68a77ceb47
Change-Id: Iff223ed9fa6913bbd86d81835ffe25579f3aab0d
2020-03-30 18:53:59 +00:00
Yanting Yang
0c23dcd4ec Merge "Add custom site map pairs into SettingsSearchIndexablesProvider" into rvc-dev am: ad4405d0f8 am: d8f14f11b0
Change-Id: Ia557b480b9519b0da3e84044c989072a4c90e47c
2020-03-30 18:51:51 +00:00
TreeHugger Robot
0ce302633d Merge "Only request focus if change was self-triggered" into rvc-dev am: c22d90cb1b am: 5093ea158d
Change-Id: Id7936001361e26ea14fbab16e4064910edd18087
2020-03-30 18:51:16 +00:00
Julia Reynolds
7e0ac47792 Merge "Remove items from the 'last 24 hours' history on swipe" into rvc-dev am: dad135f4ed am: fe8ad05005
Change-Id: I996cd198a9e0cad093cc5e69301a9d919741af20
2020-03-30 18:43:42 +00:00
TreeHugger Robot
93c322afc6 Merge "Add tap targets to top 2 sections" into rvc-dev am: 9db658bfe0 am: 9d9504f951
Change-Id: Iabb1943939ba1b840a63833b076151eeb4962f32
2020-03-30 18:36:41 +00:00
TreeHugger Robot
4c9934dd9c Merge "Update App storage usage summary" into rvc-dev am: 9c32d89aaa am: 0d761a25bd
Change-Id: Ieeb44fb05b1724e17042ec4d5f0cf6da9d43021d
2020-03-30 18:36:04 +00:00
Bonian Chen
3205731765 [Settings] Replace ImsManager#isVtEnabledByPlatform() am: fb7274a308 am: a6d6285b57
Change-Id: Iceb405d58331badd6ec62913287a5aa1f175bf15
2020-03-30 18:31:02 +00:00
tim peng
5201d1d163 Merge "PendingIntent in MediaOutputIndicatorSlice could be Hijacked" into rvc-dev am: ecea133904 am: 15ac2b2c8e
Change-Id: I4da802d1ee9f3a994c42bf0392cd40bb1b23f319
2020-03-30 18:30:27 +00:00
Bonian Chen
ea44a49cfd [Settings] Replace ImsManager#isWfcEnabledByPlatform() am: c134ef08d4 am: 9c4d1190d9
Change-Id: Icf336c69791952c542c4c31d02a1da901e4db70e
2020-03-30 18:28:46 +00:00
tim peng
49480d1f53 Merge "Add zero state in output switcher" into rvc-dev am: ddd8a8fa92 am: 3e73d0f92c
Change-Id: Ib8b6ff0cd9dfc4ae2fdfd535354fcdd3fac5e261
2020-03-30 18:27:22 +00:00
Artur Satayev
2c0f44e29e [automerger skipped] Merge "Do not exlicitly declare dependency on changeid processor." into rvc-dev am: 836dcbaf91 am: f4ddb539ea -s ours
am skip reason: Change-Id Icab88938f1a49a892e0d62b2a833b659d6725267 with SHA-1 772243ca06 is in history

Change-Id: I42f1b6e65bf680c558e2e275504bd091dbd050c9
2020-03-30 18:27:04 +00:00
Julia Reynolds
2f77fd08e9 Merge "Fix some history a11y issues" into rvc-dev 2020-03-30 18:05:55 +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
Bill Yi
423b63dff5 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I39a20af187565ba809b33debdf968309c597dc18
2020-03-30 10:57:45 -07: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
07ea2e40f9 Merge "Fix the ringtone subtext is empty" into rvc-dev am: 83dfe52029
Change-Id: I2903910332314609826f35357c066c807dcc68fa
2020-03-30 16:57:33 +00:00
TreeHugger Robot
68a77ceb47 Merge "Fix the ringtone subtext is empty" into rvc-dev am: 83dfe52029
Change-Id: Iea5f49823d98abfcf25193cf338dd226943e6188
2020-03-30 16:57:10 +00:00
TreeHugger Robot
83dfe52029 Merge "Fix the ringtone subtext is empty" into rvc-dev 2020-03-30 16:45:32 +00:00
Julia Reynolds
cfb1f98668 Fix some history a11y issues
Test: manual
Fixes: 152578971
Fixes: 152728558
Fixes: 152734825
Change-Id: I6a2dc434f0c456d466d23fd2cff86362f8dcd246
2020-03-30 11:54:21 -04:00
Yanting Yang
2b802a4745 Merge "Add custom site map pairs into SettingsSearchIndexablesProvider" into rvc-dev am: ad4405d0f8
Change-Id: I714b45f77d59e35a4411a9b9ad1495d10a0d9069
2020-03-30 15:32:59 +00:00
Yanting Yang
d8f14f11b0 Merge "Add custom site map pairs into SettingsSearchIndexablesProvider" into rvc-dev am: ad4405d0f8
Change-Id: Ibcd672023ec7cceef0e41bf1501fc28ade481430
2020-03-30 15:32:46 +00:00
Yanting Yang
ad4405d0f8 Merge "Add custom site map pairs into SettingsSearchIndexablesProvider" into rvc-dev 2020-03-30 15:15:06 +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
Arc Wang
3aee35a882 [Wi-Fi] Fix a unit test fail in WifiMasterSwitchPreferenceControllerTest
In ag/10785119, WifiStatusTracker#setListening calls
ConnectivityManager#unregisterNetworkCallback twice.
Modify the fail test to match it.

Bug: 151696220
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiMasterSwitchPreferenceControllerTest
Change-Id: Idd9917ce204e2abbc4bfbf760222191adadf4afa
2020-03-30 22:07:21 +08:00
TreeHugger Robot
dc5550102b Merge "Only request focus if change was self-triggered" into rvc-dev am: c22d90cb1b
Change-Id: I655e9a021962845e2bb1297f7b2469aaed1d80cb
2020-03-30 13:37:57 +00:00
TreeHugger Robot
5093ea158d Merge "Only request focus if change was self-triggered" into rvc-dev am: c22d90cb1b
Change-Id: I8ff4e678ac5391f395ac7bf4cf06f3ce7a2c649e
2020-03-30 13:37:47 +00: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
1819365216 Merge "Remove items from the 'last 24 hours' history on swipe" into rvc-dev am: dad135f4ed
Change-Id: Ifbcb4f892430f6d8e43954b62a0aaf8cc2375d1e
2020-03-30 13:32:19 +00:00
TreeHugger Robot
9c129157d0 Merge "Add tap targets to top 2 sections" into rvc-dev am: 9db658bfe0
Change-Id: I1ece8e10f441202da306a14a1917313b412c83f1
2020-03-30 13:32:03 +00:00
Julia Reynolds
fe8ad05005 Merge "Remove items from the 'last 24 hours' history on swipe" into rvc-dev am: dad135f4ed
Change-Id: I76382dd6050ed5c913feaab485ce3c17c4a80328
2020-03-30 13:31:43 +00:00
TreeHugger Robot
9d9504f951 Merge "Add tap targets to top 2 sections" into rvc-dev am: 9db658bfe0
Change-Id: Id7a163a59b9a10291fcfbbd9d8c39e1d0b28488e
2020-03-30 13:30:59 +00:00
Julia Reynolds
dad135f4ed Merge "Remove items from the 'last 24 hours' history on swipe" into rvc-dev 2020-03-30 13:23:42 +00:00
TreeHugger Robot
9db658bfe0 Merge "Add tap targets to top 2 sections" into rvc-dev 2020-03-30 13:17:23 +00:00
Rubin Xu
fbfba7a078 Set face unlock toggle to unchecked when disabled by admin
Bug: 135747161
Test: make RunSettingsRoboTests
    ROBOTEST_FILTER=FaceSettingsLockscreenBypassPreferenceControllerTest
Change-Id: I1e3d105184a14bfece972abb096eac44bd186273
2020-03-30 12:33:57 +01:00
TreeHugger Robot
c2a4b3bfd0 Merge "Update App storage usage summary" into rvc-dev am: 9c32d89aaa
Change-Id: I9b2243a5baa47c12e86caffbf47b56cd825ff4c6
2020-03-30 08:31:34 +00:00
Bonian Chen
89440ab287 [Settings] Replace ImsManager#isVtEnabledByPlatform() am: fb7274a308
Change-Id: Icd17e13882d838ca7629474d5abd29ac27c5c9d9
2020-03-30 08:31:19 +00:00
TreeHugger Robot
0d761a25bd Merge "Update App storage usage summary" into rvc-dev am: 9c32d89aaa
Change-Id: Ia02627cb75d8a261644f2343d313e261c8e532f1
2020-03-30 08:31:08 +00:00