PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
62,854 Commits 1 Branch 0 Tags
dbb42d1e8fea34978ab3d9d2d11875c2eebe1eb8
Commit Graph

62854 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
hoffc
dbb42d1e8f [automerger skipped] Settings: Fix force close when destory sim lock fragment view am: d6c805f0bb -s ours am: 01b5c4b51f -s ours 
am skip reason: Change-Id I0b10a07c1767cda74096dc44ef7ffa7839a9aae4 with SHA-1 d6c805f0bb is in history

Change-Id: Ice6979bfa5ec74ae5802fe156fe3b1a475db5bd1
 2020-04-29 10:33:13 +00:00
hoffc
3bb45a9d9e [automerger skipped] Settings: Fix force close when destory sim lock fragment view am: d6c805f0bb am: 535ebae5fb -s ours 
am skip reason: Change-Id I0b10a07c1767cda74096dc44ef7ffa7839a9aae4 with SHA-1 4b575ec0d1 is in history

Change-Id: I92bdadf3a9c5a93376c1392cf01c28a17fe35f3b
 2020-04-29 10:32:49 +00:00
hoffc
01b5c4b51f [automerger skipped] Settings: Fix force close when destory sim lock fragment view am: d6c805f0bb -s ours 
am skip reason: Change-Id I0b10a07c1767cda74096dc44ef7ffa7839a9aae4 with SHA-1 4b575ec0d1 is in history

Change-Id: I2f1e4bbf75585aad6d6cfe04b3a40e988d02b437
 2020-04-29 10:12:45 +00:00
hoffc
535ebae5fb Settings: Fix force close when destory sim lock fragment view am: d6c805f0bb 
Change-Id: I1c1c3b249f938ee487dc9346bcad4c9223e2e4e7
 2020-04-29 10:12:39 +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
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
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
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
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
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
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
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
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
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
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
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
TreeHugger Robot
222da24344 Merge "Move ImeAwareTextEdit to android.widget" into rvc-dev am: 4c221d1609 
Change-Id: I8ba500b881798bfe9ee55d5a1d82e3f8926cd4a0
 2020-04-29 05:33:14 +00:00
TreeHugger Robot
fdb8558d88 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-04-29 05:24:29 +00:00
TreeHugger Robot
4c221d1609 Merge "Move ImeAwareTextEdit to android.widget" into rvc-dev 2020-04-29 05:17:30 +00:00
zoey chen
84587b1aa3 Improve the performance of displaying preference. 
- Set a variable to record the status then replace getAvailabilityStatus() with it.

Test: manual test, use command to run MobileNetworkSettings and record it.
Bug: 154061428
Change-Id: Ia13a75a3821bb6c17d0dfeffb5043f47b60adf61
 2020-04-29 11:21:36 +08:00
Paul Chang
661384b69c Merge "Fix - Bug report handler settings is not shown when it is launched by a work profile app." into rvc-dev am: e52353609e am: efe10c0b7b 
Change-Id: I8b9c5380279f1ba74228b43567ed6f16c64e8d38
 2020-04-29 03:11:16 +00:00
Paul Chang
f66382774e Merge "Fix - Bug report handler settings is not shown when it is launched by a work profile app." into rvc-dev am: e52353609e am: c6f8af3626 
Change-Id: Idcb3a25e47693e7f85e5508e43483e1560a64569
 2020-04-29 03:11:04 +00:00
Paul Chang
efe10c0b7b Merge "Fix - Bug report handler settings is not shown when it is launched by a work profile app." into rvc-dev am: e52353609e 
Change-Id: I507f80a8acfac98fac9594d45a1fb86588aab65c
 2020-04-29 02:55:09 +00:00
Paul Chang
c6f8af3626 Merge "Fix - Bug report handler settings is not shown when it is launched by a work profile app." into rvc-dev am: e52353609e 
Change-Id: I9e901b0b99fbcf40a34a1d0a0a6d9af11f1c22c8
 2020-04-29 02:55:05 +00:00
Paul Chang
e52353609e Merge "Fix - Bug report handler settings is not shown when it is launched by a work profile app." into rvc-dev 2020-04-29 02:38:45 +00:00
TreeHugger Robot
caaa9b5ad3 Merge "Fix NPE if CarrierConfigManager is not available" into rvc-dev am: 7a2f3dd8a7 am: 0886b927ec 
Change-Id: Iac4189dbb22559862724db12346d0f62db5c49e1
 2020-04-29 02:19:46 +00:00
TreeHugger Robot
88271f0273 Merge "Fix NPE if CarrierConfigManager is not available" into rvc-dev am: 7a2f3dd8a7 am: f2df3a44d6 
Change-Id: I26e6ad236a906c1b55ae7c5e7f374d020dc8f057
 2020-04-29 02:13:58 +00:00
TreeHugger Robot
0886b927ec Merge "Fix NPE if CarrierConfigManager is not available" into rvc-dev am: 7a2f3dd8a7 
Change-Id: I3749154738a770247a35284d26061a5f530294bf
 2020-04-29 02:01:35 +00:00