PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
120,751 Commits 1 Branch 0 Tags
18b54c93bc18bd31e2a3834ffff89b8b760bfa2c
Commit Graph

120751 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
881db50b16 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26e205dfb9 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517272

Change-Id: Ic1d40a8aad4b268384097ce8ca3e310aeb31bb00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 21:13:13 +00:00
TreeHugger Robot
0e28d1212e Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-02-22 20:59:45 +00:00
TreeHugger Robot
decc8d0759 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-02-22 20:59:45 +00:00
TreeHugger Robot
17b826c715 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 5699a3d93d -s ours am: cb5e97de8a -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517268

Change-Id: I9038fc225657da1c2f08dd13ffb540919e0fd9a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 20:56:57 +00:00
Brian Lee
6ee1e33ec4 Merge "Update RemoteLockscreenValidation detail strings and char limits." into udc-dev am: 79effa02d3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21526915

Change-Id: I3a9dfc470d76dbe69df8d930dcf457b8ac1e3221
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 20:55:36 +00:00
TreeHugger Robot
d1a5cdb191 Merge changes from topic "tc_change_23022120_22" into udc-dev am: 97675e3475 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517268

Change-Id: I012645ac5c552ea0ee063d904bc7169ac2304157
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 20:53:13 +00:00
Bill Yi
0a767ee9ee [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 08d0cbb652 am: 5bdc27be54 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517268

Change-Id: Icddf5d14f16b066e4fe416748135c9862e83f416
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 20:53:08 +00:00
TreeHugger Robot
cb5e97de8a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 5699a3d93d -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517268

Change-Id: I18425b81f49cd14ace2e42f9122b46338e78a76b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 20:50:10 +00:00
Julia Reynolds
e39c0bbe8b Clarify string for translation 
Test: view string in UI
Fixes: 243971120
Change-Id: I7f21df52b831e87447a7001acd16b3e1e5325372
 2023-02-22 15:47:14 -05:00
Brian Lee
79effa02d3 Merge "Update RemoteLockscreenValidation detail strings and char limits." into udc-dev 2023-02-22 20:34:17 +00:00
TreeHugger Robot
5699a3d93d Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2023-02-22 20:15:56 +00:00
TreeHugger Robot
97675e3475 Merge changes from topic "tc_change_23022120_22" into udc-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 08d0cbb652
  Import translations. DO NOT MERGE ANYWHERE
 2023-02-22 20:15:45 +00:00
Henri Chataing
982a113065 [automerger skipped] Merge changes from topic "nfc_logging_control" am: 4de9ff1a8f am: 4886f28aba am: 6a7031515e -s ours am: fd0203ee28 -s ours 
am skip reason: Merged-In Id12e3c10dc04816d4a69692b2d922840a8e84c61 with SHA-1 bcf2efe31e is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332205

Change-Id: I66a89730ce744eb2da071a52c5026d8e6844979b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 19:55:26 +00:00
Jack Yu
55cb4a639b [automerger skipped] Show reboot dialog when users disable developer options am: d91e7a0565 am: e1dfe3d417 am: 252dd209b3 -s ours am: 8b0fa20c98 -s ours 
am skip reason: Merged-In I531c85fd77934ad7821c480df07465a8cd8f24f9 with SHA-1 d270f29cc8 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332204

Change-Id: I29b19d96431b33cf9f2ed4055097a5582e319918
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 19:55:16 +00:00
Jack Yu
c593b5a7b9 [automerger skipped] Add a new NFC developer setting option for NFC vendor verbose log am: 8f1794043c am: 0797feaf7b am: 86a6c6a9a7 -s ours am: 3c0d7c9bfb -s ours 
am skip reason: Merged-In Ic837bbcc32979c44732e99d51e4dcf93eb201cf1 with SHA-1 3d2aff896e is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332203

Change-Id: Ib29fafa20655fcaa78a5eb79d94bf84f0a72a3e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 19:55:10 +00:00
Jack Yu
1c96b93f69 [automerger skipped] Add a new NFC developer setting option for NFCSNOOP am: a2f8944942 am: 81f481fac4 am: 08c64a4414 -s ours am: bac3cfcbfe -s ours 
am skip reason: Merged-In I3fd34500e5e7093c9d77ff737987a35f6866814e with SHA-1 b71de640b5 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332202

Change-Id: Id3ccba52081879abf79f5110e57f1198930982b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 19:55:03 +00:00
Henri Chataing
fd0203ee28 [automerger skipped] Merge changes from topic "nfc_logging_control" am: 4de9ff1a8f am: 4886f28aba am: 6a7031515e -s ours 
am skip reason: Merged-In Id12e3c10dc04816d4a69692b2d922840a8e84c61 with SHA-1 bcf2efe31e is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332205

Change-Id: I948a11f2df4444b9d64fed97fb661ea35f33e3ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 19:36:01 +00:00
Jack Yu
8b0fa20c98 [automerger skipped] Show reboot dialog when users disable developer options am: d91e7a0565 am: e1dfe3d417 am: 252dd209b3 -s ours 
am skip reason: Merged-In I531c85fd77934ad7821c480df07465a8cd8f24f9 with SHA-1 d270f29cc8 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332204

Change-Id: Ie49b1ae7183f6a432fae4f2eee8bd70cf338113b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 19:35:58 +00:00
Jack Yu
3c0d7c9bfb [automerger skipped] Add a new NFC developer setting option for NFC vendor verbose log am: 8f1794043c am: 0797feaf7b am: 86a6c6a9a7 -s ours 
am skip reason: Merged-In Ic837bbcc32979c44732e99d51e4dcf93eb201cf1 with SHA-1 3d2aff896e is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332203

Change-Id: Ie6c1e6ab59c24778de5c503281b991658c7acd9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 19:35:53 +00:00
Jack Yu
bac3cfcbfe [automerger skipped] Add a new NFC developer setting option for NFCSNOOP am: a2f8944942 am: 81f481fac4 am: 08c64a4414 -s ours 
am skip reason: Merged-In I3fd34500e5e7093c9d77ff737987a35f6866814e with SHA-1 b71de640b5 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332202

Change-Id: Ide65bf95812fe09989230b73301c8007d652518f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 19:35:45 +00:00
Henri Chataing
6a7031515e Merge changes from topic "nfc_logging_control" am: 4de9ff1a8f am: 4886f28aba 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332205

Change-Id: I938ce76f23b82ffc4f4b0f95364120dadc7cdb00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 19:16:49 +00:00
Jack Yu
252dd209b3 Show reboot dialog when users disable developer options am: d91e7a0565 am: e1dfe3d417 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332204

Change-Id: I7225161683a0b68b6eebf188ec99f39e57a33851
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 19:16:48 +00:00
Jack Yu
86a6c6a9a7 Add a new NFC developer setting option for NFC vendor verbose log am: 8f1794043c am: 0797feaf7b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332203

Change-Id: Id9fd40284b018c8cc3424d6a77c6f6f7bf43da2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 19:16:45 +00:00
Jack Yu
08c64a4414 Add a new NFC developer setting option for NFCSNOOP am: a2f8944942 am: 81f481fac4 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332202

Change-Id: I28561bde03b8dd3cbf2394ea5c851b15b584da49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 19:15:02 +00:00
Automerger Merge Worker
8c471ddd90 Merge "Merge "Change API name" am: a0642974a4 am: f9d1535640 am: a14b3c6be2" into udc-dev am: 3e158cd48b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2445642

Change-Id: I0eed069422791a7aca6068465aaa4687fb5e42be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 19:06:23 +00:00
TreeHugger Robot
c5ba48020c Merge changes from topic "tc_change_23022120_23" into udc-dev am: 1e410e7a11 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517269

Change-Id: I291280fc67ff1e99067f2c82a6f9a04c581d718b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 18:50:48 +00:00
Bill Yi
8b7eca3143 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e21149b10a am: 2f3719e7f8 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517269

Change-Id: I5bad0d3956c45ac7df985ee9852120aae45c5202
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 18:50:38 +00:00
Automerger Merge Worker
3e158cd48b Merge "Merge "Change API name" am: a0642974a4 am: f9d1535640 am: a14b3c6be2" into udc-dev 2023-02-22 18:50:05 +00:00
Diya Bera
40d6c0335a Merge "Remove duplicate code" into tm-qpr-dev am: 041d00afac am: 65721576d8 am: 1da59b0eab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21487844

Change-Id: I24c91a0adcac38bb5ddc72256de363112636d7d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 18:49:54 +00:00
TreeHugger Robot
1e410e7a11 Merge changes from topic "tc_change_23022120_23" into udc-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e21149b10a
  Import translations. DO NOT MERGE ANYWHERE
 2023-02-22 18:49:12 +00:00
Treehugger Robot
4767472df7 Merge "Change API name" am: a0642974a4 am: f9d1535640 am: a14b3c6be2 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2445642

Change-Id: I368b125ea1f96f6a70ce4eb0cbcf91150d865ef5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 18:48:37 +00:00
Nikhil Kumar
2496cb2484 Merge "Removed isWorkProfile_withSystemUser_returnFalse test" into udc-dev am: 8e67abccae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21539124

Change-Id: I2ef7c3c5f42018fdeab0fdf7d7cc3a6141ecff91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 18:45:40 +00:00
Diya Bera
1da59b0eab Merge "Remove duplicate code" into tm-qpr-dev am: 041d00afac am: 65721576d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21487844

Change-Id: I8efe213dc674f2790130d2935ce9062546b5210f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 18:42:46 +00:00
Treehugger Robot
a14b3c6be2 Merge "Change API name" am: a0642974a4 am: f9d1535640 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2445642

Change-Id: Id8b6e017f93933b3b64b66be9639b203b0fa9e93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 18:37:55 +00:00
Henri Chataing
4886f28aba Merge changes from topic "nfc_logging_control" am: 4de9ff1a8f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332205

Change-Id: I082c6fda1b1420dd49a2507ea87e8262b341be8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 18:31:00 +00:00
Jack Yu
e1dfe3d417 Show reboot dialog when users disable developer options am: d91e7a0565 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332204

Change-Id: If1a8b237f58bcbb1c07a27b054be09a7530922f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 18:30:54 +00:00
Jack Yu
0797feaf7b Add a new NFC developer setting option for NFC vendor verbose log am: 8f1794043c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332203

Change-Id: Ic9c47d49121184737369e041048a678dda53bf52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 18:30:50 +00:00
Jack Yu
81f481fac4 Add a new NFC developer setting option for NFCSNOOP am: a2f8944942 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332202

Change-Id: Ic96878e632ec919f2486263a5cb479486b9d4c54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 18:30:37 +00:00
Treehugger Robot
f9d1535640 Merge "Change API name" am: a0642974a4 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2445642

Change-Id: I3a96da519c41151b57e7580b0816101590322b1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 18:21:01 +00:00
Diya Bera
65721576d8 Merge "Remove duplicate code" into tm-qpr-dev am: 041d00afac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21487844

Change-Id: If6a80674fa3d00f6d5a82110df1f2bab50693ba4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 18:15:52 +00:00
Nikhil Kumar
8e67abccae Merge "Removed isWorkProfile_withSystemUser_returnFalse test" into udc-dev 2023-02-22 18:03:04 +00:00
Brian Lee
ad2660c0fc Update RemoteLockscreenValidation detail strings and char limits. 
Test: Manual
Bug: 270203601
Change-Id: I3d8f707955de49f790e30314b1ff919eb474d138
 2023-02-22 09:40:24 -08:00
Henri Chataing
4de9ff1a8f Merge changes from topic "nfc_logging_control" 
* changes:
  Add test cases for NfcSnoopLog and NfcVerboseVendorLog
  Show reboot dialog when users disable developer options
  Add a new NFC developer setting option for NFC vendor verbose log
  Add a new NFC developer setting option for NFCSNOOP
 2023-02-22 17:12:46 +00:00
Treehugger Robot
a0642974a4 Merge "Change API name" 2023-02-22 16:59:10 +00:00
Diya Bera
041d00afac Merge "Remove duplicate code" into tm-qpr-dev 2023-02-22 16:44:06 +00:00
YK Hung
5d1b3fcb39 Merge "Fix b/270290013: Updates battery usage system component icons" into udc-dev am: 629782cc88 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21537109

Change-Id: I4b92cc61ed839855ccb7eacaf1e6fdbd737f6cb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 15:43:43 +00:00
YK Hung
de7129a244 Merge "Fix b/265364509 Update battery usage page footer string" into udc-dev am: c74a6b4fb0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21535009

Change-Id: Icd3ee6fc335c5ac6a160197bd408478c55b0ec95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 15:40:48 +00:00
YK Hung
2b35c6500a Merge "Fix b/270296263: Updates screen system component name to "Display"" into udc-dev am: 405bea531a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21537106

Change-Id: I61d469903e527c52df3ed87b76d54e683c78b36c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 15:37:33 +00:00
YK Hung
629782cc88 Merge "Fix b/270290013: Updates battery usage system component icons" into udc-dev 2023-02-22 15:06:44 +00:00
YK Hung
c74a6b4fb0 Merge "Fix b/265364509 Update battery usage page footer string" into udc-dev 2023-02-22 14:56:15 +00:00