TreeHugger Robot
4791614cc8
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: c6efa831c1 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I50bf5aae6d67a6e48450993102d032cfb07174e5
2020-05-26 18:18:32 +00:00
TreeHugger Robot
d852aa4cc1
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: c6efa831c1 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I4237cf2fb6634fd9b1981d6d673d2edc405cd673
2020-05-26 18:18:26 +00:00
TreeHugger Robot
c6efa831c1
Merge "Import translations. DO NOT MERGE" into rvc-d1-dev
2020-05-26 18:05:31 +00:00
Automerger Merge Worker
701110117b
Merge "Merge "Close and disable SIM lock dialogs when SIM removed from device." into rvc-dev am: 5c7f6d1b98 am: 8e8386c677" into rvc-d1-dev-plus-aosp am: 8eabaefd5d am: 0014daef07 am: 291ff55cd2
...
Change-Id: I0c9f376076abbfda10ec58123b408648a62784d4
2020-05-26 17:53:24 +00:00
Grace Jia
6b3a0d0581
Merge "Close and disable SIM lock dialogs when SIM removed from device." into rvc-dev am: 5c7f6d1b98 am: f29da1c2e7 am: 3f0d810913 am: 127357e532 am: 4cb8c4ab7c
...
Change-Id: I220f2df55233c6c84c2a9c2c3aeada652549633e
2020-05-26 17:53:18 +00:00
Grace Jia
ceaa34fde4
Merge "Close and disable SIM lock dialogs when SIM removed from device." into rvc-dev am: 5c7f6d1b98 am: 8e8386c677 am: 224812552e am: fb719ecfc8 am: b7d745a7a0
...
Change-Id: Ic7aa93898dabf3e2a8e55bf15dafee53ff54a621
2020-05-26 17:53:11 +00:00
TreeHugger Robot
7c7d75298d
[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 40ffebecd0 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I497a4bb5a32415e74b9e7308724f4baa50b520f2
2020-05-26 17:53:05 +00:00
Automerger Merge Worker
291ff55cd2
Merge "Merge "Close and disable SIM lock dialogs when SIM removed from device." into rvc-dev am: 5c7f6d1b98 am: 8e8386c677" into rvc-d1-dev-plus-aosp am: 8eabaefd5d am: 0014daef07
...
Change-Id: Idd5a8aee8c81862e7039504c65a76036d5c23a80
2020-05-26 17:42:59 +00:00
Grace Jia
4cb8c4ab7c
Merge "Close and disable SIM lock dialogs when SIM removed from device." into rvc-dev am: 5c7f6d1b98 am: f29da1c2e7 am: 3f0d810913 am: 127357e532
...
Change-Id: Ic4df938252520ab6583fbee3aabc8a80c18460aa
2020-05-26 17:42:44 +00:00
Grace Jia
b7d745a7a0
Merge "Close and disable SIM lock dialogs when SIM removed from device." into rvc-dev am: 5c7f6d1b98 am: 8e8386c677 am: 224812552e am: fb719ecfc8
...
Change-Id: Ic613d20f1756b05765fb02983f23f8fc7a4360fd
2020-05-26 17:42:29 +00:00
Automerger Merge Worker
0014daef07
Merge "Merge "Close and disable SIM lock dialogs when SIM removed from device." into rvc-dev am: 5c7f6d1b98 am: 8e8386c677" into rvc-d1-dev-plus-aosp am: 8eabaefd5d
...
Change-Id: I9a97c3d11905995102bf06f3debb914e7b5c88cc
2020-05-26 17:41:25 +00:00
Grace Jia
127357e532
Merge "Close and disable SIM lock dialogs when SIM removed from device." into rvc-dev am: 5c7f6d1b98 am: f29da1c2e7 am: 3f0d810913
...
Change-Id: I1b80c78856082c14476cf0d51e08ba5e05f3c538
2020-05-26 17:41:00 +00:00
TreeHugger Robot
40ffebecd0
Merge "Import translations. DO NOT MERGE"
2020-05-26 17:36:50 +00:00
Grace Jia
fb719ecfc8
Merge "Close and disable SIM lock dialogs when SIM removed from device." into rvc-dev am: 5c7f6d1b98 am: 8e8386c677 am: 224812552e
...
Change-Id: I7c786a4480d58caecf407129997c593dc1741509
2020-05-26 17:28:17 +00:00
Automerger Merge Worker
8eabaefd5d
Merge "Merge "Close and disable SIM lock dialogs when SIM removed from device." into rvc-dev am: 5c7f6d1b98 am: 8e8386c677" into rvc-d1-dev-plus-aosp
2020-05-26 17:21:31 +00:00
Grace Jia
3f0d810913
Merge "Close and disable SIM lock dialogs when SIM removed from device." into rvc-dev am: 5c7f6d1b98 am: f29da1c2e7
...
Change-Id: I422bea8785a02bcb68fb2d944099711393da0180
2020-05-26 17:21:21 +00:00
Grace Jia
6c794a43bc
Merge "Close and disable SIM lock dialogs when SIM removed from device." into rvc-dev am: 5c7f6d1b98 am: 8e8386c677
...
Change-Id: I91a833771ed23ba08cd04aa309de3a2c23bee5de
2020-05-26 17:21:11 +00:00
Grace Jia
224812552e
Merge "Close and disable SIM lock dialogs when SIM removed from device." into rvc-dev am: 5c7f6d1b98 am: 8e8386c677
...
Change-Id: I93ec678c89b048896e23a98a18cb33615b68b364
2020-05-26 17:21:08 +00:00
Grace Jia
8e8386c677
Merge "Close and disable SIM lock dialogs when SIM removed from device." into rvc-dev am: 5c7f6d1b98
...
Change-Id: I91349e1d1051aadd264d60f48d32076629ad8a88
2020-05-26 17:08:09 +00:00
Grace Jia
f29da1c2e7
Merge "Close and disable SIM lock dialogs when SIM removed from device." into rvc-dev am: 5c7f6d1b98
...
Change-Id: Iecbd2c0627c28b68e76440cc2430e753a95fc94b
2020-05-26 17:08:06 +00:00
Grace Jia
5c7f6d1b98
Merge "Close and disable SIM lock dialogs when SIM removed from device." into rvc-dev
2020-05-26 16:52:42 +00:00
Edgar Wang
fd95a82704
Merge "Change AppPicker theme from dialog to full screen" into rvc-dev am: f3ad1ec7b7 am: 857867b809 am: 8b10ab93d8 am: bc52524fff am: 9a03a5b23b
...
Change-Id: Ie450b0bd4148d42d1904af4791bca066e902e784
2020-05-26 16:02:08 +00:00
Automerger Merge Worker
a33fdc9851
Merge "Merge "Change AppPicker theme from dialog to full screen" into rvc-dev am: f3ad1ec7b7 am: e72f014903 am: 331e53aae7" into rvc-qpr-dev-plus-aosp am: 97b605a58d am: 68eb8cf837
...
Change-Id: I10e2a76d08765eeb855ef214f25bb339ed55cb1d
2020-05-26 16:01:41 +00:00
Edgar Wang
b159fc7508
Merge "Change AppPicker theme from dialog to full screen" into rvc-dev am: f3ad1ec7b7 am: e72f014903 am: 335ee91cae am: f446e34b15 am: e2b2797c42
...
Change-Id: I9688946b7e497748151fb6eefcd250e8fec259f6
2020-05-26 16:00:58 +00:00
Edgar Wang
9a03a5b23b
Merge "Change AppPicker theme from dialog to full screen" into rvc-dev am: f3ad1ec7b7 am: 857867b809 am: 8b10ab93d8 am: bc52524fff
...
Change-Id: I9c75f11143829f483962017cb9d69b811f55096f
2020-05-26 15:45:47 +00:00
Automerger Merge Worker
68eb8cf837
Merge "Merge "Change AppPicker theme from dialog to full screen" into rvc-dev am: f3ad1ec7b7 am: e72f014903 am: 331e53aae7" into rvc-qpr-dev-plus-aosp am: 97b605a58d
...
Change-Id: If8ae26592bdc4526502521f1195beae9527c2cc8
2020-05-26 15:45:27 +00:00
Edgar Wang
e2b2797c42
Merge "Change AppPicker theme from dialog to full screen" into rvc-dev am: f3ad1ec7b7 am: e72f014903 am: 335ee91cae am: f446e34b15
...
Change-Id: I6977bca28cabda92f6c984fe54627c6c67d60652
2020-05-26 15:45:07 +00:00
Edgar Wang
bc52524fff
Merge "Change AppPicker theme from dialog to full screen" into rvc-dev am: f3ad1ec7b7 am: 857867b809 am: 8b10ab93d8
...
Change-Id: I481139120b5c13fd461b31725fa09a9aa46becd9
2020-05-26 15:32:28 +00:00
Automerger Merge Worker
97b605a58d
Merge "Merge "Change AppPicker theme from dialog to full screen" into rvc-dev am: f3ad1ec7b7 am: e72f014903 am: 331e53aae7" into rvc-qpr-dev-plus-aosp
2020-05-26 15:32:13 +00:00
Edgar Wang
d97852db97
Merge "Change AppPicker theme from dialog to full screen" into rvc-dev am: f3ad1ec7b7 am: e72f014903 am: 331e53aae7
...
Change-Id: I0aac80e6d9108dc7624551f6079c614a380bf004
2020-05-26 15:32:05 +00:00
Edgar Wang
f446e34b15
Merge "Change AppPicker theme from dialog to full screen" into rvc-dev am: f3ad1ec7b7 am: e72f014903 am: 335ee91cae
...
Change-Id: Ie6db2d1987c3d6964cdd09ed18a75a48367449e3
2020-05-26 15:32:04 +00:00
Edgar Wang
8b10ab93d8
Merge "Change AppPicker theme from dialog to full screen" into rvc-dev am: f3ad1ec7b7 am: 857867b809
...
Change-Id: I5273e41730d30b028389e2191d5fdca85fc29164
2020-05-26 15:17:16 +00:00
Edgar Wang
335ee91cae
Merge "Change AppPicker theme from dialog to full screen" into rvc-dev am: f3ad1ec7b7 am: e72f014903
...
Change-Id: I6a453a9a4c17e7fb99250e37ebb81f9a1c5f415a
2020-05-26 15:17:02 +00:00
Edgar Wang
331e53aae7
Merge "Change AppPicker theme from dialog to full screen" into rvc-dev am: f3ad1ec7b7 am: e72f014903
...
Change-Id: I332b929c79d275251bcc5ee5a516cda4c094171d
2020-05-26 15:17:01 +00:00
Edgar Wang
e72f014903
Merge "Change AppPicker theme from dialog to full screen" into rvc-dev am: f3ad1ec7b7
...
Change-Id: Ie45e6eb70dd491face353ea1d92dcc38ca7a73be
2020-05-26 15:05:05 +00:00
Edgar Wang
857867b809
Merge "Change AppPicker theme from dialog to full screen" into rvc-dev am: f3ad1ec7b7
...
Change-Id: I523f992fd67b31b6d0803454d3567a5c6e03894a
2020-05-26 15:04:55 +00:00
Edgar Wang
f3ad1ec7b7
Merge "Change AppPicker theme from dialog to full screen" into rvc-dev
2020-05-26 14:49:04 +00:00
Bonian Chen
b381ac0bad
[Settings] Avoid SIM toggle switch loopback
...
API provided by SwitchBar widget would lead to callback when
SIM toggle switch operation failure and set UI back.
However, set UI back (rollback the UI) would lead to another
trigger to SIM toggle switch. This would generate endless
events and keep system budy.
To avoid from this callback, a check need to be done prior to UI
take action. Therefore, changing APIs to fit into this concept.
Bug: 155770954
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=MobileNetworkSwitchControllerTest
Change-Id: Iaea1012acdbe449a882ced08b596c64b9f99256f
2020-05-26 21:34:39 +08:00
Bill Yi
5af6b67fa1
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: If3341cd98a53defc4dd17aa91cd6c0e06eb202eb
2020-05-26 13:17:53 +00:00
Bill Yi
90ea6e35ae
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I580c56b8be5e2078ff49a029def34e380129f585
2020-05-26 12:05:36 +00:00
Bill Yi
e82e96b92c
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I036c6b974a8a201be02f565d8ddead68f33bcaec
2020-05-26 11:28:08 +00:00
Bill Yi
da6071aff1
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I236afe1f3ad96b32388811121c789cd278df0c7b
2020-05-26 10:49:57 +00:00
Edgar Wang
809d79aea9
Merge "Remove duplicate search result when search "autofill service"" into rvc-dev am: ec156b7035 am: 08f0c0f401 am: a5789cb79b am: b155d79827 am: 09929f634e
...
Change-Id: Ic21d63e3c1842141918676017cad69d6c929fc6d
2020-05-26 10:33:09 +00:00
Edgar Wang
a77ae71b22
Merge "Remove duplicate search result when search "autofill service"" into rvc-dev am: ec156b7035 am: 08f0c0f401 am: 0dd108746f am: 07b14ace5e am: 6e016b6dc8
...
Change-Id: I63b31f3de02cf98b9ab3b29b6ebe3f866b6d831b
2020-05-26 10:33:05 +00:00
Edgar Wang
5a4bbf35a9
Merge "Remove duplicate search result when search "autofill service"" into rvc-dev am: ec156b7035 am: abb40380b9 am: ec41b86270 am: 5cf1dfdc85 am: 753be1b154
...
Change-Id: I3ee5f6ef255e07aff28ba2376da20636c1ec27fe
2020-05-26 10:32:56 +00:00
Automerger Merge Worker
4e5e15d184
Merge "Merge "Fix Talkback annoucement for Media Output panel." into rvc-dev am: ba85ecdf06 am: 8e83b6a3e1 am: 43ea5df5a9" into rvc-qpr-dev-plus-aosp am: eee9882979 am: 9e4901de1c
...
Change-Id: I0770008f7b4a261cb97bf211050476c1a334b2b1
2020-05-26 10:32:41 +00:00
Yi-Ling Chuang
ab651eabee
Merge "Fix Talkback annoucement for Media Output panel." into rvc-dev am: ba85ecdf06 am: 4aa4c7119a am: 8326951968 am: adcf256a3d am: c61e851617
...
Change-Id: I775cb5dfb53f15a988273a1dd745c66d11094e8f
2020-05-26 10:32:32 +00:00
Yi-Ling Chuang
1dbb0c6cdc
Merge "Fix Talkback annoucement for Media Output panel." into rvc-dev am: ba85ecdf06 am: 4aa4c7119a am: 7837f1824d am: 67cc4e28da am: 4b9d25135d
...
Change-Id: I01c1bc32ff4a5f16d0c7e2d13a0e7450ab93ec79
2020-05-26 10:32:14 +00:00
Edgar Wang
09929f634e
Merge "Remove duplicate search result when search "autofill service"" into rvc-dev am: ec156b7035 am: 08f0c0f401 am: a5789cb79b am: b155d79827
...
Change-Id: Idae7d506c4cbcaaf0ad968003e9b633408b8cd8d
2020-05-26 10:24:43 +00:00
Edgar Wang
6e016b6dc8
Merge "Remove duplicate search result when search "autofill service"" into rvc-dev am: ec156b7035 am: 08f0c0f401 am: 0dd108746f am: 07b14ace5e
...
Change-Id: If451f10ab2e179f2b9020c4f1fa806b0cb2dc099
2020-05-26 10:24:36 +00:00
