Commit Graph

63790 Commits

Author SHA1 Message Date
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
TreeHugger Robot
1e2a313c5a Merge "[Wi-Fi] Fix a unit test fail in WifiMasterSwitchPreferenceControllerTest" into rvc-dev am: 477c4fef48 am: 2093f0dee4
Change-Id: I9d0663c100944dcced8ae20d0d38c6ba3364182d
2020-03-31 03:13:38 +00:00
tim peng
f8c57507e2 Merge "No media status is visible in Output Switcher" into rvc-dev am: 5b0913c2b6 am: 4a82a5abb5 am: 2b47660696
Change-Id: I441ae31c111143bfd5dea06e2179e1644d86ca52
2020-03-31 03:13:25 +00:00
tim peng
774620f543 Merge "No media status is visible in Output Switcher" into rvc-dev am: 5b0913c2b6 am: 4a82a5abb5 am: 1106c19951
Change-Id: Ie11c1cc084213b3196d97ef0eca0f7fa018288a6
2020-03-31 03:13:08 +00:00
TreeHugger Robot
58920061b1 Merge "[Wi-Fi] Fix a unit test fail in WifiMasterSwitchPreferenceControllerTest" into rvc-dev am: 477c4fef48
Change-Id: I7658df2b27aa43f948739d06bf7cf18b94b5391d
2020-03-31 02:51:20 +00:00
TreeHugger Robot
2093f0dee4 Merge "[Wi-Fi] Fix a unit test fail in WifiMasterSwitchPreferenceControllerTest" into rvc-dev am: 477c4fef48
Change-Id: Ia47c8ea68d5b5709e1aa82930ea38ab61f0c7222
2020-03-31 02:51:01 +00:00
tim peng
1106c19951 Merge "No media status is visible in Output Switcher" into rvc-dev am: 5b0913c2b6 am: 4a82a5abb5
Change-Id: I13e4e901bd2e6a462e2ad7ba29077aa79255d018
2020-03-31 02:45:01 +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
TreeHugger Robot
477c4fef48 Merge "[Wi-Fi] Fix a unit test fail in WifiMasterSwitchPreferenceControllerTest" into rvc-dev 2020-03-31 02:34:51 +00:00
tim peng
5c81b237cd Merge "No media status is visible in Output Switcher" into rvc-dev am: 5b0913c2b6
Change-Id: I77aeae7c8b4f3f6acafec0e6a05d6b1310f6cc50
2020-03-31 02:24:35 +00:00
tim peng
4a82a5abb5 Merge "No media status is visible in Output Switcher" into rvc-dev am: 5b0913c2b6
Change-Id: Ic6c44c4ce05197d113f4f0718640f0abb868793e
2020-03-31 02:24:16 +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
Bonian Chen
bef5c99802 [Settings] Remove internal ImsManager access within MobileNetworkUtils
Remove the access of com.android.ims.ImsManager from MobileNetworkUtils.

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: Id2550a11c185ac44c1f70c98929c4b1d659f9a0c
2020-03-31 09:41:40 +08:00
TreeHugger Robot
24848171d3 [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 skip reason: subject contains skip directive

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

Change-Id: I8369808c740c4be08c8ea250082fb1fdf23e4365
2020-03-31 00:50:51 +00:00
TreeHugger Robot
a383b959ac [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4a08ac176f -s ours am: 7f94e44f55 -s ours am: 50699d4595 -s ours
am skip reason: subject contains skip directive

Change-Id: I7a5fd91ca07762f44965e4a2873b92129a8e534a
2020-03-31 00:50:33 +00:00
TreeHugger Robot
50699d4595 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4a08ac176f -s ours am: 7f94e44f55 -s ours
am skip reason: subject contains skip directive

Change-Id: I660c2a7e46b4c055e417e955a9e9b99aadca3052
2020-03-31 00:25:29 +00:00
TreeHugger Robot
d87a2cb1f3 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4a08ac176f -s ours am: 7f94e44f55 -s ours
am skip reason: subject contains skip directive

Change-Id: I71ff8fa319bb3b19f8c5828412159fc505262aed
2020-03-31 00:25:16 +00:00
TreeHugger Robot
7c4f2d2cc8 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4a08ac176f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie75baff25f3026bfdb41b067769e7ffef4123eec
2020-03-31 00:04:51 +00:00
TreeHugger Robot
8c7a574507 Merge "Set face unlock toggle to unchecked when disabled by admin" into rvc-dev am: a2d56af9bd am: ea63b90c3d am: 0c0dc0f64e am: 931ea77cc3
Change-Id: Ifb47c6d171397534931b4dea4ae161be0e704beb
2020-03-30 23:45:27 +00:00
TreeHugger Robot
4a08ac176f Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-03-30 23:39:52 +00:00
TreeHugger Robot
931ea77cc3 Merge "Set face unlock toggle to unchecked when disabled by admin" into rvc-dev am: a2d56af9bd am: ea63b90c3d am: 0c0dc0f64e
Change-Id: I18cfc1ccb3d631a90f4917fcb7ee976eee7cc0c3
2020-03-30 23:09:53 +00:00
TreeHugger Robot
0c0dc0f64e Merge "Set face unlock toggle to unchecked when disabled by admin" into rvc-dev am: a2d56af9bd am: ea63b90c3d
Change-Id: Ibba92edec9c66ed27f37ceeb7eb6e891faa28ac2
2020-03-30 22:51:13 +00:00
TreeHugger Robot
599f02eab1 Merge "Set face unlock toggle to unchecked when disabled by admin" into rvc-dev am: a2d56af9bd am: ea63b90c3d am: 4b997ee9fd
Change-Id: Icb82bc3fd94d56b94c275ad2bbb80b78b8bbf1dc
2020-03-30 22:13:07 +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
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