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
Treehugger Robot
4fa35e41b9
[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210805.001.A1." am: a529d8c717 am: 93a418718f -s ours am: 8f0658f24d -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1785293
Change-Id: I70994758c7410f4cd98e61a64e22cdf496962436
2021-08-04 02:15:04 +00:00
Xin Li
0924dc7b5c
[automerger skipped] DO NOT MERGE - Merge RQ3A.210805.001.A1. am: 27ade80e6b am: 4785355302 -s ours am: 1d2519ade1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1785293
Change-Id: I4ad6a89859c1c8db0dff384dd876eab1486bc8a1
2021-08-04 02:15:00 +00:00
Treehugger Robot
8f0658f24d
[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210805.001.A1." am: a529d8c717 am: 93a418718f -s ours
...
am skip reason: Merged-In Ic9d4e1138113e3c90abb27ba0a72d2ed07528c1e with SHA-1 3b8c6118c1 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1785293
Change-Id: I1ba07ac8c0a20cf6f1422d2be60c00a10e304ba7
2021-08-04 01:59:51 +00:00
Xin Li
1d2519ade1
[automerger skipped] DO NOT MERGE - Merge RQ3A.210805.001.A1. am: 27ade80e6b am: 4785355302 -s ours
...
am skip reason: Merged-In Ic9d4e1138113e3c90abb27ba0a72d2ed07528c1e with SHA-1 3b8c6118c1 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1785293
Change-Id: Ic475987a1d6f0435fb4c4c77e28ada1b687878ff
2021-08-04 01:59:46 +00:00
Treehugger Robot
93a418718f
Merge "DO NOT MERGE - Merge RQ3A.210805.001.A1." am: a529d8c717
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1785293
Change-Id: I86a2d120881f268b479b8a0e1bda3832fcb867bc
2021-08-04 01:28:25 +00:00
Xin Li
4785355302
DO NOT MERGE - Merge RQ3A.210805.001.A1. am: 27ade80e6b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1785293
Change-Id: I1cc9538054669c2c71105d44c8601fb1bf6e8579
2021-08-04 01:28:22 +00:00
Treehugger Robot
a529d8c717
Merge "DO NOT MERGE - Merge RQ3A.210805.001.A1."
2021-08-04 01:05:56 +00:00
Yifan Hong
045354fa8c
Merge "PairDevice to structured Parcelable." am: f7ff663887 am: eddbc8a356 am: bbd851fea7 am: e3aecc8290
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1780667
Change-Id: Ib469a94982990b0cb98a9146a7a4da474f0bbe20
2021-08-04 00:37:59 +00:00
Yifan Hong
e3aecc8290
Merge "PairDevice to structured Parcelable." am: f7ff663887 am: eddbc8a356 am: bbd851fea7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1780667
Change-Id: I2c334127de069f834cf4d955ac18cf0df4ed5f83
2021-08-04 00:22:13 +00:00
Yifan Hong
bbd851fea7
Merge "PairDevice to structured Parcelable." am: f7ff663887 am: eddbc8a356
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1780667
Change-Id: Ife1bbb4e839ee6115b2809113c715068cdb94e59
2021-08-04 00:07:38 +00:00
Yifan Hong
eddbc8a356
Merge "PairDevice to structured Parcelable." am: f7ff663887
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1780667
Change-Id: I6dcf1c7dab645aae4461a1100b580b5c8b2781ad
2021-08-03 23:46:26 +00:00
Yifan Hong
f7ff663887
Merge "PairDevice to structured Parcelable."
2021-08-03 23:32:27 +00:00
Xin Li
27ade80e6b
DO NOT MERGE - Merge RQ3A.210805.001.A1.
...
Bug: 192585466
Merged-In: Ic9d4e1138113e3c90abb27ba0a72d2ed07528c1e
Change-Id: I2bf4a9589a121a8bc2d2c4680a1fa081784a2e8a
2021-08-03 16:07:50 -07:00
Yifan Hong
d61750990d
PairDevice to structured Parcelable.
...
Bug: 194829333
Test: pass
Change-Id: I202ae5aa16d4323afa2a48cc3070f8e13c701efd
2021-08-03 14:05:31 -07:00
Varun Shah
eefce6a1f3
Handle blobs and leases that never expire correctly.
...
Add logic to properly handle blobs and leases that never expire.
Also add the relevant strings required in this package.
Fixes: 194439893
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SharedDataPreferenceControllerTest
Test: manual (visual)
Change-Id: Ifeb216a92a3be8d1db3574b4f63e2d04adace4ea
2021-08-03 12:09:14 -07:00
Bonian Chen
e421a7265d
Merge "[Settings] eSIM existance detection rule change"
2021-08-03 13:12:20 +00:00