PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
67,365 Commits 1 Branch 0 Tags
6faaa7caafb101df96f2b76c6b0421724e75d0e9
Commit Graph

67365 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
6faaa7caaf Merge "Fix the preference index conflict problem" into rvc-dev am: e76cdc27d0 am: 5c6094bcf4 am: 27c76c3075 am: bc83b982da 
Change-Id: I57f9070cadb4d8bed271825a66fa1076e836b0d0
 2020-04-29 14:18:07 +00:00
TreeHugger Robot
bc83b982da Merge "Fix the preference index conflict problem" into rvc-dev am: e76cdc27d0 am: 5c6094bcf4 am: 27c76c3075 
Change-Id: Ia9784d8938eaa83236edcf4a05ae9e7908d211f2
 2020-04-29 13:53:11 +00:00
TreeHugger Robot
27c76c3075 Merge "Fix the preference index conflict problem" into rvc-dev am: e76cdc27d0 am: 5c6094bcf4 
Change-Id: I84b0ddf08b3efa97c7b082c613c18b254471c61d
 2020-04-29 13:38:14 +00:00
Neil Fuller
afd9b57581 Merge "Fix missing zone strings in some cases" am: 738df11447 am: 6a19fdf877 am: 6bcbd8ed89 am: d76d0c680b am: 0038c27c53 
Change-Id: Ic290062ca1314147e3412c4ca393cb2ea14bd492
 2020-04-29 13:27:58 +00:00
TreeHugger Robot
5c6094bcf4 Merge "Fix the preference index conflict problem" into rvc-dev am: e76cdc27d0 
Change-Id: Ibc3eb51b98ea8dbb864731f92cc5a503d297d857
 2020-04-29 13:22:48 +00:00
Neil Fuller
0038c27c53 Merge "Fix missing zone strings in some cases" am: 738df11447 am: 6a19fdf877 am: 6bcbd8ed89 am: d76d0c680b 
Change-Id: Idfb5c5f22ecbb284adf3b476fda5d6453e3e1683
 2020-04-29 13:16:54 +00:00
TreeHugger Robot
e76cdc27d0 Merge "Fix the preference index conflict problem" into rvc-dev 2020-04-29 13:01:45 +00:00
Neil Fuller
d76d0c680b Merge "Fix missing zone strings in some cases" am: 738df11447 am: 6a19fdf877 am: 6bcbd8ed89 
Change-Id: I696eafa89264541b6c98d864f8d75c2cdeb4926d
 2020-04-29 12:57:22 +00:00
Neil Fuller
6bcbd8ed89 Merge "Fix missing zone strings in some cases" am: 738df11447 am: 6a19fdf877 
Change-Id: Id54f91141814eb0f1adda28f9ec72b48f434c997
 2020-04-29 12:45:01 +00:00
Neil Fuller
6a19fdf877 Merge "Fix missing zone strings in some cases" am: 738df11447 
Change-Id: I66ba5583cdd3632c6e6efb47fb1c0a0ea3b137cb
 2020-04-29 12:30:24 +00:00
Neil Fuller
738df11447 Merge "Fix missing zone strings in some cases" 2020-04-29 12:18:53 +00:00
Sunny Shao
502a5eb1c5 Fix the preference index conflict problem 
Bug: 153888035
Test: manual test
Change-Id: I6c67d2fea752487ceb5fa05c6537df980a0f8d6a
 2020-04-29 11:53:55 +00:00
hoffc
6b0dafdf90 [automerger skipped] Settings: Fix force close when destory sim lock fragment view am: d6c805f0bb am: 535ebae5fb am: 375b565eb4 am: 38495e875b -s ours am: d6c1d47dff -s ours 
am skip reason: Change-Id I0b10a07c1767cda74096dc44ef7ffa7839a9aae4 with SHA-1 d6c805f0bb is in history

Change-Id: Iaa69c7091b7a755df0a48c8f6d49fbc09acf54ac
 2020-04-29 11:04:14 +00:00
hoffc
45d33e3240 [automerger skipped] Settings: Fix force close when destory sim lock fragment view am: d6c805f0bb -s ours am: 01b5c4b51f -s ours am: dbb42d1e8f -s ours am: 9c5d56cae1 -s ours 
am skip reason: Change-Id I0b10a07c1767cda74096dc44ef7ffa7839a9aae4 with SHA-1 d6c805f0bb is in history

Change-Id: I95013a85486d3f2c37382b4a4033e309ce239557
 2020-04-29 11:04:08 +00:00
hoffc
d6c1d47dff [automerger skipped] Settings: Fix force close when destory sim lock fragment view am: d6c805f0bb am: 535ebae5fb am: 375b565eb4 am: 38495e875b -s ours 
am skip reason: Change-Id I0b10a07c1767cda74096dc44ef7ffa7839a9aae4 with SHA-1 d6c805f0bb is in history

Change-Id: I3eef661f34cfb90f846ec4602b0b74e91e97edb3
 2020-04-29 11:03:57 +00:00
hoffc
5c657ec406 [automerger skipped] Settings: Fix force close when destory sim lock fragment view am: d6c805f0bb am: 535ebae5fb -s ours am: 3bb45a9d9e -s ours am: 8190103964 -s ours 
am skip reason: Change-Id I0b10a07c1767cda74096dc44ef7ffa7839a9aae4 with SHA-1 4b575ec0d1 is in history

Change-Id: Id4db4afe7133f140167b6df092c0cee690b8823b
 2020-04-29 11:03:54 +00:00
hoffc
9c5d56cae1 [automerger skipped] Settings: Fix force close when destory sim lock fragment view am: d6c805f0bb -s ours am: 01b5c4b51f -s ours am: dbb42d1e8f -s ours 
am skip reason: Change-Id I0b10a07c1767cda74096dc44ef7ffa7839a9aae4 with SHA-1 d6c805f0bb is in history

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

Change-Id: Iac212ff8f42a5c8025a9fb296e8e04fd9cc61945
 2020-04-29 10:49:11 +00:00
hoffc
38495e875b Settings: Fix force close when destory sim lock fragment view am: d6c805f0bb am: 535ebae5fb am: 375b565eb4 
Change-Id: Ic0098f3f4f6301e2e783296722ac473f04bbb9dd
 2020-04-29 10:49:08 +00:00
hoffc
375b565eb4 Settings: Fix force close when destory sim lock fragment view am: d6c805f0bb am: 535ebae5fb 
Change-Id: I0e287cb3d0f1689679c96131e6cf90ee11e80a9c
 2020-04-29 10:33:14 +00:00
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
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
Neil Fuller
eafec7a244 Fix missing zone strings in some cases 
ICU's TimeZoneNames requires a "canonical" zone ID, otherwise it will
return no data. Usually the ID being used is the same as the canonical
ID so there's no problem. TZDB version 2020a switched the ID of one of
Greenland's zones from America/Godthab to America/Nuuk, and ICU/CLDR
hold their translation data against America/Godthab in the current
version of ICU on Android.

Bug: 155167041
Test: Manual - viewed settings on a device with the tzdb 2020a update
Change-Id: Ia89c777a832f8b41c8d56d3327a9b7370ba44b52
 2020-04-29 10:16:19 +01: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
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