PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
86,274 Commits 1 Branch 0 Tags
ecd91e5c260915cef732a42eea55d77d0ce3ae35
Commit Graph

86274 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
Joe Bolinger
7f94e57003 Merge "Skip enrollment when unicorn account is launched by setup wizard." into sc-dev am: fdb80de825 am: 8a8f607218 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15433652

Change-Id: I78054fc148d39cd7728a976c1406ddf38a5d0a32
 2021-08-02 21:44:35 +00:00
Joe Bolinger
b67ebf0c5c Merge "Skip enrollment when unicorn account is launched by setup wizard." into sc-dev am: fdb80de825 am: 7324d75b4f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15433652

Change-Id: Ifc1a660def75b1b781b40dae6da9e3e608e0ef7a
 2021-08-02 21:44:10 +00:00
Joe Bolinger
7324d75b4f Merge "Skip enrollment when unicorn account is launched by setup wizard." into sc-dev am: fdb80de825 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15433652

Change-Id: I0fda8c0922e45b45a4fb2b10431289724ea26851
 2021-08-02 21:28:29 +00:00
Joe Bolinger
8a8f607218 Merge "Skip enrollment when unicorn account is launched by setup wizard." into sc-dev am: fdb80de825 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15433652

Change-Id: I7912e8ac26ee4c5cd611a8d7e535fb3f4f93d018
 2021-08-02 21:26:51 +00:00
Joe Bolinger
fdb80de825 Merge "Skip enrollment when unicorn account is launched by setup wizard." into sc-dev 2021-08-02 21:15:40 +00:00
Wu Ahan
9eff6c3d77 Merge "Use new api to create InteractionJankMonitor.Configuration.Builder" into sc-v2-dev am: 661d1d1a1b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15258554

Change-Id: I30dc96c202caf1895bcd3099ddd460d8c834a825
 2021-08-02 10:23:59 +00:00
Wu Ahan
661d1d1a1b Merge "Use new api to create InteractionJankMonitor.Configuration.Builder" into sc-v2-dev 2021-08-02 10:06:03 +00:00
Jason Hsu
02990f7470 Merge "Update the preview image in 'Accessibility button & gesture' page." into sc-v2-dev am: f38931fd98 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15401732

Change-Id: I8e2444b9cb74262298dd290adeaf783198901cb1
 2021-08-02 06:30:11 +00:00
Jason Hsu
f38931fd98 Merge "Update the preview image in 'Accessibility button & gesture' page." into sc-v2-dev 2021-08-02 06:25:41 +00:00
Hugh Chen
a3a0661d1b Fix "USB tethering" will auto turn on then off when turn off "USB tethering" 
This CL only updates the "USB tethering preference" when
onTetheredInterfacesChanged() is invoked to avoid the
"USB tethering preference" being changed when received
non-tethering change intent.

Bug: 185590309
Test: make -j42 RunSettingsRoboTests
Change-Id: Ifed9f5c7edef670eeb21baf3841999382ee10ff2
 2021-08-02 10:34:56 +08:00
Joe Bolinger
d5ea0ffe67 Skip enrollment when unicorn account is launched by setup wizard. 
Bug: 194244555
Test: manual
Change-Id: Id310c5e4dec1b1c5262c9703259223ce21b1da61
 2021-07-30 12:51:02 -07:00
Bill Yi
ab7e329391 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e5d2e077c7 -s ours am: 6deca0cd6b -s ours am: 9c72a8c5f6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9d1f2715938b804ce9b5ee2834a3e454f245aabb
 2021-07-30 15:08:46 +00:00
Bill Yi
2b1eaf9ff7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e5d2e077c7 -s ours am: 6deca0cd6b -s ours am: 34aff9aaca -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4dda9cf94fd6d75f1cc7449faa9915883e74b0e5
 2021-07-30 15:08:25 +00:00
Bill Yi
34aff9aaca [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e5d2e077c7 -s ours am: 6deca0cd6b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic7bfa1ad32cabb5028a907affcaac8ea9bb7224c
 2021-07-30 14:53:52 +00:00
Bill Yi
9c72a8c5f6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e5d2e077c7 -s ours am: 6deca0cd6b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I73033d1b8888120b77e48edd8ce23eb1beca3b7e
 2021-07-30 14:52:58 +00:00
Bill Yi
6deca0cd6b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e5d2e077c7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I02489ddc8a2047d651d7bf64ff98a75c6c90cd6a
 2021-07-30 14:42:43 +00:00
Bill Yi
96e13f3748 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 296d41309e -s ours am: 16693aaca0 -s ours am: 2487eee891 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If31f76873963453eac1356719387fe5ac5d4b5ca
 2021-07-30 14:33:29 +00:00
Automerger Merge Worker
c73177f8d2 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 7399e2deaa -s ours am: b90e48ad64 -s ours" into sc-v2-dev-plus-aosp 2021-07-30 14:33:27 +00:00
TreeHugger Robot
e29ba0a2cc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 7399e2deaa -s ours am: b90e48ad64 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I056c501bfa980764b42806d977cad074ba2b8a6a
 2021-07-30 14:33:17 +00:00
Bill Yi
efb958f5e1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 296d41309e -s ours am: 16693aaca0 -s ours am: 96d40908e0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I92d423f5cd1acf0b03c8a51d7a4decfe16109983
 2021-07-30 14:33:16 +00:00
TreeHugger Robot
a9daea74f6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 7399e2deaa -s ours am: 3c987fd2ba -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6c1e922ebffee81fc15513144af34c7a6d44e52f
 2021-07-30 14:33:03 +00:00