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

62877 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julia Reynolds
c50085fed5 Merge "Remove unused development setting" into rvc-dev am: e2eb832033 am: c6fe4407fe 
Change-Id: I5a1dd1e140503957a3335b92f0687a928aa40b30
 2020-04-29 15:53:15 +00:00
Automerger Merge Worker
e994133351 Merge "Fix bubble tests am: 99b363fb18 am: 8c5d6b6d5f" into rvc-d1-dev-plus-aosp 2020-04-29 15:53:06 +00:00
Julia Reynolds
d695f0e907 Fix bubble tests am: 99b363fb18 am: 8c5d6b6d5f 
Change-Id: I6b29bb7f13044a899ef05094851bf9246bf3a283
 2020-04-29 15:53:02 +00:00
Julia Reynolds
68d3972a36 Merge "Remove unused development setting" into rvc-dev am: e2eb832033 am: 04b6152ef0 
Change-Id: I14a3372d2ca7304667e3923b94d1a377eb927aa9
 2020-04-29 15:52:56 +00:00
Julia Reynolds
90d41ad625 Fix bubble tests am: 99b363fb18 am: d4045296ba 
Change-Id: I5eef62051373d7efbeb2b1bc63629f60edef931d
 2020-04-29 15:52:44 +00:00
Julia Reynolds
04b6152ef0 Merge "Remove unused development setting" into rvc-dev am: e2eb832033 
Change-Id: Ic77ae688d2b211a1dc3ad5c0b8e2b5967698604e
 2020-04-29 15:42:46 +00:00
Julia Reynolds
c6fe4407fe Merge "Remove unused development setting" into rvc-dev am: e2eb832033 
Change-Id: I834d268678426e9173edacb0c5c9a52fe6941946
 2020-04-29 15:42:45 +00:00
Julia Reynolds
d4045296ba Fix bubble tests am: 99b363fb18 
Change-Id: If84a190e7c59cdaed74c0277a2703860b85785e1
 2020-04-29 15:42:00 +00:00
Julia Reynolds
8c5d6b6d5f Fix bubble tests am: 99b363fb18 
Change-Id: Ie06e993258c7c3069e28fb280ed24bed32675133
 2020-04-29 15:41:47 +00:00
Julia Reynolds
e2eb832033 Merge "Remove unused development setting" into rvc-dev 2020-04-29 15:25:24 +00:00
Julia Reynolds
99b363fb18 Fix bubble tests 
Test: atest
Fixes: 155239388
Change-Id: I8a32098b9a36ea1c8eabaf235b37d1e190419937
 2020-04-29 13:58:46 +00:00
TreeHugger Robot
90cd472a7e Merge "Fix the preference index conflict problem" into rvc-dev am: e76cdc27d0 am: d5cf3b0a5e 
Change-Id: I054b6c61d3724fc8041fd19fb7dd8b4650cd5d50
 2020-04-29 13:38:28 +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
TreeHugger Robot
d5cf3b0a5e Merge "Fix the preference index conflict problem" into rvc-dev am: e76cdc27d0 
Change-Id: Idfd8ff9e9da16191add8c764370e20b5b6ad174f
 2020-04-29 13:22:56 +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
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
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
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
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