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
Julia Reynolds
c106e6bc03 Merge "Remove unused development setting" into rvc-dev am: e2eb832033 am: 04b6152ef0 am: 68d3972a36 
Change-Id: Id0e3fb0481c695fc2814df9ef66cb23c2cf8980e
 2020-04-29 16:06:03 +00:00
Julia Reynolds
e546135a18 Fix bubble tests am: 99b363fb18 am: d4045296ba am: 90d41ad625 
Change-Id: Id579763544b0fb0f4e5dff56806596d70faeedf4
 2020-04-29 16:04:32 +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
d4045296ba Fix bubble tests am: 99b363fb18 
Change-Id: If84a190e7c59cdaed74c0277a2703860b85785e1
 2020-04-29 15:42:00 +00:00
Julia Reynolds
e2eb832033 Merge "Remove unused development setting" into rvc-dev 2020-04-29 15:25:24 +00:00
TreeHugger Robot
0ad7e5dbcf Merge "Fix the preference index conflict problem" into rvc-dev am: e76cdc27d0 am: 5c6094bcf4 am: ea0934d5e5 am: db329e92d0 
Change-Id: I00931d862378f8460c4a8d2b11a2d1a87c5c019a
 2020-04-29 14:18:14 +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
9d5fa99a60 Merge "Fix the preference index conflict problem" into rvc-dev am: e76cdc27d0 am: d5cf3b0a5e am: 90cd472a7e 
Change-Id: I854a85521e5c598a83adfdd45b938a51442147c9
 2020-04-29 13:53:18 +00:00
TreeHugger Robot
db329e92d0 Merge "Fix the preference index conflict problem" into rvc-dev am: e76cdc27d0 am: 5c6094bcf4 am: ea0934d5e5 
Change-Id: I251c0cc0b18265658d10749c32596646743b17fa
 2020-04-29 13:53:13 +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
ea0934d5e5 Merge "Fix the preference index conflict problem" into rvc-dev am: e76cdc27d0 am: 5c6094bcf4 
Change-Id: Id7b2d221b2409d8a4fce6ecdde55369aec488be3
 2020-04-29 13:38:32 +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
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
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
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
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
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
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
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