PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
65,603 Commits 1 Branch 0 Tags
c106e6bc032fe27be2b620261d5717a030d9465c
Commit Graph

65603 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
TreeHugger Robot
c75d440e49 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: fdb8558d88 -s ours am: 899dbf039f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I644d84eee4f32ca4d6250e766fbfaa2e58088949
 2020-04-29 05:50:20 +00:00
TreeHugger Robot
29f6ec314e [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: Ic87ea23e12d78533b2bf67fa9691c13324573662
 2020-04-29 05:50:19 +00:00
TreeHugger Robot
f80898b03b [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: fdb8558d88 -s ours am: 899dbf039f -s ours 
am skip reason: subject contains skip directive

Change-Id: I5313f8a3cbb131e3f9b140cc55b8baa37a74cba1
 2020-04-29 05:50:13 +00:00
TreeHugger Robot
bc15fc2e62 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: fdb8558d88 -s ours am: 9acc933b12 -s ours 
am skip reason: subject contains skip directive

Change-Id: I4cf2843833eae69c184603cd2fa7a317af775b41
 2020-04-29 05:50:04 +00:00
Automerger Merge Worker
e1780aef04 Merge "Merge "Move ImeAwareTextEdit to android.widget" into rvc-dev am: 4c221d1609 am: b47f88ee05" into rvc-d1-dev-plus-aosp 2020-04-29 05:49:57 +00:00
TreeHugger Robot
5a9e5af764 Merge "Move ImeAwareTextEdit to android.widget" into rvc-dev am: 4c221d1609 am: b47f88ee05 
Change-Id: I0839b8c51c797ec2a028aec3cb2309fa409f742d
 2020-04-29 05:49:52 +00:00
TreeHugger Robot
ae12c347ee Merge "Move ImeAwareTextEdit to android.widget" into rvc-dev am: 4c221d1609 am: 222da24344 
Change-Id: I2306bbe11fb2eeccfd9fc498d0faef3b4290077c
 2020-04-29 05:49:50 +00:00
TreeHugger Robot
a21603a224 Merge "Move ImeAwareTextEdit to android.widget" into rvc-dev am: 4c221d1609 am: 222da24344 
Change-Id: Ie3ba8186a2b0ded3fcfeaf0689c2569aa99c475b
 2020-04-29 05:49:42 +00:00
menghanli
de1258f9cf Fix InvisibleToggle type service does not turn on or turn off correctly when edit shortcut dialog. 
Root cause: service status is not updated after the shortcut status
changed.

Next: Add callback to update the service status

Bug: 155157599
Test: Manual test
Change-Id: I286a04d43066c787304c54eb7b0dfdac5728b6ac
 2020-04-29 13:44:54 +08:00
TreeHugger Robot
2ec23fb8ab [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8c28127323 -s ours 
am skip reason: subject contains skip directive

Change-Id: I2a33923cdeb291084ee314a7ad77431aae6492ce
 2020-04-29 05:40:15 +00:00
TreeHugger Robot
c763d18148 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8c28127323 -s ours 
am skip reason: subject contains skip directive

Change-Id: Id2be69ba0089b706e6251e260c2b2a0efa4c8d2b
 2020-04-29 05:40:07 +00:00
TreeHugger Robot
8c28127323 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-04-29 05:37:45 +00:00
TreeHugger Robot
9acc933b12 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: fdb8558d88 -s ours 
am skip reason: subject contains skip directive

Change-Id: I43ddf4d5c4a2db654146693b204237aa04139f90
 2020-04-29 05:33:38 +00:00
TreeHugger Robot
899dbf039f [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: fdb8558d88 -s ours 
am skip reason: subject contains skip directive

Change-Id: I6b1514ea2a852fc8e77e413d7415d6493d749778
 2020-04-29 05:33:27 +00:00
TreeHugger Robot
b47f88ee05 Merge "Move ImeAwareTextEdit to android.widget" into rvc-dev am: 4c221d1609 
Change-Id: I5db9bb66a86b1377f43bbf35b4410a44a79d4755
 2020-04-29 05:33:23 +00:00