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

86241 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Bill Yi
2487eee891 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 296d41309e -s ours am: 16693aaca0 -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: I4851fff1d80fbbd507ac78300bed7ae7141d2271
 2021-07-30 14:21:09 +00:00
Bill Yi
96d40908e0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 296d41309e -s ours am: 16693aaca0 -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: If220aa9eb626e85a6123ed5b84d99c370facd66e
 2021-07-30 14:17:31 +00:00
TreeHugger Robot
3c987fd2ba [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 7399e2deaa -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: I4d9300322d9114de041eb032258911b97f5438ff
 2021-07-30 14:17:22 +00:00
Bill Yi
16693aaca0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 296d41309e -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: I472c9c04799848a0382c2af447d442b73bad4bd0
 2021-07-30 14:16:37 +00:00
TreeHugger Robot
b90e48ad64 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 7399e2deaa -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: I536a95a89ff1243f1e87e340b923564f70e7c190
 2021-07-30 14:15:47 +00:00
TreeHugger Robot
f06cd4b190 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: b6417453f9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iec241bd1f714d52e7ae2fd432bb85b660ae75a6b
 2021-07-30 14:08:18 +00:00
TreeHugger Robot
7399e2deaa Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-07-30 14:07:33 +00:00
TreeHugger Robot
b6417453f9 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-07-30 13:53:31 +00:00
Bill Yi
2e4581a30c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If7a3af5b6e872561b010ea6cee172ebd3d6ab8f7
 2021-07-30 12:10:45 +00:00
Bill Yi
63c32865cc Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I66bde249f1f3d460a40ccd3fb9daf61f7be202dd
 2021-07-30 12:06:46 +00:00
Bill Yi
296d41309e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0e84b422b86e7195aac236b569828f1a0760ad7e
 2021-07-30 11:53:32 +00:00
Bill Yi
e5d2e077c7 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8c108f50853f1de14c4df8d52bdcc4211f05278b
 2021-07-30 11:39:05 +00:00
TreeHugger Robot
19f6e4a49e Merge "[Settings] Allow disabled SIM to be controlled in UI" into sc-dev am: 74060d3158 am: bc39d7f73e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15388307

Change-Id: I3de6a6e268a713517b5a29cbc15a7abe87844f5c
 2021-07-30 08:45:31 +00:00
TreeHugger Robot
91abd1277d Merge "[Settings] Allow disabled SIM to be controlled in UI" into sc-dev am: 74060d3158 am: f39f9d2d3d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15388307

Change-Id: I40408cecd02422f1fa41ece7f160637294d172ca
 2021-07-30 08:44:57 +00:00
TreeHugger Robot
f39f9d2d3d Merge "[Settings] Allow disabled SIM to be controlled in UI" into sc-dev am: 74060d3158 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15388307

Change-Id: I3587d9793b6e62402603f2d0a7ffa66c62704b9b
 2021-07-30 08:32:41 +00:00
TreeHugger Robot
bc39d7f73e Merge "[Settings] Allow disabled SIM to be controlled in UI" into sc-dev am: 74060d3158 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15388307

Change-Id: Ic9337fe64ae71afa60bbe6d8e3ef4a2a511b6cd9
 2021-07-30 08:30:58 +00:00
TreeHugger Robot
74060d3158 Merge "[Settings] Allow disabled SIM to be controlled in UI" into sc-dev 2021-07-30 08:18:01 +00:00
Ahan Wu
a551ea537c Use new api to create InteractionJankMonitor.Configuration.Builder 
The api to create InteractionJankMonitor.Configuration.Builder has
changed, adopt the new api.

Bug: 170708749
Test: build pass
Change-Id: I627370fed43630750eab2ec9752338fb03753463
 2021-07-29 19:22:54 -08:00
Treehugger Robot
bd71ddc59b Merge "Fix memory leak in TopLevelBatteryPreferenceController" am: 060bf953e3 am: f5876a1df9 am: 9cfd6a6164 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1606501

Change-Id: I9d3f933e3fa5c68e34e97f9b4191022c5d0aee8b
 2021-07-30 03:00:43 +00:00
Treehugger Robot
9cfd6a6164 Merge "Fix memory leak in TopLevelBatteryPreferenceController" am: 060bf953e3 am: f5876a1df9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1606501

Change-Id: I9966577fec0160fb4c13cde9cfcf7bf8d7b5697d
 2021-07-30 02:45:06 +00:00
Treehugger Robot
f5876a1df9 Merge "Fix memory leak in TopLevelBatteryPreferenceController" am: 060bf953e3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1606501

Change-Id: I818ae58baa161689a867cea8bc4662db602dfdcb
 2021-07-30 02:35:23 +00:00
Treehugger Robot
060bf953e3 Merge "Fix memory leak in TopLevelBatteryPreferenceController" 2021-07-30 02:18:11 +00:00
Joe Bolinger
6cab6458d6 Merge "Limit biometric enrollments when Unicorn account is present." into sc-dev am: 12e161d1dc am: 21ef1830ea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15413152

Change-Id: I9980fa2cbaabec648590902df007d21ab1c7f893
 2021-07-30 01:50:43 +00:00
Joe Bolinger
24a3796f7c Merge "Limit biometric enrollments when Unicorn account is present." into sc-dev am: 12e161d1dc am: 769447a502 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15413152

Change-Id: I264232763f7e0af216291368ae5f704942f12ad7
 2021-07-30 01:50:19 +00:00
Joe Bolinger
769447a502 Merge "Limit biometric enrollments when Unicorn account is present." into sc-dev am: 12e161d1dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15413152

Change-Id: If88427e1b7ed4d5227c821ab65e47f52cc9c5481
 2021-07-30 01:36:43 +00:00
Joe Bolinger
21ef1830ea Merge "Limit biometric enrollments when Unicorn account is present." into sc-dev am: 12e161d1dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15413152

Change-Id: I4c5dd9f9a73e7bc83d8e5c0ccf90358f8bdc8383
 2021-07-30 01:35:07 +00:00
Joe Bolinger
12e161d1dc Merge "Limit biometric enrollments when Unicorn account is present." into sc-dev 2021-07-30 01:21:55 +00:00
Joe Bolinger
91d7545826 Limit biometric enrollments when Unicorn account is present. 
This prevents biometric enrollment from happening after consent
has been obtained and is being managed by family link.

Note that this requires a corresponding change the setup wizard app
to work in most cases.

Bug: 193577587
Test: manual (enroll then relaunch SuW and repeat)
Change-Id: If260e49f38a141931d7f3362c1faf80ee7790232
 2021-07-29 15:43:04 -07:00
Evan Severson
14b7870359 Merge "Set toggle state for profile group" into sc-dev am: 405fac1ca0 am: 1ea7d23088 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15362614

Change-Id: Ic9d017314e117b01c6b89d551c35ec6c334ab26e
 2021-07-29 20:16:03 +00:00
Evan Severson
e2b8e585b1 Merge "Set toggle state for profile group" into sc-dev am: 405fac1ca0 am: 8a1461a212 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15362614

Change-Id: Id015925230ad1cea4063edc0cb197b54bbf2950c
 2021-07-29 20:15:42 +00:00