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
hoffc
d6c805f0bb
Settings: Fix force close when destory sim lock fragment view
...
Sim lock fragment does not override its parent onCreateView method and diretly
return null, which results in NPE when destory after removing Sim card.
Override its parent onCreateView when no sim card inserted.
Bug: 154743278
Test: build pass
Change-Id: I0b10a07c1767cda74096dc44ef7ffa7839a9aae4
Merged-In: I0b10a07c1767cda74096dc44ef7ffa7839a9aae4
2020-04-29 16:34:21 +08: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
TreeHugger Robot
7649025260
[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 skip reason: subject contains skip directive
Change-Id: I51d2d0cde402ebf33d555d1aaa082dde691df7b7
2020-04-29 06:21:49 +00:00
Automerger Merge Worker
d93a54a7af
Merge "Merge "Move ImeAwareTextEdit to android.widget" into rvc-dev am: 4c221d1609 am: b47f88ee05" into rvc-d1-dev-plus-aosp am: e1780aef04 am: 13a69f84da
...
Change-Id: Ibb6f2c6af43f039aad2190ac3ae8fe93fdd8fd33
2020-04-29 06:21:41 +00:00
TreeHugger Robot
5f2fccb939
[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 skip reason: subject contains skip directive
Change-Id: Id0d10764a4652dd488c23367024b70a7e158d917
2020-04-29 06:20:57 +00:00
TreeHugger Robot
4004667fff
Merge "Move ImeAwareTextEdit to android.widget" into rvc-dev am: 4c221d1609 am: 222da24344 am: a21603a224 am: 6732e446a7
...
Change-Id: I47bf21ce8c231bcd7996e96d9d72e5809d42befd
2020-04-29 06:20:50 +00:00
TreeHugger Robot
2abc1f2a43
Merge "Move ImeAwareTextEdit to android.widget" into rvc-dev am: 4c221d1609 am: 222da24344 am: ae12c347ee am: dc18558a59
...
Change-Id: Ie88c9a8dbd0f11a8f5e1f92af4e6f295e0484f15
2020-04-29 06:20:44 +00:00
TreeHugger Robot
f0b0e1b416
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8c28127323 -s ours am: c763d18148 -s ours am: 82a2d63074 -s ours
...
am skip reason: subject contains skip directive
Change-Id: If5c7b6ddc4bf35e785554452b54269ab22a3d9bc
2020-04-29 06:13:03 +00:00
Zoey Chen
5ef8e70bba
Merge "Improve the performance of displaying preference." into rvc-dev am: e6b7e24a09
...
Change-Id: I501cd6da5ab4672cc7989b07a9c351953238ffae
2020-04-29 06:12:00 +00:00
Zoey Chen
9bdb276281
Merge "Improve the performance of displaying preference." into rvc-dev am: e6b7e24a09
...
Change-Id: If161edb6ba8db7861bd9e36fcec89e02f14031ce
2020-04-29 06:11:55 +00:00
TreeHugger Robot
98299d44c3
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: fdb8558d88 -s ours am: 899dbf039f -s ours am: c75d440e49 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I5453aad939c7d681955d39ae611e6740da615de7
2020-04-29 06:11:47 +00:00
TreeHugger Robot
ef1c1a53ed
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8c28127323 -s ours am: 2ec23fb8ab -s ours am: 31bab75429 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I8cb00e223a9c4e879794878c4cf96014fe4bdfc3
2020-04-29 06:11:26 +00:00
TreeHugger Robot
b0f4adf189
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: fdb8558d88 -s ours am: 9acc933b12 -s ours am: bc15fc2e62 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I245291847f12ca0b541a2e2cdbb869b5d2847ba9
2020-04-29 06:10:24 +00:00
Automerger Merge Worker
13a69f84da
Merge "Merge "Move ImeAwareTextEdit to android.widget" into rvc-dev am: 4c221d1609 am: b47f88ee05" into rvc-d1-dev-plus-aosp am: e1780aef04
...
Change-Id: I506d87e453ea3519769578bcaf47b8841c4ff0ca
2020-04-29 06:08:45 +00:00
TreeHugger Robot
1276dbef56
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8c28127323 -s ours am: c763d18148 -s ours am: 29f6ec314e -s ours
...
am skip reason: subject contains skip directive
Change-Id: I54f25b248843669547ec36a280c111ead5104215
2020-04-29 06:07:32 +00:00
TreeHugger Robot
113a084571
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: fdb8558d88 -s ours am: 899dbf039f -s ours am: f80898b03b -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ifca877357cf6ad66c7d41bc2099a3f59585409b9
2020-04-29 06:07:23 +00:00
TreeHugger Robot
6732e446a7
Merge "Move ImeAwareTextEdit to android.widget" into rvc-dev am: 4c221d1609 am: 222da24344 am: a21603a224
...
Change-Id: I90487c266da2098cb4de2435450f181fa1d2a8ac
2020-04-29 06:06:46 +00:00
TreeHugger Robot
dc18558a59
Merge "Move ImeAwareTextEdit to android.widget" into rvc-dev am: 4c221d1609 am: 222da24344 am: ae12c347ee
...
Change-Id: If6e047f5a0885de679c9c871693a94fcb6ed053c
2020-04-29 06:06:41 +00:00
Zoey Chen
e6b7e24a09
Merge "Improve the performance of displaying preference." into rvc-dev
2020-04-29 05:57:12 +00:00
TreeHugger Robot
82a2d63074
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8c28127323 -s ours am: c763d18148 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I0fdf2bf0233c1ae4dd30e4a5ee8d33089416fdae
2020-04-29 05:50:42 +00:00
