Bill Yi
dbc7513d83
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a7b2f538d
-s ours am: b6321f88ad
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15466491
Change-Id: Iaf8cfd8e0cb14b2832b016e8056446b863562447
2021-08-05 05:51:13 +00:00
Bill Yi
f841d3fa4f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a7b2f538d
-s ours am: b6321f88ad
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15466491
Change-Id: If6e7a3f07941a61f16d553f95c13f59529cdcbe4
2021-08-05 05:50:26 +00:00
Bill Yi
4464b58412
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a7b2f538d
-s ours am: b6321f88ad
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15466491
Change-Id: Id3af84dc33ed419874ed614c5ccf01570c454114
2021-08-05 05:50:22 +00:00
Bill Yi
948316d370
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1cc662122f
-s ours am: 2a1b39c51f
-s ours am: 7805fe0aee
-s ours am: 997cef968a
-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: Ia4294ccd45a721dbedd71f985407279b4d3e4bea
2021-08-05 05:42:36 +00:00
TreeHugger Robot
bbca92191a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c47427811f
-s ours am: ae616ac517
-s ours am: fbe0a69666
-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: I698857dc6816abd6fd76d2b496bcb4e6b8c189c0
2021-08-05 05:42:31 +00:00
Bill Yi
95fb29f074
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1cc662122f
-s ours am: 2a1b39c51f
-s ours am: 83c0c7b420
-s ours am: 8a68a14dd9
-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: I317e3b6821ba9b05491c630e89de5e310daee64e
2021-08-05 05:42:27 +00:00
TreeHugger Robot
258915625f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c47427811f
-s ours am: 6c804d29c8
-s ours am: 5f6983fe43
-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: Id363dddef94c52dc421fe2ff75b7bd659ea25f1e
2021-08-05 05:41:58 +00:00
TreeHugger Robot
2cf27c4025
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-08-05 05:41:23 +00:00
Bill Yi
b6321f88ad
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a7b2f538d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15466491
Change-Id: I49e111e71a2ac12186aa85f0bc37629854a60390
2021-08-05 05:38:19 +00:00
Bill Yi
997cef968a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1cc662122f
-s ours am: 2a1b39c51f
-s ours am: 7805fe0aee
-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: I7db24c8df1e5656ec7d51de6ea8d63c908fbc797
2021-08-05 05:33:48 +00:00
TreeHugger Robot
fbe0a69666
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c47427811f
-s ours am: ae616ac517
-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: I275bc926f12026912e9738bb37e4b8a7c35d7853
2021-08-05 05:33:28 +00:00
Bill Yi
8a68a14dd9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1cc662122f
-s ours am: 2a1b39c51f
-s ours am: 83c0c7b420
-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: I97cb90cf2b64c419f55d0e98fe9ab3cfbbadb1b5
2021-08-05 05:32:59 +00:00
TreeHugger Robot
5f6983fe43
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c47427811f
-s ours am: 6c804d29c8
-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: I0300914e05c0d5ffe9dec728ec9425e7b8073005
2021-08-05 05:32:54 +00:00
TreeHugger Robot
bb4a3072d2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 2429d12357
-s ours am: 52a588b2f5
-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: I7884fdcd6f1fd4575f0e408a3e2b06b947642659
2021-08-05 05:22:24 +00:00
Bill Yi
7805fe0aee
[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: Ifda89d01ba6bc2fa34a17a24555249e500ded11b
2021-08-05 05:19:45 +00:00
Bill Yi
83c0c7b420
[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: I661fac098bb7467326e854e84e17cbe08eb04671
2021-08-05 05:17:21 +00:00
TreeHugger Robot
6c804d29c8
[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: Ifbdce45b3809fcac581e42c9db7f9b64f873fb7f
2021-08-05 05:17:14 +00:00
Bill Yi
ce559c04db
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1cc662122f
-s ours am: 2a1b39c51f
-s ours am: 926e66633c
-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: I180e8046f965557fc7ea95e77db6040688e034d5
2021-08-05 05:16:53 +00:00
TreeHugger Robot
abfd98c6e3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c47427811f
-s ours am: 25b204f3db
-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: I9f9661b77ecd59861d1f5adc7e3d9b63f749440a
2021-08-05 05:16:49 +00:00
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