Commit Graph

63016 Commits

Author SHA1 Message Date
TreeHugger Robot
4b997ee9fd Merge "Set face unlock toggle to unchecked when disabled by admin" into rvc-dev am: a2d56af9bd am: ea63b90c3d
Change-Id: Icbbe2f70adac63bf922dd66edb31760ae3efb851
2020-03-30 21:49:07 +00:00
TreeHugger Robot
ee96c179b4 Merge "Set face unlock toggle to unchecked when disabled by admin" into rvc-dev am: a2d56af9bd
Change-Id: I98aec73f1f08197b5bbb2a600e088fac9bf74cd7
2020-03-30 21:48:38 +00:00
TreeHugger Robot
ea63b90c3d Merge "Set face unlock toggle to unchecked when disabled by admin" into rvc-dev am: a2d56af9bd
Change-Id: I76ca506736ed0d8400ed3e063695e96acd8eff5e
2020-03-30 21:32:06 +00:00
TreeHugger Robot
0ad036bd31 Merge "Don't filter demoted conversation from app subtext" into rvc-dev am: 6f837d10bf am: f61da397fd am: dfdb9d18f8 am: 43919ede30
Change-Id: I230ba561a691f74f5b78f8f96593ad8bb3686b69
2020-03-30 21:27:46 +00:00
Julia Reynolds
7b60612e01 Merge "Remove bubble settings from channel pages" into rvc-dev am: 56d45997b3 am: 52b375b242 am: 5c44faa98d am: e7ed0da17a
Change-Id: Ib6f6449d83c8166831aea45a4ad772c08d595fec
2020-03-30 21:25:41 +00:00
Julia Reynolds
6271a3e226 Merge "Conversations can't individually bypass dnd" into rvc-dev am: b3f2c0d528 am: 6d30804cec am: 8fcac244ad am: 7368dcdc8c
Change-Id: I592a20b0148374bbfb94cee8fa92b3d55771a32d
2020-03-30 21:23:23 +00:00
TreeHugger Robot
a2d56af9bd Merge "Set face unlock toggle to unchecked when disabled by admin" into rvc-dev 2020-03-30 21:07:15 +00:00
TreeHugger Robot
1b29a5a2ba Merge "Don't filter demoted conversation from app subtext" into rvc-dev am: 6f837d10bf am: f61da397fd am: 8b94c0e4a3
Change-Id: Id082b3e1822fbffb6be9373f5da0c1ff8b25cfa3
2020-03-30 20:51:24 +00:00
Julia Reynolds
2db927cb79 Merge "Remove bubble settings from channel pages" into rvc-dev am: 56d45997b3 am: 52b375b242 am: fdf32b618c
Change-Id: I6856e49fcff85168115621da46ad66c38bc43bb8
2020-03-30 20:51:20 +00:00
TreeHugger Robot
43919ede30 Merge "Don't filter demoted conversation from app subtext" into rvc-dev am: 6f837d10bf am: f61da397fd am: dfdb9d18f8
Change-Id: I72d53cad79daaaa17e3e66e576574c20edcf6b57
2020-03-30 20:51:16 +00:00
Julia Reynolds
41874f9f73 Merge "Conversations can't individually bypass dnd" into rvc-dev am: b3f2c0d528 am: 6d30804cec am: 639b6f89ea
Change-Id: I77c60b21d864ffb1dfac182a244895c9b59774fa
2020-03-30 20:51:15 +00:00
Julia Reynolds
e7ed0da17a Merge "Remove bubble settings from channel pages" into rvc-dev am: 56d45997b3 am: 52b375b242 am: 5c44faa98d
Change-Id: I178c73fcd8924adaf0528878f558e6a3509419a1
2020-03-30 20:51:11 +00:00
Julia Reynolds
7368dcdc8c Merge "Conversations can't individually bypass dnd" into rvc-dev am: b3f2c0d528 am: 6d30804cec am: 8fcac244ad
Change-Id: I5205d2bbc8dfa6c28a5dc927de9e8c4a32db487d
2020-03-30 20:51:03 +00:00
TreeHugger Robot
dfdb9d18f8 Merge "Don't filter demoted conversation from app subtext" into rvc-dev am: 6f837d10bf am: f61da397fd
Change-Id: Ib59231d29edd5747afdf73053c837d796c2e0922
2020-03-30 20:39:11 +00:00
Julia Reynolds
5c44faa98d Merge "Remove bubble settings from channel pages" into rvc-dev am: 56d45997b3 am: 52b375b242
Change-Id: I233bcf4e9ba089718534186437472db15b6c87ba
2020-03-30 20:39:06 +00:00
TreeHugger Robot
8b94c0e4a3 Merge "Don't filter demoted conversation from app subtext" into rvc-dev am: 6f837d10bf am: f61da397fd
Change-Id: Ia96c24f21d404c3d043047aa68bc465f779a1114
2020-03-30 20:39:04 +00:00
Julia Reynolds
8fcac244ad Merge "Conversations can't individually bypass dnd" into rvc-dev am: b3f2c0d528 am: 6d30804cec
Change-Id: Icdeaafe85fa03ed0ee03379bcb41995be18d46dd
2020-03-30 20:39:02 +00:00
Julia Reynolds
fdf32b618c Merge "Remove bubble settings from channel pages" into rvc-dev am: 56d45997b3 am: 52b375b242
Change-Id: I0792a5c776aeec22f6f3622cbe8c744831e13853
2020-03-30 20:38:59 +00:00
Julia Reynolds
639b6f89ea Merge "Conversations can't individually bypass dnd" into rvc-dev am: b3f2c0d528 am: 6d30804cec
Change-Id: I2ea539acf7f6427021016d7fe6d102e869cce456
2020-03-30 20:38:54 +00:00
TreeHugger Robot
21cd235d70 Merge "Don't filter demoted conversation from app subtext" into rvc-dev am: 6f837d10bf
Change-Id: Ia6d782d4c071a9593ea44d31de115a4fbc566953
2020-03-30 20:18:40 +00:00
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
5124fa67cc Merge "Fix some history a11y issues" into rvc-dev am: 2f77fd08e9 am: 2b541018da am: acbf2b36e4 am: cf2ff6cc61
Change-Id: I377f227875546440f7ad34366ff3756d45aa2067
2020-03-30 19:58:48 +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
cf2ff6cc61 Merge "Fix some history a11y issues" into rvc-dev am: 2f77fd08e9 am: 2b541018da am: acbf2b36e4
Change-Id: I8959f3dd61bf256b3eddd7481bb7710a7f510ed1
2020-03-30 19:33:55 +00:00
Julia Reynolds
acbf2b36e4 Merge "Fix some history a11y issues" into rvc-dev am: 2f77fd08e9 am: 2b541018da
Change-Id: Ie477d8a14ff898c754d333c387f963d610178eb0
2020-03-30 19:18:02 +00:00
Julia Reynolds
2554c8d8b8 Merge "Fix some history a11y issues" into rvc-dev am: 2f77fd08e9 am: 2b541018da am: 19ba74919f
Change-Id: I168a12911d3168facf9bf23408e1819a3cb292cf
2020-03-30 19:10:02 +00:00
TreeHugger Robot
554a982534 Merge "Fix the ringtone subtext is empty" into rvc-dev am: 83dfe52029 am: 68a77ceb47 am: 8703e457e0
Change-Id: I6566d74f0ce52a49f732f6422af1ec15f933b262
2020-03-30 19:09:58 +00:00
Yanting Yang
fa0f65e087 Merge "Add custom site map pairs into SettingsSearchIndexablesProvider" into rvc-dev am: ad4405d0f8 am: d8f14f11b0 am: 0c23dcd4ec
Change-Id: I45030df6c87f49b79e1965706b2c945c778a6b03
2020-03-30 19:09:54 +00:00
TreeHugger Robot
f3acc7c2c7 Merge "Only request focus if change was self-triggered" into rvc-dev am: c22d90cb1b am: 5093ea158d am: 0ce302633d
Change-Id: I0e31b38b44e2671a5999339fbe18a64f022baeb3
2020-03-30 19:09:49 +00:00
Julia Reynolds
57921a1b52 Merge "Remove items from the 'last 24 hours' history on swipe" into rvc-dev am: dad135f4ed am: fe8ad05005 am: 7e0ac47792
Change-Id: Iaea36e88e9f7dabebeff8c7d3a32a983a3503df4
2020-03-30 19:09:45 +00:00
TreeHugger Robot
91b625e9e0 Merge "Add tap targets to top 2 sections" into rvc-dev am: 9db658bfe0 am: 9d9504f951 am: 93c322afc6
Change-Id: I16e31a6ea7158a7efa52f5a991d154b67132c3d2
2020-03-30 19:09:40 +00:00
TreeHugger Robot
65cd2779b7 Merge "Update App storage usage summary" into rvc-dev am: 9c32d89aaa am: 0d761a25bd am: 4c9934dd9c
Change-Id: I77ea195f9c1777972329cb5d62b55cc191734056
2020-03-30 19:09:35 +00:00
Bonian Chen
16c6fa6d17 [Settings] Replace ImsManager#isVtEnabledByPlatform() am: fb7274a308 am: a6d6285b57 am: 3205731765
Change-Id: I73eddcad45ae5d58dde70aa5a8419d4961d0114c
2020-03-30 19:09:27 +00:00
tim peng
3fd077feae Merge "PendingIntent in MediaOutputIndicatorSlice could be Hijacked" into rvc-dev am: ecea133904 am: 15ac2b2c8e am: 5201d1d163
Change-Id: I2b6050d242c08219415faca271eb51385824ea88
2020-03-30 19:09:22 +00:00
Bonian Chen
c394933399 [Settings] Replace ImsManager#isWfcEnabledByPlatform() am: c134ef08d4 am: 9c4d1190d9 am: ea44a49cfd
Change-Id: I3d3fbdece9ae7c7941b0bb96c2eb2fff4d712ec4
2020-03-30 19:09:18 +00:00
tim peng
c3d541be64 Merge "Add zero state in output switcher" into rvc-dev am: ddd8a8fa92 am: 3e73d0f92c am: 49480d1f53
Change-Id: I15482d3dfa11de72520c046c60a7dce67fb40646
2020-03-30 19:09:14 +00:00
Artur Satayev
6a489a0135 [automerger skipped] Merge "Do not exlicitly declare dependency on changeid processor." into rvc-dev am: 836dcbaf91 am: f4ddb539ea -s ours am: 2c0f44e29e -s ours
am skip reason: Change-Id Icab88938f1a49a892e0d62b2a833b659d6725267 with SHA-1 f9cc52d670 is in history

Change-Id: I9567477ab890a2d6f2e6d7e5f99b457a26f93674
2020-03-30 18:58:56 +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