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

65834 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
9e400e14c3 Merge "Fix icon color in dark theme." into rvc-dev am: 7e94c5e3b3 am: f57fcea662 
Change-Id: If3c8e5947552fc3ec1455ef8215acf58a9ee31aa
 2020-04-29 18:55:09 +00:00
TreeHugger Robot
7bb2488099 Merge "Fix icon color in dark theme." into rvc-dev am: 7e94c5e3b3 am: f57fcea662 
Change-Id: Ic026c305eabbd86dc780292d666d0aa47e0c8ca9
 2020-04-29 18:55:06 +00:00
TreeHugger Robot
e22a776b12 Merge "Fix icon color in dark theme." into rvc-dev am: 7e94c5e3b3 am: 4d6ad1dec9 
Change-Id: I72bfce2fd18f59c010ccb89203a7a7b3feb73ca6
 2020-04-29 18:54:56 +00:00
TreeHugger Robot
4d6ad1dec9 Merge "Fix icon color in dark theme." into rvc-dev am: 7e94c5e3b3 
Change-Id: Ia1d018e763df06a1bd9c750f805573a3070e7296
 2020-04-29 18:40:34 +00:00
TreeHugger Robot
f57fcea662 Merge "Fix icon color in dark theme." into rvc-dev am: 7e94c5e3b3 
Change-Id: Id187f39dc00fc84479f43545b71f70a64fab03d2
 2020-04-29 18:40:08 +00:00
TreeHugger Robot
7e94c5e3b3 Merge "Fix icon color in dark theme." into rvc-dev 2020-04-29 18:02:45 +00:00
kholoud mohamed
7c84508e16 Fix icon color in dark theme. 
Bug: 154582949
Test: visual testing
Change-Id: Ibb17f06c5b1d9745294af460565aa078c4e2baf2
 2020-04-29 17:43:34 +01:00
Julia Reynolds
8f438d94c0 Merge "Remove unused development setting" into rvc-dev am: e2eb832033 am: 04b6152ef0 am: 34190304f6 am: c40e8da0e8 
Change-Id: I8ade2d99ae85db6c5f6e4a2136b0115451f68c07
 2020-04-29 16:23:06 +00:00
Julia Reynolds
f225e2e9b3 Fix bubble tests am: 99b363fb18 am: d4045296ba am: 90d574727d am: de38eab8ff 
Change-Id: I4f462887554f8f7da28439bdc46a3bb55fac9840
 2020-04-29 16:22:52 +00:00
Julia Reynolds
573cd1d0aa Merge "Remove unused development setting" into rvc-dev am: e2eb832033 am: c6fe4407fe am: c50085fed5 
Change-Id: Ia6037a761f3583bad69468c9ab6d1007c698e97c
 2020-04-29 16:06:29 +00:00
Automerger Merge Worker
44c2169ca8 Merge "Fix bubble tests am: 99b363fb18 am: 8c5d6b6d5f" into rvc-d1-dev-plus-aosp am: e994133351 
Change-Id: I11efdc0234e75d99e125a9f6bd82c973f455be5c
 2020-04-29 16:06:21 +00:00
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
c40e8da0e8 Merge "Remove unused development setting" into rvc-dev am: e2eb832033 am: 04b6152ef0 am: 34190304f6 
Change-Id: Idd375fa19764da78b9578fde838dec0d5e28def2
 2020-04-29 16:05:01 +00:00
Julia Reynolds
de38eab8ff Fix bubble tests am: 99b363fb18 am: d4045296ba am: 90d574727d 
Change-Id: If6b8048c2bd31b5554d2a9edb534da0ed67e4f2d
 2020-04-29 16:04:33 +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
34190304f6 Merge "Remove unused development setting" into rvc-dev am: e2eb832033 am: 04b6152ef0 
Change-Id: Ic622a6c1a55497b36d801421d1e03d5283e989ce
 2020-04-29 15:53:23 +00:00
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
Julia Reynolds
90d574727d Fix bubble tests am: 99b363fb18 am: d4045296ba 
Change-Id: Iee0a86cae2ac5dfa8f7e775280d0a5408224c7ee
 2020-04-29 15:53:09 +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
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
Alex Johnston
439947aec7 Update work challenge header in Settings 
* If organization name has been set for
  a managed profile, work challenge
  should display it as the header.

Bug: 155274026
Test: manual testing

Manual Testing Steps
* Set up device with managed profile
* Set organization name via TestDPC
* Go Settings > Security > Work profile security
  and add a work profile lock
* Select 'Work profile lock' and verify
  organization name is shown in header

Change-Id: I83209383fd2cf9179c34ccfdf8c097c379ec933e
 2020-04-29 15:14:20 +01: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
Neil Fuller
a21962b3c9 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
Merged-In: Ia89c777a832f8b41c8d56d3327a9b7370ba44b52
Change-Id: Ia89c777a832f8b41c8d56d3327a9b7370ba44b52
(cherry picked from commit eafec7a244)
 2020-04-29 14:08:38 +01: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
jasonwshsu
e76f541f7c Logs accessibility service user trigger status. 
* Uses the atom AccessibilityServiceReported in westworld.

Bug: 151285965
Test: make statsd_testdrive && ./out/host/linux-x86/bin/statsd_testdrive 267
Change-Id: Id6a109e4e90c09f2310d92533cd4632875712f81
 2020-04-29 20:16:14 +08: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