Commit Graph

67339 Commits

Author SHA1 Message Date
SongFerng Wang
01a23fb357 Merge "Settings: Fix force close when destory sim lock fragment view" am: 0d4010c5e5 am: 7999b0a9a2 am: d5cc228c82 am: 4d8db97e90 am: 966d9550f8
Change-Id: I737132d68dc11f4f8eed3780cb66e14db9ed4351
2020-04-29 09:56:59 +00:00
SongFerng Wang
966d9550f8 Merge "Settings: Fix force close when destory sim lock fragment view" am: 0d4010c5e5 am: 7999b0a9a2 am: d5cc228c82 am: 4d8db97e90
Change-Id: I392df21aa7cdfeaf76801cd8204c8d74ac8c2a0b
2020-04-29 09:42:30 +00:00
SongFerng Wang
4d8db97e90 Merge "Settings: Fix force close when destory sim lock fragment view" am: 0d4010c5e5 am: 7999b0a9a2 am: d5cc228c82
Change-Id: I0a4007846f5a75bf83fd6c5a4992eb72bad505f0
2020-04-29 09:24:18 +00:00
Automerger Merge Worker
0f6ddcbab8 Merge "Merge "Check if FRP policy is supported in Settings" into rvc-dev am: d1408a66a6 am: 20555b3e39 am: f4b2859be1" into rvc-qpr-dev-plus-aosp am: b44f330b9e
Change-Id: I70e959679c452b8042035caf29714b8b776841eb
2020-04-29 09:09:51 +00:00
Alex Johnston
b907ec03b6 Merge "Check if FRP policy is supported in Settings" into rvc-dev am: d1408a66a6 am: b2c004b3b7 am: 36956907ce am: 7d2f42ef2b am: ed1948b639
Change-Id: Iee8391dcd523688cf6995995bac9b68c86395d63
2020-04-29 09:09:42 +00:00
Alex Johnston
a8f1a69f3e Merge "Check if FRP policy is supported in Settings" into rvc-dev am: d1408a66a6 am: b2c004b3b7 am: 85404a89c2 am: 4c5218b503
Change-Id: I86bb6e9d8bc49954eae1ccdabb758e0ff8dcf0f4
2020-04-29 09:09:35 +00:00
Menghan Li
251e1fe6b6 Merge "Fix InvisibleToggle type service does not turn on or turn off correctly when edit shortcut dialog." into rvc-dev am: 981d10db0b am: 5d7fd4abc3 am: 222ccca3af am: 5337625d14 am: 3a4a4e785c
Change-Id: I423a85d95983df8c846dcf5f0ef0acae46bc0cff
2020-04-29 09:09:07 +00:00
Automerger Merge Worker
b44f330b9e Merge "Merge "Check if FRP policy is supported in Settings" into rvc-dev am: d1408a66a6 am: 20555b3e39 am: f4b2859be1" into rvc-qpr-dev-plus-aosp 2020-04-29 09:08:43 +00:00
SongFerng Wang
d5cc228c82 Merge "Settings: Fix force close when destory sim lock fragment view" am: 0d4010c5e5 am: 7999b0a9a2
Change-Id: I99e0482c5102182c50d171c733927b7c29dddbca
2020-04-29 09:08:42 +00:00
Alex Johnston
c86fe071d8 Merge "Check if FRP policy is supported in Settings" into rvc-dev am: d1408a66a6 am: 20555b3e39 am: f4b2859be1
Change-Id: I714f8f269ca0c7b42ba48a24d3cf94f6b4dbd1a6
2020-04-29 09:08:38 +00:00
Alex Johnston
ed1948b639 Merge "Check if FRP policy is supported in Settings" into rvc-dev am: d1408a66a6 am: b2c004b3b7 am: 36956907ce am: 7d2f42ef2b
Change-Id: I8b55af4101a6c45b1cc665b2bd09ee0a6a0233a6
2020-04-29 09:08:37 +00:00
Menghan Li
d62544cd06 Merge "Fix InvisibleToggle type service does not turn on or turn off correctly when edit shortcut dialog." into rvc-dev am: 981d10db0b am: 36d7ad2e0d am: 70a1921d2b am: f8e96c07f3
Change-Id: I94bd78e1fdc553135ead554ecc51a08d44b18f99
2020-04-29 09:08:29 +00:00
Alex Johnston
4c5218b503 Merge "Check if FRP policy is supported in Settings" into rvc-dev am: d1408a66a6 am: b2c004b3b7 am: 85404a89c2
Change-Id: I31d1eff357cb1dace71ad33123a388cff5850ec8
2020-04-29 09:08:21 +00:00
Menghan Li
3a4a4e785c Merge "Fix InvisibleToggle type service does not turn on or turn off correctly when edit shortcut dialog." into rvc-dev am: 981d10db0b am: 5d7fd4abc3 am: 222ccca3af am: 5337625d14
Change-Id: Iac4d54cab4393905a388533565584670d7079eb1
2020-04-29 09:08:07 +00:00
Alex Johnston
7d2f42ef2b Merge "Check if FRP policy is supported in Settings" into rvc-dev am: d1408a66a6 am: b2c004b3b7 am: 36956907ce
Change-Id: Ia99cb382f7a8db2065751f7f9dcc9696497bd129
2020-04-29 09:07:58 +00:00
Menghan Li
149f35605f Merge "Fix InvisibleToggle type service does not turn on or turn off correctly when edit shortcut dialog." into rvc-dev am: 981d10db0b am: 5d7fd4abc3 am: aa0c512ff5 am: 6267537581
Change-Id: I356ddb582b6fd154766c932e774ccbbe3d653f5e
2020-04-29 09:07:47 +00:00
Alex Johnston
f4b2859be1 Merge "Check if FRP policy is supported in Settings" into rvc-dev am: d1408a66a6 am: 20555b3e39
Change-Id: Ie3c5f305b2c4eb25dc12ce6db4df0428a3b9e047
2020-04-29 08:50:25 +00:00
Alex Johnston
36956907ce Merge "Check if FRP policy is supported in Settings" into rvc-dev am: d1408a66a6 am: b2c004b3b7
Change-Id: Iea3de900abd4fa5179e355f59366e9f8cd542d11
2020-04-29 08:50:09 +00:00
SongFerng Wang
7999b0a9a2 Merge "Settings: Fix force close when destory sim lock fragment view" am: 0d4010c5e5
Change-Id: I1799dd42b0400e29772bb01ddeb957031df6aa8b
2020-04-29 08:50:04 +00:00
Alex Johnston
85404a89c2 Merge "Check if FRP policy is supported in Settings" into rvc-dev am: d1408a66a6 am: b2c004b3b7
Change-Id: I35a73ed9051d360ab493968defcee656ca92f0c1
2020-04-29 08:49:52 +00:00
Menghan Li
f8e96c07f3 Merge "Fix InvisibleToggle type service does not turn on or turn off correctly when edit shortcut dialog." into rvc-dev am: 981d10db0b am: 36d7ad2e0d am: 70a1921d2b
Change-Id: If26020d1a23820f45991f24c7f37b98a663034b2
2020-04-29 08:45:23 +00:00
Menghan Li
6267537581 Merge "Fix InvisibleToggle type service does not turn on or turn off correctly when edit shortcut dialog." into rvc-dev am: 981d10db0b am: 5d7fd4abc3 am: aa0c512ff5
Change-Id: Id43cccbab4bd05b79b3c05d6305ebb5dde0ee690
2020-04-29 08:44:57 +00:00
Menghan Li
5337625d14 Merge "Fix InvisibleToggle type service does not turn on or turn off correctly when edit shortcut dialog." into rvc-dev am: 981d10db0b am: 5d7fd4abc3 am: 222ccca3af
Change-Id: I85414131be20dc1e393a1f3d7c5e69860400e758
2020-04-29 08:44:48 +00:00
Alex Johnston
20555b3e39 Merge "Check if FRP policy is supported in Settings" into rvc-dev am: d1408a66a6
Change-Id: Ia730a919a16bb89f4d4543bc5cd592885ff730fd
2020-04-29 08:34:00 +00:00
Alex Johnston
b2c004b3b7 Merge "Check if FRP policy is supported in Settings" into rvc-dev am: d1408a66a6
Change-Id: I65079e2dc5c1cceb8489c7d691cdce08f0788c90
2020-04-29 08:33:53 +00:00
SongFerng Wang
0d4010c5e5 Merge "Settings: Fix force close when destory sim lock fragment view" 2020-04-29 08:31:05 +00:00
Menghan Li
70a1921d2b Merge "Fix InvisibleToggle type service does not turn on or turn off correctly when edit shortcut dialog." into rvc-dev am: 981d10db0b am: 36d7ad2e0d
Change-Id: Ic8a68c0e39e7e9dd630608e6a6e39fb2cd35abd9
2020-04-29 08:25:28 +00:00
Menghan Li
222ccca3af Merge "Fix InvisibleToggle type service does not turn on or turn off correctly when edit shortcut dialog." into rvc-dev am: 981d10db0b am: 5d7fd4abc3
Change-Id: I5b445da9587b04642bec4ac63ed18cbaf1f628ea
2020-04-29 08:25:17 +00:00
Menghan Li
aa0c512ff5 Merge "Fix InvisibleToggle type service does not turn on or turn off correctly when edit shortcut dialog." into rvc-dev am: 981d10db0b am: 5d7fd4abc3
Change-Id: I0f0d7a674aacd998ee88a5627fa30586e3662c28
2020-04-29 08:24:51 +00:00
Alex Johnston
d1408a66a6 Merge "Check if FRP policy is supported in Settings" into rvc-dev 2020-04-29 08:19:14 +00:00
Menghan Li
36d7ad2e0d Merge "Fix InvisibleToggle type service does not turn on or turn off correctly when edit shortcut dialog." into rvc-dev am: 981d10db0b
Change-Id: Iae5b3d775430bbdbb789be190a61dfbfb7975463
2020-04-29 08:14:13 +00:00
Menghan Li
5d7fd4abc3 Merge "Fix InvisibleToggle type service does not turn on or turn off correctly when edit shortcut dialog." into rvc-dev am: 981d10db0b
Change-Id: I3a7d6846feb4191cf09aea61f3b6e1eb0cea03e4
2020-04-29 08:13:57 +00:00
Menghan Li
981d10db0b Merge "Fix InvisibleToggle type service does not turn on or turn off correctly when edit shortcut dialog." into rvc-dev 2020-04-29 07:59:35 +00:00
Zoey Chen
c21eee6936 Merge "Improve the performance of displaying preference." into rvc-dev am: e6b7e24a09 am: 9bdb276281 am: 1891db88b1 am: fc6bf429e3 am: 4baa729613
Change-Id: Iecd3bd5a081bfa0240c1a4a6a308c07ce46d715d
2020-04-29 06:52:42 +00:00
Zoey Chen
47a49a4e9a Merge "Improve the performance of displaying preference." into rvc-dev am: e6b7e24a09 am: 5ef8e70bba am: 30be159390 am: 6fbf4dabe1
Change-Id: Iea3391aba87cb6cd5f3e0a872e8c4832bf756901
2020-04-29 06:52:31 +00:00
Zoey Chen
4baa729613 Merge "Improve the performance of displaying preference." into rvc-dev am: e6b7e24a09 am: 9bdb276281 am: 1891db88b1 am: fc6bf429e3
Change-Id: Ic419ea8ba8c4db5349bd3da85bbfd65000a623fc
2020-04-29 06:51:43 +00:00
Zoey Chen
f7a2cc0fa3 Merge "Improve the performance of displaying preference." into rvc-dev am: e6b7e24a09 am: 9bdb276281 am: b041384d57 am: 9935b4684b
Change-Id: I931a1411b34a673dab0178f3bc813b5544238775
2020-04-29 06:51:37 +00:00
Zoey Chen
6fbf4dabe1 Merge "Improve the performance of displaying preference." into rvc-dev am: e6b7e24a09 am: 5ef8e70bba am: 30be159390
Change-Id: I4478f873a1662bd5b4ff8bec8f58cc80454fa444
2020-04-29 06:41:29 +00:00
Zoey Chen
9935b4684b Merge "Improve the performance of displaying preference." into rvc-dev am: e6b7e24a09 am: 9bdb276281 am: b041384d57
Change-Id: Ic98b9855734f71224d5a231a4e946b51df6842cf
2020-04-29 06:41:19 +00:00
Zoey Chen
fc6bf429e3 Merge "Improve the performance of displaying preference." into rvc-dev am: e6b7e24a09 am: 9bdb276281 am: 1891db88b1
Change-Id: Ifbabf8515ea4223a0ae74f930127dd3ee404465b
2020-04-29 06:40:31 +00:00
Zoey Chen
30be159390 Merge "Improve the performance of displaying preference." into rvc-dev am: e6b7e24a09 am: 5ef8e70bba
Change-Id: I8f7aae08ea5fb6edde4d2d3639f4a3d693a22886
2020-04-29 06:28:03 +00:00
Zoey Chen
1891db88b1 Merge "Improve the performance of displaying preference." into rvc-dev am: e6b7e24a09 am: 9bdb276281
Change-Id: Iea50e0a5c9f4f01050aacb55c63c9663b7847699
2020-04-29 06:27:51 +00:00
TreeHugger Robot
257908b193 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8c28127323 -s ours am: c763d18148 -s ours am: 29f6ec314e -s ours am: 1276dbef56 -s ours am: 7649025260 -s ours
am skip reason: subject contains skip directive

Change-Id: I3312bc92448c12311c57d2376a6d5245682a53ef
2020-04-29 06:27:12 +00:00
Zoey Chen
b041384d57 Merge "Improve the performance of displaying preference." into rvc-dev am: e6b7e24a09 am: 9bdb276281
Change-Id: I9d0e6885341b7810261f948710dde2766c2eaf8e
2020-04-29 06:27:05 +00:00
TreeHugger Robot
0838d3c036 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: fdb8558d88 -s ours am: 899dbf039f -s ours am: f80898b03b -s ours am: 113a084571 -s ours am: 5f2fccb939 -s ours
am skip reason: subject contains skip directive

Change-Id: If401091b9f54f25f06db2226e6935fe6ac4d0557
2020-04-29 06:26:09 +00:00
TreeHugger Robot
0780e2d2e0 Merge "Move ImeAwareTextEdit to android.widget" into rvc-dev am: 4c221d1609 am: 222da24344 am: ae12c347ee am: dc18558a59 am: 2abc1f2a43
Change-Id: I2407fff473cb823b37a3c6ccacaeaa7bfe034b0a
2020-04-29 06:25:24 +00:00
TreeHugger Robot
e7fc0ec6cf [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8c28127323 -s ours am: c763d18148 -s ours am: 82a2d63074 -s ours am: f0b0e1b416 -s ours
am skip reason: subject contains skip directive

Change-Id: I74e20e9156e792013fe1ee1f305854f2a9416b01
2020-04-29 06:24:44 +00:00
TreeHugger Robot
641862367c [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: fdb8558d88 -s ours am: 899dbf039f -s ours am: c75d440e49 -s ours am: 98299d44c3 -s ours
am skip reason: subject contains skip directive

Change-Id: I3045b7fb87adfe28a2045b3f2149bfd52f8d923b
2020-04-29 06:23:05 +00:00
TreeHugger Robot
65456e51b5 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8c28127323 -s ours am: 2ec23fb8ab -s ours am: 31bab75429 -s ours am: ef1c1a53ed -s ours
am skip reason: subject contains skip directive

Change-Id: I4466ecbe9b0d38f1dc9413d2e2d0a338b7483e6f
2020-04-29 06:22:32 +00:00
TreeHugger Robot
0826b11143 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: fdb8558d88 -s ours am: 9acc933b12 -s ours am: bc15fc2e62 -s ours am: b0f4adf189 -s ours
am skip reason: subject contains skip directive

Change-Id: I9d57ae7108b94a33603e47fb6bfdfb86ffa49798
2020-04-29 06:22:00 +00:00