Bill Yi
926e66633c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1cc662122f
-s ours am: 2a1b39c51f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15466498
Change-Id: I84148729c7a91e5d886721936b5a4a88a6e81f63
2021-08-05 05:16:35 +00:00
TreeHugger Robot
25b204f3db
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c47427811f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15466503
Change-Id: I9a068c58c62e8b0e3b5ec2dcbe1a69e1f6029d20
2021-08-05 05:16:31 +00:00
TreeHugger Robot
d17a304527
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: a11e5bea20
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15466494
Change-Id: Ic3968a4e5d80464b3d8c1c12b574d9b42575c854
2021-08-05 05:16:30 +00:00
Bill Yi
2a1b39c51f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1cc662122f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15466498
Change-Id: I08425987f5fac8f5d2650e60d3ca4e837ed1d51a
2021-08-05 05:16:27 +00:00
TreeHugger Robot
ae616ac517
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c47427811f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15466503
Change-Id: I70099cce49169ab459d5c3bbdc4c2309d6f0e78a
2021-08-05 05:15:17 +00:00
TreeHugger Robot
52a588b2f5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 2429d12357
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15466506
Change-Id: I8716ed4fbc9e2e3aa88bd5b7e35963d2375b666d
2021-08-05 05:09:58 +00:00
TreeHugger Robot
a11e5bea20
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2021-08-05 05:04:34 +00:00
TreeHugger Robot
c47427811f
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-08-05 05:02:21 +00:00
TreeHugger Robot
2429d12357
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-08-05 04:50:41 +00:00
Bill Yi
9d1777710f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I38dd86b5a61d491abdc7ab3dffe691976b66e950
2021-08-05 03:02:43 +00:00
Bill Yi
0b227f30a9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie28fd41e071cad5ba1955fe0aa17bec63c5d3b92
2021-08-05 02:58:44 +00:00
Bill Yi
6a636a8f47
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id2ab60cd236e61e466e12f2fd42526d6edf624c0
2021-08-05 02:54:46 +00:00
Bill Yi
1cc662122f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Idbf6842dbeed0254bb794514aeed9e8a879ff373
2021-08-05 02:45:34 +00:00
Bill Yi
e1215a0076
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie6e1199c352f2d98b0381565375fcf7330ee70cc
2021-08-05 02:34:25 +00:00
Bill Yi
8a7b2f538d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8dbd19ce27d10100096c6035c5b087ed3f97ca4a
2021-08-05 02:30:41 +00:00
Bonian Chen
8db6e5ac5e
[Settings] Fine tune log output and code comments
...
Adjusted log output and code comments.
Bug: 195090132
Bug: 195091953
Test: local
Change-Id: I37ccd641c313e1ffafa600fffe7ca7eaf287db88
2021-08-05 01:59:27 +00:00
TreeHugger Robot
1ed3c39e2f
Merge "Fix text styling for choose pattern/password screens" into sc-dev am: 66a2f625e4
am: 26aa201d81
am: ecd91e5c26
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15463175
Change-Id: I303e83f4aef7cd06fb24604e48cbe86ad00ac975
2021-08-05 00:28:19 +00:00
TreeHugger Robot
61d01bcea7
Merge "Fix text styling for choose pattern/password screens" into sc-dev am: 66a2f625e4
am: 67518dac5e
am: 2f0e7869c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15463175
Change-Id: I6fe4e5c5b85f21cbbe3ee380ce54cb98dd38062e
2021-08-05 00:28:00 +00:00
TreeHugger Robot
ecd91e5c26
Merge "Fix text styling for choose pattern/password screens" into sc-dev am: 66a2f625e4
am: 26aa201d81
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15463175
Change-Id: Id4aa69cb2c3301154a49e3f8481c665080aed11f
2021-08-05 00:14:15 +00:00
TreeHugger Robot
2f0e7869c3
Merge "Fix text styling for choose pattern/password screens" into sc-dev am: 66a2f625e4
am: 67518dac5e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15463175
Change-Id: I3622d3052417195efe95062d392dc2591113d6d6
2021-08-05 00:13:48 +00:00
TreeHugger Robot
d936807227
Merge "Fix text styling for choose pattern/password screens" into sc-dev am: 66a2f625e4
am: 0d61ec8ebf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15463175
Change-Id: I82e746ba9da82c35e825c2742840f0d255048fb1
2021-08-05 00:13:24 +00:00
TreeHugger Robot
67518dac5e
Merge "Fix text styling for choose pattern/password screens" into sc-dev am: 66a2f625e4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15463175
Change-Id: I5286733d373ffa4e0cb27512a8cbef75827c171a
2021-08-04 23:56:36 +00:00
TreeHugger Robot
0d61ec8ebf
Merge "Fix text styling for choose pattern/password screens" into sc-dev am: 66a2f625e4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15463175
Change-Id: I7c40fd94251b22a6c97356522d0ae302f0c3e652
2021-08-04 23:55:54 +00:00
TreeHugger Robot
26aa201d81
Merge "Fix text styling for choose pattern/password screens" into sc-dev am: 66a2f625e4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15463175
Change-Id: Ifb9bdfac1eae934d032f62cc5d0ec57abe61e0b9
2021-08-04 23:55:03 +00:00
TreeHugger Robot
66a2f625e4
Merge "Fix text styling for choose pattern/password screens" into sc-dev
2021-08-04 23:44:35 +00:00
TreeHugger Robot
3ce7245736
Merge "Revert to Default Settings"
2021-08-04 23:29:18 +00:00
Curtis Belmonte
6ee789e380
Fix text styling for choose pattern/password screens
...
Test: Manually trigger SUW and set a device pattern
Fixes: 195069195
Change-Id: Ib19fd0e827af5bdc0896ab4c8cc4fdb8f582cf71
2021-08-04 15:14:38 -07:00
alinasuarez
e2d2f44888
Revert to Default Settings
...
Add functionality to the revert default settings button. This currently
writes a null value to the ENABLE_TARE constant. In the future this will
also make the AlarmManager and JobScheduler constants null so that the
default values are used instead of custom config values.
Bug: 195543827
Test: Click on revert to default settings button, check that the value
for ENABLE_TARE is null by running "adb shell settings get global
enable_tare" in the command line
Change-Id: I558e8f1121021eca3224e4bc9b26bbe0dd2467c7
2021-08-04 20:39:09 +00:00
Peter Wang
756e637981
Merge "Update broadcast intent string to correct format" into sc-dev am: 831d1153e9
am: e098b85711
am: 2601dcc0c5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15406091
Change-Id: I430da0fb3d300c51556b6e66e3111fa5f3406643
2021-08-04 19:08:36 +00:00
Peter Wang
f43c0d7599
Merge "Update broadcast intent string to correct format" into sc-dev am: 831d1153e9
am: 44ed1b24f8
am: 41eab93b70
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15406091
Change-Id: If460abc1f178154add4584fe63bc5c1182e52dd3
2021-08-04 19:08:08 +00:00
Peter Wang
2601dcc0c5
Merge "Update broadcast intent string to correct format" into sc-dev am: 831d1153e9
am: e098b85711
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15406091
Change-Id: I7b7eea53a20092259a47e8cbffaac7aef57db431
2021-08-04 18:53:20 +00:00
Peter Wang
41eab93b70
Merge "Update broadcast intent string to correct format" into sc-dev am: 831d1153e9
am: 44ed1b24f8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15406091
Change-Id: I82c4c78e8b9876ca2851b3388cfe1d4a3d9b0f32
2021-08-04 18:52:58 +00:00
Peter Wang
b9db3d3a04
Merge "Update broadcast intent string to correct format" into sc-dev am: 831d1153e9
am: 429dc94cfa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15406091
Change-Id: I252e0b00a54d5d31f1419b58261e3c8c3fed3b64
2021-08-04 18:52:36 +00:00
Peter Wang
44ed1b24f8
Merge "Update broadcast intent string to correct format" into sc-dev am: 831d1153e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15406091
Change-Id: I030fa95efa6105bced4592e15cc7b07b5722d757
2021-08-04 18:07:06 +00:00
Peter Wang
429dc94cfa
Merge "Update broadcast intent string to correct format" into sc-dev am: 831d1153e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15406091
Change-Id: Id9bfd7d9b9668d8fdeb0251902c1002a99ff833e
2021-08-04 18:06:15 +00:00
Peter Wang
e098b85711
Merge "Update broadcast intent string to correct format" into sc-dev am: 831d1153e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15406091
Change-Id: I2f8fdf57c5bf00ffd68861daaf2701ac0c1196c0
2021-08-04 18:06:10 +00:00
Peter Wang
831d1153e9
Merge "Update broadcast intent string to correct format" into sc-dev
2021-08-04 17:54:03 +00:00
TreeHugger Robot
cbacb4aec0
Merge "Handle blobs and leases that never expire correctly."
2021-08-04 16:05:31 +00:00
TreeHugger Robot
a59a192625
Merge "Job Scheduler TARE page implementation"
2021-08-04 15:54:12 +00:00
TreeHugger Robot
cb1a6a7755
Merge "Fix "USB tethering" will auto turn on then off when turn off "USB tethering"" into sc-dev am: 6f1bc2f52e
am: f42a8893c6
am: 2c857e96de
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15258816
Change-Id: I1b9f97f227008f27a37e3fbd3545982b4313a79e
2021-08-04 07:55:50 +00:00
TreeHugger Robot
09005917e6
Merge "Fix "USB tethering" will auto turn on then off when turn off "USB tethering"" into sc-dev am: 6f1bc2f52e
am: b40dabe916
am: 91321b329a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15258816
Change-Id: I995ed02b3a668e4ae678b05cc87335ba40cb9f3a
2021-08-04 07:55:41 +00:00
TreeHugger Robot
2c857e96de
Merge "Fix "USB tethering" will auto turn on then off when turn off "USB tethering"" into sc-dev am: 6f1bc2f52e
am: f42a8893c6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15258816
Change-Id: I66e7ba48d137ec97305081a5c4cbebe25f9d0239
2021-08-04 07:43:12 +00:00
TreeHugger Robot
91321b329a
Merge "Fix "USB tethering" will auto turn on then off when turn off "USB tethering"" into sc-dev am: 6f1bc2f52e
am: b40dabe916
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15258816
Change-Id: I8c6d26177c24f8670db66dd04c52623ab224949d
2021-08-04 07:42:53 +00:00
TreeHugger Robot
c3d193572f
Merge "Fix "USB tethering" will auto turn on then off when turn off "USB tethering"" into sc-dev am: 6f1bc2f52e
am: 1741a0bd6c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15258816
Change-Id: I7315ee315f79f8ec724353621aac9b82b3f71837
2021-08-04 07:42:27 +00:00
TreeHugger Robot
b40dabe916
Merge "Fix "USB tethering" will auto turn on then off when turn off "USB tethering"" into sc-dev am: 6f1bc2f52e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15258816
Change-Id: Idc444434a9c06cb1890b147c06fa6cf084beb401
2021-08-04 07:30:00 +00:00
TreeHugger Robot
1741a0bd6c
Merge "Fix "USB tethering" will auto turn on then off when turn off "USB tethering"" into sc-dev am: 6f1bc2f52e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15258816
Change-Id: Ie4cfa9b52049abd6e8e4fb5f152cecbed0c602ab
2021-08-04 07:29:18 +00:00
TreeHugger Robot
f42a8893c6
Merge "Fix "USB tethering" will auto turn on then off when turn off "USB tethering"" into sc-dev am: 6f1bc2f52e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15258816
Change-Id: I0daddb467799ae48f25a1ecbf2e9b76081f96f1b
2021-08-04 07:28:12 +00:00
TreeHugger Robot
6f1bc2f52e
Merge "Fix "USB tethering" will auto turn on then off when turn off "USB tethering"" into sc-dev
2021-08-04 07:16:35 +00:00
Treehugger Robot
dc958f27e8
[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210805.001.A1." am: a529d8c717
am: 93a418718f
-s ours am: 8f0658f24d
-s ours am: 4fa35e41b9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1785293
Change-Id: Id083ac4906df682d8774a9f0f21d5aa7bb5c74d2
2021-08-04 02:28:35 +00:00
Xin Li
db19ea7e4b
[automerger skipped] DO NOT MERGE - Merge RQ3A.210805.001.A1. am: 27ade80e6b
am: 4785355302
-s ours am: 1d2519ade1
-s ours am: 0924dc7b5c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1785293
Change-Id: I1b10f69c8bb44c3f5bedc5f3f5effbf0d76b199b
2021-08-04 02:28:30 +00:00