Commit Graph

63875 Commits

Author SHA1 Message Date
Robert Luo
c13ecfad98 Merge "Refine NFC payment wording for "Set default" and "Update" scenarios." into rvc-dev am: c3535eab06
Change-Id: Ibf6f65fc9659992bb7da934f2f39572b3f108ac2
2020-03-31 08:01:50 +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
a2411f9c3c Merge "[Settings] Code Refactor" into rvc-dev am: 268bdc12c6 am: 949ec8a1f0 am: 9e9597f7d8 am: 3c4dffc470
Change-Id: I45977c850977be84c0dc1f6461e68a1941efc1a2
2020-03-31 07:29:37 +00:00
Bonian Chen
3c4dffc470 Merge "[Settings] Code Refactor" into rvc-dev am: 268bdc12c6 am: 949ec8a1f0 am: 9e9597f7d8
Change-Id: Ibb3fe8013b6de42c2aa2526b6a2e40e3ec3e1a95
2020-03-31 07:15:48 +00:00
Bonian Chen
a170198f0b Merge "[Settings] Code Refactor" into rvc-dev am: 268bdc12c6 am: 949ec8a1f0 am: 155c698d4f
Change-Id: I35c153ff8ecf7b9505e87ac4fd9e2ffa7fa7a491
2020-03-31 07:15:23 +00:00
Bonian Chen
155c698d4f Merge "[Settings] Code Refactor" into rvc-dev am: 268bdc12c6 am: 949ec8a1f0
Change-Id: Ie800cbe35040ed63a8488e7cac8e1bfdfdadb8a4
2020-03-31 07:00:57 +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
7520adccee [Settings] Apply WifiCallingQueryImsState
Apply design of WifiCallingQueryImsState to source code which accessing
WifiCalling.

Bug:  140542283
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSettingsForSubTest
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingPreferenceControllerTest
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSettingsTest
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSliceHelperTest

Change-Id: I0db966742d63cfe9a1ef4e1b06f6b5c81f681927
2020-03-31 14:40:18 +08:00
Bonian Chen
9dda57cd21 Merge "[Settings] Code Refactor" into rvc-dev am: 268bdc12c6
Change-Id: I86c84f03fedfbaae24f377552c5998fc9b31cce4
2020-03-31 06:39:41 +00:00
Bonian Chen
949ec8a1f0 Merge "[Settings] Code Refactor" into rvc-dev am: 268bdc12c6
Change-Id: Ib23864723f76e376338604b65171a058cc0df611
2020-03-31 06:39:12 +00:00
Bonian Chen
268bdc12c6 Merge "[Settings] Code Refactor" into rvc-dev 2020-03-31 06:24:15 +00:00
TreeHugger Robot
aa94953649 Merge "Get MediaDevice from devices list" into rvc-dev am: cd329951ba am: 46cc33c9a6 am: 210c260ce6 am: bebee5c18e
Change-Id: I7c47427bdd8f33ba29e09780492582d69770e335
2020-03-31 06:16:05 +00:00
Jason Chang
cc6b079130 Merge "New strings for One-Handed mode settings (gesture)" 2020-03-31 05:58:30 +00:00
Jason Chang
24b7398a19 Merge "New Settings preference for One Handed mode" 2020-03-31 05:58:30 +00:00
TreeHugger Robot
76d2bd2f1c Merge "[Wi-Fi] Fix a unit test fail in WifiMasterSwitchPreferenceControllerTest" into rvc-dev am: 477c4fef48 am: 2093f0dee4 am: 1e2a313c5a am: ab9a994fcd
Change-Id: I8982dfc9a4ea527f210e5634035e6b391f4c4945
2020-03-31 05:21:32 +00:00
tim peng
85cbce813c Merge "No media status is visible in Output Switcher" into rvc-dev am: 5b0913c2b6 am: 4a82a5abb5 am: 2b47660696 am: f8c57507e2
Change-Id: I4c9eaaf3b244f657bb6cc32a31526b22f535a20a
2020-03-31 05:20:51 +00:00
TreeHugger Robot
2ef7ebefc1 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4a08ac176f -s ours am: 7f94e44f55 -s ours am: 50699d4595 -s ours am: a383b959ac -s ours am: 24848171d3 -s ours
am skip reason: subject contains skip directive

Change-Id: I841cb1ed9cc87031b3b9bd29ccd5d4124ead0562
2020-03-31 05:20:06 +00:00
TreeHugger Robot
2807098cee [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4a08ac176f -s ours am: 7f94e44f55 -s ours am: d87a2cb1f3 -s ours am: fe1309d723 -s ours
am skip reason: subject contains skip directive

Change-Id: I58b4af029c1e9d60b36151890c7a019aa26cdb3d
2020-03-31 05:17:53 +00:00
TreeHugger Robot
faff3e2276 Merge "Get MediaDevice from devices list" into rvc-dev am: cd329951ba am: 46cc33c9a6 am: 7fea1bf993
Change-Id: I12ec3f1aeddac3cda3ba300057094cf3aa64105b
2020-03-31 05:16:00 +00:00
TreeHugger Robot
bebee5c18e Merge "Get MediaDevice from devices list" into rvc-dev am: cd329951ba am: 46cc33c9a6 am: 210c260ce6
Change-Id: Ib374cc0970383c55e61a76fe941a8fbfa8963dc1
2020-03-31 05:15:32 +00:00
TreeHugger Robot
7fea1bf993 Merge "Get MediaDevice from devices list" into rvc-dev am: cd329951ba am: 46cc33c9a6
Change-Id: Id213c4a4ffdd6bc57fc45e6956660b92d725a75e
2020-03-31 05:04:30 +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
e8be88a0fc Merge "Set face unlock toggle to unchecked when disabled by admin" into rvc-dev am: a2d56af9bd am: ea63b90c3d am: 0c0dc0f64e am: 931ea77cc3 am: 8c7a574507
Change-Id: I88a5627d8a21698258d053b14a19ec3e40ffd8a5
2020-03-31 05:03:52 +00:00
TreeHugger Robot
cfcc352af6 Merge "Set face unlock toggle to unchecked when disabled by admin" into rvc-dev am: a2d56af9bd am: ea63b90c3d am: 4b997ee9fd am: 599f02eab1
Change-Id: I9349594dd1e6e65c441f45563b7add8453ae5aea
2020-03-31 05:03:23 +00:00
TreeHugger Robot
f833efefdb Merge "Don't filter demoted conversation from app subtext" into rvc-dev am: 6f837d10bf am: f61da397fd am: dfdb9d18f8 am: 43919ede30 am: 0ad036bd31
Change-Id: Iae0393bb6e336a51a5c996115ae449934d23579d
2020-03-31 05:02:50 +00:00
Julia Reynolds
54a3fca8d7 Merge "Remove bubble settings from channel pages" into rvc-dev am: 56d45997b3 am: 52b375b242 am: 5c44faa98d am: e7ed0da17a am: 7b60612e01
Change-Id: I191db08025586d43fa6bf21805de4ae1c2f6f862
2020-03-31 05:02:07 +00:00
Julia Reynolds
b38c9b551b Merge "Conversations can't individually bypass dnd" into rvc-dev am: b3f2c0d528 am: 6d30804cec am: 8fcac244ad am: 7368dcdc8c am: 6271a3e226
Change-Id: Id2fbeb126f542b5881d4d6abeb8cfd5fb96f925e
2020-03-31 05:01:40 +00: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
Julia Reynolds
a5de5f20bf Merge "Fix some history a11y issues" into rvc-dev am: 2f77fd08e9 am: 2b541018da am: acbf2b36e4 am: cf2ff6cc61 am: 5124fa67cc
Change-Id: I019b3ca534013c01cf8397100f8ca1ed1e644039
2020-03-31 04:59:48 +00:00
Julia Reynolds
e004d14655 Merge "Fix some history a11y issues" into rvc-dev am: 2f77fd08e9 am: 2b541018da am: 19ba74919f am: 2554c8d8b8
Change-Id: I55e4edd27cc9a59bb2cca94ab7f55902fb87b762
2020-03-31 04:59:10 +00:00
TreeHugger Robot
7c067a710b Merge "Fix the ringtone subtext is empty" into rvc-dev am: 83dfe52029 am: 68a77ceb47 am: 8703e457e0 am: 554a982534
Change-Id: Iae41cc614b00c218082492d33112ca19d4659486
2020-03-31 04:58:29 +00:00
Yanting Yang
2bae040f8c Merge "Add custom site map pairs into SettingsSearchIndexablesProvider" into rvc-dev am: ad4405d0f8 am: d8f14f11b0 am: 0c23dcd4ec am: fa0f65e087
Change-Id: Id8dde151190586d768f7a164b8755bb94211ebb4
2020-03-31 04:57:40 +00:00
TreeHugger Robot
bdb69e13a7 Merge "Only request focus if change was self-triggered" into rvc-dev am: c22d90cb1b am: 5093ea158d am: 0ce302633d am: f3acc7c2c7
Change-Id: Ifd6d2f7f1adb82b16b20bbb8e366ab0a63e31e69
2020-03-31 04:56:29 +00:00
Julia Reynolds
518d27d2ba Merge "Remove items from the 'last 24 hours' history on swipe" into rvc-dev am: dad135f4ed am: fe8ad05005 am: 7e0ac47792 am: 57921a1b52
Change-Id: Idd5833f864d4a3f056767ac61b578e09393d00af
2020-03-31 04:55:24 +00:00
TreeHugger Robot
4e5478886d Merge "Add tap targets to top 2 sections" into rvc-dev am: 9db658bfe0 am: 9d9504f951 am: 93c322afc6 am: 91b625e9e0
Change-Id: If7e6a0bfef89de7c2dc3f4d0a3f417fa93247be6
2020-03-31 04:53:17 +00:00
TreeHugger Robot
78ddc438ca Merge "Update App storage usage summary" into rvc-dev am: 9c32d89aaa am: 0d761a25bd am: 4c9934dd9c am: 65cd2779b7
Change-Id: I2a72887758746db89613e160453f4a79fb036024
2020-03-31 04:47:13 +00:00
Bonian Chen
cc86edf539 [Settings] Replace ImsManager#isVtEnabledByPlatform() am: fb7274a308 am: a6d6285b57 am: 3205731765 am: 16c6fa6d17
Change-Id: I0f17e9b18fd875c3481d1233a4423bb51fa4d9a8
2020-03-31 04:46:31 +00:00
tim peng
2317815cb7 Merge "PendingIntent in MediaOutputIndicatorSlice could be Hijacked" into rvc-dev am: ecea133904 am: 15ac2b2c8e am: 5201d1d163 am: 3fd077feae
Change-Id: Ibae91f04f9092a84b9f8e7dbfd44815e588a374a
2020-03-31 04:45:52 +00:00
Bonian Chen
9c9733e5ec [Settings] Replace ImsManager#isWfcEnabledByPlatform() am: c134ef08d4 am: 9c4d1190d9 am: ea44a49cfd am: c394933399
Change-Id: I35bbfb5161286b47f407e78be49d3207b024483a
2020-03-31 04:45:13 +00:00
tim peng
726dc6636d Merge "Add zero state in output switcher" into rvc-dev am: ddd8a8fa92 am: 3e73d0f92c am: 49480d1f53 am: c3d541be64
Change-Id: I039bcfaa933eda6ae955719810340f8c8de18648
2020-03-31 04:44:30 +00:00
Artur Satayev
cf272ccf5c [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: 6a489a0135 -s ours
am skip reason: Change-Id Icab88938f1a49a892e0d62b2a833b659d6725267 with SHA-1 f9cc52d670 is in history

Change-Id: I163c0ec37c537ca117e8b35669a64f9137dceeb6
2020-03-31 04:43:27 +00:00
TreeHugger Robot
820d35b59a Merge "Get MediaDevice from devices list" into rvc-dev am: cd329951ba
Change-Id: I1cd9eb45833c4a572a98b8b8996bc8512f92c069
2020-03-31 04:43:08 +00:00
TreeHugger Robot
46cc33c9a6 Merge "Get MediaDevice from devices list" into rvc-dev am: cd329951ba
Change-Id: I066c17625736fd8cdaa96068a2bc5accdb5ae3fc
2020-03-31 04:42:59 +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
TreeHugger Robot
545c95317c Merge "[Wi-Fi] Fix a unit test fail in WifiMasterSwitchPreferenceControllerTest" into rvc-dev am: 477c4fef48 am: 2093f0dee4 am: 52162fde91
Change-Id: Ic19955a29105435d67c7f586e76ce8d4a1aef858
2020-03-31 03:13:58 +00:00
TreeHugger Robot
ab9a994fcd Merge "[Wi-Fi] Fix a unit test fail in WifiMasterSwitchPreferenceControllerTest" into rvc-dev am: 477c4fef48 am: 2093f0dee4 am: 1e2a313c5a
Change-Id: Idcfa5ac8d980dbf8a8b01b177d58278e665b08e1
2020-03-31 03:13:45 +00:00
TreeHugger Robot
52162fde91 Merge "[Wi-Fi] Fix a unit test fail in WifiMasterSwitchPreferenceControllerTest" into rvc-dev am: 477c4fef48 am: 2093f0dee4
Change-Id: Ief6b6435ad6b344c9fecaa12af0ff83e3e680199
2020-03-31 03:13:39 +00:00