PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
94,774 Commits 1 Branch 0 Tags
4b7494f5c9a9456d336824cb15e33154253e05c8
Commit Graph

94774 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
0fa8c951e0 Merge "[Settings] Fix RTL issue of Calls and SMS" into sc-qpr1-dev 2021-08-23 17:24:38 +00:00
TreeHugger Robot
bef581b97e [automerger skipped] Merge "Fix Settings crash issue" into sc-qpr1-dev am: fae29c6b33 am: f88ab5986b -s ours am: 083d5cc2ff -s ours 
am skip reason: Merged-In I506ee81985158b8992529440a31d2d5cfe81f441 with SHA-1 fb29dc8a51 is already in history

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

Change-Id: I2c209cfb445e9d834d4d1226d649cd9e1a792991
 2021-08-23 16:55:37 +00:00
TreeHugger Robot
d4b218474c [automerger skipped] Merge "[Provider Model] Correct the Settings shortcut of the Settings Widget" into sc-qpr1-dev am: eef01580fd am: a327c5bad7 -s ours am: 9fbd0387b7 -s ours 
am skip reason: Merged-In I488327a01f5e539ecbe315b7016f65084dfd59a1 with SHA-1 c7c7a813fb is already in history

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

Change-Id: I3dda373c3511e7d63c4bc389b8d3700445804921
 2021-08-23 16:55:31 +00:00
TreeHugger Robot
8fa4440112 [automerger skipped] Merge "Fix Settings crash issue" into sc-qpr1-dev am: fae29c6b33 am: a0c8d6d6aa am: c15f3731c9 -s ours 
am skip reason: Merged-In I506ee81985158b8992529440a31d2d5cfe81f441 with SHA-1 1caaf7447d is already in history

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

Change-Id: I9805748bfd1eb4da6232a42090a01bccefde46c7
 2021-08-23 16:55:26 +00:00
TreeHugger Robot
3509bdcea8 [automerger skipped] Merge "[Provider Model] Correct the Settings shortcut of the Settings Widget" into sc-qpr1-dev am: eef01580fd am: 0050cbc711 am: 789d19af4c -s ours 
am skip reason: Merged-In I488327a01f5e539ecbe315b7016f65084dfd59a1 with SHA-1 658a417205 is already in history

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

Change-Id: Iba95473acdb19fa2f76f0af5ce34753f78e18f3b
 2021-08-23 16:55:17 +00:00
TreeHugger Robot
083d5cc2ff [automerger skipped] Merge "Fix Settings crash issue" into sc-qpr1-dev am: fae29c6b33 am: f88ab5986b -s ours 
am skip reason: Merged-In I506ee81985158b8992529440a31d2d5cfe81f441 with SHA-1 fb29dc8a51 is already in history

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

Change-Id: Ic438d4c1b11114640dc76df6e25f66143f71340c
 2021-08-23 16:43:14 +00:00
TreeHugger Robot
9fbd0387b7 [automerger skipped] Merge "[Provider Model] Correct the Settings shortcut of the Settings Widget" into sc-qpr1-dev am: eef01580fd am: a327c5bad7 -s ours 
am skip reason: Merged-In I488327a01f5e539ecbe315b7016f65084dfd59a1 with SHA-1 c7c7a813fb is already in history

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

Change-Id: Ie10ebbcc2b2626847b0c295c579044421ec089d3
 2021-08-23 16:43:10 +00:00
TreeHugger Robot
c15f3731c9 Merge "Fix Settings crash issue" into sc-qpr1-dev am: fae29c6b33 am: a0c8d6d6aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15605528

Change-Id: I159426b4f45334e39843a900a7d812db7ea988e1
 2021-08-23 16:42:55 +00:00
TreeHugger Robot
789d19af4c Merge "[Provider Model] Correct the Settings shortcut of the Settings Widget" into sc-qpr1-dev am: eef01580fd am: 0050cbc711 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15605527

Change-Id: I45ccbbd89109ec984d21ec552105d8975d03538e
 2021-08-23 16:42:45 +00:00
TreeHugger Robot
f88ab5986b Merge "Fix Settings crash issue" into sc-qpr1-dev am: fae29c6b33 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15605528

Change-Id: If6e011d144dfaa3c9c337538aaea04d5482de2dd
 2021-08-23 16:28:51 +00:00
TreeHugger Robot
a0c8d6d6aa Merge "Fix Settings crash issue" into sc-qpr1-dev am: fae29c6b33 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15605528

Change-Id: Id846fe391823dbfbb8dae0ea40c369d6bb8c92c8
 2021-08-23 16:28:07 +00:00
TreeHugger Robot
a327c5bad7 Merge "[Provider Model] Correct the Settings shortcut of the Settings Widget" into sc-qpr1-dev am: eef01580fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15605527

Change-Id: If32d2dcc40d134c20560aa43da7c276afc9520a9
 2021-08-23 16:28:07 +00:00
TreeHugger Robot
0050cbc711 Merge "[Provider Model] Correct the Settings shortcut of the Settings Widget" into sc-qpr1-dev am: eef01580fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15605527

Change-Id: I669f6f8e4c6501d6bd59e96369e5b9dd8ab6f6e0
 2021-08-23 16:27:52 +00:00
Jack Yu
d2ca4038ce Support multi-users for NFC payments 
Configure nfc payment settings based on different users.

Bug: 191851086
Bug: 191845397
Bug: 192994529
Test: nfc payment with 2nd user
      make RunSettingsRoboTests
      ROBOTEST_FILTER=DefaultPaymentSettingsPreferenceControllerTest
Change-Id: I52440e77b6b5837b978b381e1c1694d2b29f048e
 2021-08-23 16:18:08 +00:00
TreeHugger Robot
fae29c6b33 Merge "Fix Settings crash issue" into sc-qpr1-dev 2021-08-23 16:12:13 +00:00
TreeHugger Robot
eef01580fd Merge "[Provider Model] Correct the Settings shortcut of the Settings Widget" into sc-qpr1-dev 2021-08-23 16:11:50 +00:00
TreeHugger Robot
b20b462cca Merge "[B&R] backup the battery optimization mode for installed apps" into sc-v2-dev am: c63c0d4370 am: 0249ae9582 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15635264

Change-Id: I81cc433712fcb62a72a85dc227be14e65d979e5b
 2021-08-23 05:55:43 +00:00
TreeHugger Robot
0249ae9582 Merge "[B&R] backup the battery optimization mode for installed apps" into sc-v2-dev am: c63c0d4370 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15635264

Change-Id: I37bb45745519e35fff18f8d2e7668a5e5d4aa182
 2021-08-23 05:45:32 +00:00
TreeHugger Robot
c63c0d4370 Merge "[B&R] backup the battery optimization mode for installed apps" into sc-v2-dev 2021-08-23 05:33:00 +00:00
Automerger Merge Worker
b88cae2c79 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 46902bd366 -s ours am: 1a5b010e20 -s ours" into sc-qpr1-dev-plus-aosp am: 21893b0972 -s ours am: 54e1722352 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifd4eaf8132981f244632b1f9cda46628c05a86a2
 2021-08-23 05:11:48 +00:00
Bill Yi
5305fe850f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 46902bd366 -s ours am: e8eeb4a1ec -s ours am: 07249babd3 -s ours am: 34cb659f7f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1f19f0587f87ae9888890d08b09d0a4daeeb652c
 2021-08-23 05:11:27 +00:00
Automerger Merge Worker
f1e6d895b1 Merge changes from topic "am-45b9491f655447d7bcbaec243df04490" into sc-qpr1-dev-plus-aosp am: d084b97e00 am: f894aafdaf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649792

Change-Id: I72b590c9b08839994fc578f7757101826f64bf02
 2021-08-23 05:10:57 +00:00
Bill Yi
53bf3444a6 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 93eb76377b am: 0f5c1fd924 -s ours am: 89adb1b207 -s ours am: 6fe86554e2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id17484c60b1b3b8bec419895fddc6cf759bd901a
 2021-08-23 05:10:55 +00:00
Bill Yi
4ffa071ce7 Merge changes from topic "presubmit-am-ebe8a352b317462aa31e9ffb6caeb6a5" into sc-dev-plus-aosp am: a536531bd9 am: 3d504a87f6 am: a25aeb69f4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649792

Change-Id: I86ba919ad9b0ea0a1074d2e643f308e76fb28714
 2021-08-23 05:10:28 +00:00
Bill Yi
73cd73ac02 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 93eb76377b am: 0af7a53e0a -s ours am: 22b2889345 -s ours am: 64fe24ebc2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If1ad0dd39bf2fad1741f34bc2f82772eb9dc5564
 2021-08-23 05:10:27 +00:00
Bill Yi
fc24da58f5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 46902bd366 -s ours am: 1a5b010e20 -s ours am: b5074981a1 -s ours am: 31506a0c66 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I539fea88a033fcefae41b748f7b21f3420939318
 2021-08-23 05:09:59 +00:00
Bill Yi
49534b68c7 Merge changes from topic "presubmit-am-ebe8a352b317462aa31e9ffb6caeb6a5" into sc-qpr1-dev am: 38f55441d3 am: 0be19629e3 am: 360df88c4b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649792

Change-Id: I13af6c11fa46ddbebabcb8fda7c12823fda0c2ed
 2021-08-23 05:09:35 +00:00
Bill Yi
7643a30cee [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 93eb76377b am: 0f5c1fd924 -s ours am: b06fcc8fb4 -s ours am: db7d449225 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3ae088e733f36b6959c76a0048ab139e8c95b5fd
 2021-08-23 05:09:31 +00:00
Automerger Merge Worker
54e1722352 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 46902bd366 -s ours am: 1a5b010e20 -s ours" into sc-qpr1-dev-plus-aosp am: 21893b0972 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idc0f038e3fc2cdaed9115191f8320995be7700cf
 2021-08-23 04:59:38 +00:00
Bill Yi
34cb659f7f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 46902bd366 -s ours am: e8eeb4a1ec -s ours am: 07249babd3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I85d7a92415862194e9aa5920241326ed95fb9641
 2021-08-23 04:59:21 +00:00
Automerger Merge Worker
f894aafdaf Merge changes from topic "am-45b9491f655447d7bcbaec243df04490" into sc-qpr1-dev-plus-aosp am: d084b97e00 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649792

Change-Id: I9a9559de212682587b0c2cfead275649674e600b
 2021-08-23 04:58:52 +00:00
Bill Yi
6fe86554e2 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 93eb76377b am: 0f5c1fd924 -s ours am: 89adb1b207 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id4d16013ce3b99e07aa4209516d3baeda6fa953b
 2021-08-23 04:58:51 +00:00
Bill Yi
a25aeb69f4 Merge changes from topic "presubmit-am-ebe8a352b317462aa31e9ffb6caeb6a5" into sc-dev-plus-aosp am: a536531bd9 am: 3d504a87f6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649792

Change-Id: Ibfc44b107ba264cb14497f96b5b986ef039031e3
 2021-08-23 04:58:29 +00:00
Bill Yi
64fe24ebc2 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 93eb76377b am: 0af7a53e0a -s ours am: 22b2889345 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2cb1f74574a87c71ac1c28ebd0ae26e2f9df2b08
 2021-08-23 04:58:27 +00:00
Bill Yi
31506a0c66 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 46902bd366 -s ours am: 1a5b010e20 -s ours am: b5074981a1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie68c733550db98226b62bbf1c8cbf9cc17facf6b
 2021-08-23 04:57:29 +00:00
Bill Yi
360df88c4b Merge changes from topic "presubmit-am-ebe8a352b317462aa31e9ffb6caeb6a5" into sc-qpr1-dev am: 38f55441d3 am: 0be19629e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649792

Change-Id: I2f6233e6507fe9c568e11eca144ebbbba0af2cd2
 2021-08-23 04:57:14 +00:00
Bill Yi
db7d449225 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 93eb76377b am: 0f5c1fd924 -s ours am: b06fcc8fb4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie64f700de06257f243b64b79a64259c81f76ea1b
 2021-08-23 04:57:12 +00:00
Bill Yi
b5074981a1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 46902bd366 -s ours am: 1a5b010e20 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie6cf59ad347789416e5b96e51e2170203da21a84
 2021-08-23 04:38:52 +00:00
Automerger Merge Worker
21893b0972 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 46902bd366 -s ours am: 1a5b010e20 -s ours" into sc-qpr1-dev-plus-aosp 2021-08-23 04:38:50 +00:00
Bill Yi
e943d5a0a5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 46902bd366 -s ours am: 1a5b010e20 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6374278799610f2626a00d6fe3db434b8ade4524
 2021-08-23 04:38:48 +00:00
Bill Yi
07249babd3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 46902bd366 -s ours am: e8eeb4a1ec -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib8154aa2eb17d7fa41b71a9d5a1d6a34c842d0bb
 2021-08-23 04:38:46 +00:00
Automerger Merge Worker
d084b97e00 Merge changes from topic "am-45b9491f655447d7bcbaec243df04490" into sc-qpr1-dev-plus-aosp 
* changes:
  Merge changes from topic "presubmit-am-ebe8a352b317462aa31e9ffb6caeb6a5" into sc-qpr1-dev am: 38f55441d3
  [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 93eb76377b am: 0f5c1fd924 -s ours
 2021-08-23 04:38:11 +00:00
Bill Yi
0be19629e3 Merge changes from topic "presubmit-am-ebe8a352b317462aa31e9ffb6caeb6a5" into sc-qpr1-dev am: 38f55441d3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649792

Change-Id: I96b6102d076f0158306830c3990c24037d84127b
 2021-08-23 04:38:11 +00:00
Bill Yi
b06fcc8fb4 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 93eb76377b am: 0f5c1fd924 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7a7ccaf8808bf6aae1cfd9750117e0588ea47486
 2021-08-23 04:38:10 +00:00
Bill Yi
3d504a87f6 Merge changes from topic "presubmit-am-ebe8a352b317462aa31e9ffb6caeb6a5" into sc-dev-plus-aosp am: a536531bd9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649792

Change-Id: I0962ac31cd4227ced779e90a2637d6bb8e3fad6a
 2021-08-23 04:38:09 +00:00
Bill Yi
cfdea9640f Merge changes from topic "presubmit-am-ebe8a352b317462aa31e9ffb6caeb6a5" into sc-qpr1-dev am: 38f55441d3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649792

Change-Id: I8723dc14c877e14d0ec1252bff2e57e67ccc8b46
 2021-08-23 04:38:09 +00:00
Bill Yi
89adb1b207 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 93eb76377b am: 0f5c1fd924 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I05af183d8c7ea560a95a35a95d08e5a1a8e0cf54
 2021-08-23 04:38:08 +00:00
Bill Yi
22b2889345 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 93eb76377b am: 0af7a53e0a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I40eed7a068e8eab4f1afdc6a258541d3896c8f61
 2021-08-23 04:38:08 +00:00
Bill Yi
1a5b010e20 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 46902bd366 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If8b78b2722decc2a182fbded4f594db881eaf9ee
 2021-08-23 04:38:06 +00:00
Bill Yi
d68d89a16d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 46902bd366 -s ours am: cb4d8096f9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I549844cdd4525a7904e425b715dfe5b1287f6a49
 2021-08-23 04:37:38 +00:00