Robert Luo
9fc4bfdcb5
Merge "Refine NFC payment wording for "Set default" and "Update" scenarios." into rvc-dev am: c3535eab06 am: c13ecfad98
...
Change-Id: I82be8b4c9c8a2929aac7570c198a2fed2c0eafc1
2020-03-31 08:19:18 +00:00
Robert Luo
c3535eab06
Merge "Refine NFC payment wording for "Set default" and "Update" scenarios." into rvc-dev
2020-03-31 07:42:24 +00:00
Bonian Chen
9e9597f7d8
Merge "[Settings] Code Refactor" into rvc-dev am: 268bdc12c6 am: 949ec8a1f0
...
Change-Id: I3fbf2b0e9a69d08c5926ce05d2bef76d36e6f84f
2020-03-31 07:00:18 +00:00
Bonian Chen
268bdc12c6
Merge "[Settings] Code Refactor" into rvc-dev
2020-03-31 06:24:15 +00:00
TreeHugger Robot
210c260ce6
Merge "Get MediaDevice from devices list" into rvc-dev am: cd329951ba am: 46cc33c9a6
...
Change-Id: Ied6e18f0806b1f32fb3adcec483adc34eb7a23aa
2020-03-31 05:04:21 +00:00
TreeHugger Robot
cd329951ba
Merge "Get MediaDevice from devices list" into rvc-dev
2020-03-31 04:26:31 +00:00
Bonian Chen
21475ae6c6
[Settings] Code Refactor
...
Code refactor in order to support auto testing
Bug: 140542283
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSettingsForSubTest
Change-Id: I2427732435b59d7359a102e0dd56317ac6a024b4
2020-03-31 03:46:45 +00:00
tim peng
2b47660696
Merge "No media status is visible in Output Switcher" into rvc-dev am: 5b0913c2b6 am: 4a82a5abb5
...
Change-Id: I3976f109e633f10b6b91b8f756588be561bcb187
2020-03-31 02:44:50 +00:00
tim peng
5b0913c2b6
Merge "No media status is visible in Output Switcher" into rvc-dev
2020-03-31 02:04:48 +00:00
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
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
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
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
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
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
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
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
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
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
9c32d89aaa
Merge "Update App storage usage summary" into rvc-dev
2020-03-30 08:22:16 +00:00
Tim Peng
3ac144163e
No media status is visible in Output Switcher
...
-Reflash header when get latest media controller
Bug: 152606491
Test: make -j42 RunSettingsRoboTests
Change-Id: I14542a7f8ba921c9d1dbaacf7e01c3ee673527b2
2020-03-30 16:20:14 +08:00
Bonian Chen
fb7274a308
[Settings] Replace ImsManager#isVtEnabledByPlatform()
...
Replace ImsManager#isVtEnabledByPlatform() by
ImsMmTelManager.isSupported().
Bug: 140542283
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=VideoCallingPreferenceControllerTest
Change-Id: Ife5100ef288fbad6fc818e8fbdf8192c42d495b2
2020-03-30 07:41:29 +00:00
tim peng
ecea133904
Merge "PendingIntent in MediaOutputIndicatorSlice could be Hijacked" into rvc-dev
2020-03-30 06:56:16 +00:00
Robert Luo
2f4ebf9475
Refine NFC payment wording for "Set default" and "Update" scenarios.
...
Fixes: 149270345
Test: manual and check if new string is applied
Change-Id: I4d7591882489d3892020f8fa2f963f7c90ec79e4
2020-03-30 13:25:39 +08:00
Tim Peng
e4ccbbec67
PendingIntent in MediaOutputIndicatorSlice could be Hijacked
...
-Add setPackage() to prevent local information disclosure
Bug: 151645695
Test: make -j42 RunSettingsRoboTests
Change-Id: I74c058a381fceb85695dd76d354fb49f878f9142
2020-03-30 03:53:02 +00:00
Bonian Chen
c134ef08d4
[Settings] Replace ImsManager#isWfcEnabledByPlatform()
...
Replace ImsManager#isWfcEnabledByPlatform().
Bug: 140542283
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSettingsForSubTest
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=WifiCallingSettingsTest
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingPreferenceControllerTest
Change-Id: I85907efb39aecdb3fb18cacf11ce4510b898edc4
2020-03-30 03:34:01 +00:00
tim peng
ddd8a8fa92
Merge "Add zero state in output switcher" into rvc-dev
2020-03-30 02:54:33 +00:00
Kevin Chyn
ef02804952
Merge "Adjust ConfirmDeviceCredentialActivity system bars" into rvc-dev am: ef28e9b75f am: 87723f3db7
...
Change-Id: I4d0fd4de66f85adc86829b4b63dbaa19e5c52e02
2020-03-28 00:07:04 +00:00
Kevin Chyn
ef28e9b75f
Merge "Adjust ConfirmDeviceCredentialActivity system bars" into rvc-dev
2020-03-28 00:06:00 +00:00
Curtis Belmonte
c68465f024
Merge "Set CDC detail string as subtitle, not description" into rvc-dev am: da4f9f7c27 am: 33851b108f
...
Change-Id: I789fafe027e1b105abc7dd59d65bbbad1a979010
2020-03-27 22:55:51 +00:00
Curtis Belmonte
da4f9f7c27
Merge "Set CDC detail string as subtitle, not description" into rvc-dev
2020-03-27 22:42:22 +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