Commit Graph

91325 Commits

Author SHA1 Message Date
TreeHugger Robot
52c03c33a3 Merge "Fix ManageApplications pinned header overlaps content" into sc-dev am: f421525d2c am: 2ddfd5616d am: 0af4260cb3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15126430

Change-Id: Iddd2fa66e062d0209c00bc0029bcbab9ec9a93a9
2021-07-01 03:27:01 +00:00
Syaoran Kuo
1eaddbac90 Merge "Fix dark mode activity in incorrect stage exception" 2021-07-01 03:10:38 +00:00
TreeHugger Robot
325a4da467 Merge "Fix ManageApplications pinned header overlaps content" into sc-dev am: f421525d2c am: dfb8409116
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15126430

Change-Id: I8c613a0fbed0331c83856c8ca502cd2ab636b895
2021-07-01 03:03:54 +00:00
TreeHugger Robot
0af4260cb3 Merge "Fix ManageApplications pinned header overlaps content" into sc-dev am: f421525d2c am: 2ddfd5616d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15126430

Change-Id: I2ccdd29729b1cdfdf6189ca4137e70074bccbbc5
2021-07-01 03:03:29 +00:00
TreeHugger Robot
c1d51336ee Merge "Fix ManageApplications pinned header overlaps content" into sc-dev am: f421525d2c am: ca65634d48
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15126430

Change-Id: I4efe13f97a27670a0dbec376c8e2072cd26699ea
2021-07-01 03:03:28 +00:00
TreeHugger Robot
2ddfd5616d Merge "Fix ManageApplications pinned header overlaps content" into sc-dev am: f421525d2c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15126430

Change-Id: I35fcc3939777cf9b62800a853c5e9746097fdc9b
2021-07-01 02:50:51 +00:00
TreeHugger Robot
ca65634d48 Merge "Fix ManageApplications pinned header overlaps content" into sc-dev am: f421525d2c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15126430

Change-Id: Ica04ca516c5d315a0844cfa3bfda0c9511f50cb4
2021-07-01 02:50:30 +00:00
TreeHugger Robot
dfb8409116 Merge "Fix ManageApplications pinned header overlaps content" into sc-dev am: f421525d2c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15126430

Change-Id: Ibf6c9652f206bc9803ffd56a6b3d5a651ea3d149
2021-07-01 02:50:00 +00:00
TreeHugger Robot
f421525d2c Merge "Fix ManageApplications pinned header overlaps content" into sc-dev 2021-07-01 02:38:18 +00:00
Joe Bolinger
14cf3724f7 Prevent finishing early on single sensor devices. am: 47e8ddbdb9 am: de779f2883 am: 37b0e414ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15162645

Change-Id: I11a8bb874443ffd56412fe97624d19ea413cd0e9
2021-07-01 00:30:08 +00:00
Joe Bolinger
802e971dc1 Revert "Revert "Return enrollment consent status to caller."" am: c17876365a am: a095d7f518 am: ce952ecd28
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15162634

Change-Id: I0db89f89078a31593139820ca077781520222e83
2021-07-01 00:30:07 +00:00
Joe Bolinger
35dd8a5f09 Prevent finishing early on single sensor devices. am: 47e8ddbdb9 am: f914e82e8c am: a4642cb1a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15162645

Change-Id: I257992d7b752762ce8a85dd6ed2cb9e3858f0255
2021-07-01 00:29:57 +00:00
Joe Bolinger
d90650e816 Revert "Revert "Return enrollment consent status to caller."" am: c17876365a am: 7944bfa26b am: 33efdd7fc7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15162634

Change-Id: I4b35dd99fbb98ac9b13591aad5d83374c115e950
2021-07-01 00:29:55 +00:00
Ahaan Ugale
d4ce558f33 Password settings: Fix work profile
Currently, the work profile password settings just point to the personal
profile app. This change fixes this using the forWork metadata tag, that
sets the work profile user in BasePreferenceController.

Also fixes and re-enables the
displayPreference_withPasswords_addsPreference test.

Fix: 192417100
Test: manual - work profile link works, password count is accurate
Test: atest PasswordsPreferenceControllerTest
Change-Id: I6345b69b9c03ff13b8e2784e69dc0188abc436e3
2021-06-30 17:22:07 -07:00
Joe Bolinger
37b0e414ad Prevent finishing early on single sensor devices. am: 47e8ddbdb9 am: de779f2883
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15162645

Change-Id: Id2c46bdd112f0255cf868fc0e1b3e00bea08b66e
2021-07-01 00:20:01 +00:00
Joe Bolinger
ce952ecd28 Revert "Revert "Return enrollment consent status to caller."" am: c17876365a am: a095d7f518
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15162634

Change-Id: I7b249e802c07786ecfff6ee1b86a45296178cc91
2021-07-01 00:20:00 +00:00
Joe Bolinger
a4642cb1a5 Prevent finishing early on single sensor devices. am: 47e8ddbdb9 am: f914e82e8c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15162645

Change-Id: I7413a708c4814cd73c44caeefcb9e85aa644e648
2021-07-01 00:16:32 +00:00
Joe Bolinger
33efdd7fc7 Revert "Revert "Return enrollment consent status to caller."" am: c17876365a am: 7944bfa26b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15162634

Change-Id: I45574652f03e2ab0ac7d51e6f5d4964429e9851f
2021-07-01 00:16:30 +00:00
Joe Bolinger
290a7afb74 Prevent finishing early on single sensor devices. am: 47e8ddbdb9 am: ab597936fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15162645

Change-Id: If8138b690a5f95554dd8d97cfc8f17226c2bd93e
2021-07-01 00:15:53 +00:00
Joe Bolinger
06af467c5c Revert "Revert "Return enrollment consent status to caller."" am: c17876365a am: df329ea588
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15162634

Change-Id: Ic84cdee418c7b2bf7c476441cac795cfa58545ab
2021-07-01 00:15:48 +00:00
Joe Bolinger
f914e82e8c Prevent finishing early on single sensor devices. am: 47e8ddbdb9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15162645

Change-Id: I7e8bd7d8311ec387073de14eb334f5ec24f480e5
2021-07-01 00:03:19 +00:00
Joe Bolinger
7944bfa26b Revert "Revert "Return enrollment consent status to caller."" am: c17876365a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15162634

Change-Id: I9bfcd58aee6c2dca25f1b229762c0a19e4a883b1
2021-07-01 00:03:17 +00:00
Joe Bolinger
de779f2883 Prevent finishing early on single sensor devices. am: 47e8ddbdb9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15162645

Change-Id: I37dfd3cd27fb0952db602a60663b83b911e616ba
2021-07-01 00:02:34 +00:00
Joe Bolinger
ab597936fe Prevent finishing early on single sensor devices. am: 47e8ddbdb9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15162645

Change-Id: I3e36919892194b12ed4d3567715c87fcad8d5065
2021-07-01 00:02:33 +00:00
Joe Bolinger
a095d7f518 Revert "Revert "Return enrollment consent status to caller."" am: c17876365a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15162634

Change-Id: I836c89f4e86679feb671084041a0c723b2616c2c
2021-07-01 00:02:32 +00:00
Joe Bolinger
df329ea588 Revert "Revert "Return enrollment consent status to caller."" am: c17876365a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15162634

Change-Id: Ib644bfecc6cc6f29a510e7148527efdc2e148810
2021-07-01 00:02:31 +00:00
Joe Bolinger
47e8ddbdb9 Prevent finishing early on single sensor devices.
Fixes regression from commit c358adad56.

Fix: 192420564
Fix: 188847063

Test: manual enroll face & fingerprint via setup wizard (on fp, face, & fp+face device variants)
Change-Id: If7027e4d0ddf9d73daf91f174f237e4eb1621ea7
2021-06-30 14:21:04 -07:00
Joe Bolinger
c17876365a Revert "Revert "Return enrollment consent status to caller.""
This reverts commit c358adad56.

Reason for revert: Applying original change with additional change for single sensor devices.

Bug: 192420564
Bug: 188847063

Test: manual enroll face & fingerprint via setup wizard (on fp, face, & fp+face device variants)

Change-Id: Idfaaa2b6f4611056f9999325bac8401e28a7510b
2021-06-30 14:16:56 -07:00
Joe Bolinger
e393a1bb4d Merge "Revert "Return enrollment consent status to caller."" into sc-dev am: a86c8be5fa am: 738bdec079 am: 8d470be84d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15155700

Change-Id: If0cac6820839471e6ef983bc691c1a02c128c9f6
2021-06-30 20:54:54 +00:00
Joe Bolinger
4f5ce2f9a6 Merge "Revert "Return enrollment consent status to caller."" into sc-dev am: a86c8be5fa am: 79d132c225 am: 4efa111a23
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15155700

Change-Id: I2c63d0470b39e0f49cc1640250d6638d8134318c
2021-06-30 20:54:46 +00:00
Joe Bolinger
8d470be84d Merge "Revert "Return enrollment consent status to caller."" into sc-dev am: a86c8be5fa am: 738bdec079
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15155700

Change-Id: I2a877bb4940c07657b13e3f059d1f2f449cc55da
2021-06-30 20:44:32 +00:00
Joe Bolinger
4efa111a23 Merge "Revert "Return enrollment consent status to caller."" into sc-dev am: a86c8be5fa am: 79d132c225
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15155700

Change-Id: I47614cd95c09aa0a396a2ca43e6c396b1275e74f
2021-06-30 20:39:55 +00:00
Joe Bolinger
8ae1cde0d5 Merge "Revert "Return enrollment consent status to caller."" into sc-dev am: a86c8be5fa am: 48d5389767
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15155700

Change-Id: Ib90db8fc9479714e053d57814fc2c643904fbe74
2021-06-30 20:39:06 +00:00
Joe Bolinger
738bdec079 Merge "Revert "Return enrollment consent status to caller."" into sc-dev am: a86c8be5fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15155700

Change-Id: I1615c167ce285eecee1a56806bf482e5fa00e7df
2021-06-30 20:27:59 +00:00
Joe Bolinger
48d5389767 Merge "Revert "Return enrollment consent status to caller."" into sc-dev am: a86c8be5fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15155700

Change-Id: Ib07339437db267115a2f55b5d96a27f8e9aaf326
2021-06-30 20:27:14 +00:00
Joe Bolinger
79d132c225 Merge "Revert "Return enrollment consent status to caller."" into sc-dev am: a86c8be5fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15155700

Change-Id: Ibc379469f3961649a6e6bb142696dff302911983
2021-06-30 20:26:17 +00:00
Joe Bolinger
a86c8be5fa Merge "Revert "Return enrollment consent status to caller."" into sc-dev 2021-06-30 20:10:58 +00:00
TreeHugger Robot
a05d4473b1 Merge "Properly set all data fields" into sc-dev am: a27c8d91dd am: 79d2533094 am: 355570ef99
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15157922

Change-Id: I0fa00c64396a8ad640ddf22fbbe8961dd07fb6e4
2021-06-30 19:36:58 +00:00
TreeHugger Robot
02e33aae3a Merge "Properly set all data fields" into sc-dev am: a27c8d91dd am: 133feb7830 am: d37f7fbeae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15157922

Change-Id: I55c79fb96db883e9a792403fe827075e6a049295
2021-06-30 19:35:50 +00:00
TreeHugger Robot
355570ef99 Merge "Properly set all data fields" into sc-dev am: a27c8d91dd am: 79d2533094
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15157922

Change-Id: Icc04399fba58ec3666f5133480f591f8e9c2ea7c
2021-06-30 19:29:57 +00:00
TreeHugger Robot
d37f7fbeae Merge "Properly set all data fields" into sc-dev am: a27c8d91dd am: 133feb7830
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15157922

Change-Id: I1354733c86e141fd8362f913fc3703b79d6cbffb
2021-06-30 19:25:17 +00:00
TreeHugger Robot
56a0f27f25 Merge "Properly set all data fields" into sc-dev am: a27c8d91dd am: 39863255de
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15157922

Change-Id: I83070c7ed7d2d9bb005b530507640bf169f2a6d7
2021-06-30 19:24:04 +00:00
TreeHugger Robot
79d2533094 Merge "Properly set all data fields" into sc-dev am: a27c8d91dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15157922

Change-Id: I8cd1be3012f26efdcfd84c9198031fb321debf86
2021-06-30 19:13:11 +00:00
TreeHugger Robot
133feb7830 Merge "Properly set all data fields" into sc-dev am: a27c8d91dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15157922

Change-Id: Ifc6870a6cb8d6dc1fc1ead9a2eda2294cdb5a5d3
2021-06-30 19:12:09 +00:00
TreeHugger Robot
39863255de Merge "Properly set all data fields" into sc-dev am: a27c8d91dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15157922

Change-Id: I5e512eee1787b6be66f2b59b3011b9820d991637
2021-06-30 19:11:53 +00:00
TreeHugger Robot
a27c8d91dd Merge "Properly set all data fields" into sc-dev 2021-06-30 18:58:13 +00:00
Julia Reynolds
b61b739661 Properly set all data fields
So stale data doesn't stick around when the view is recycled

Test: manual:
- dismiss a notification
- set a short timer (a custom view notif)
- check history after timer expires (so there are 2 notifs in 'recently
dismissed')
- stop the timer and check history
- there are now 3 notifs and no stale text in any of them
Fixes: 192294011

Change-Id: I229a0388a703b9df0d92eec81066a9a2f67e183e
2021-06-30 12:59:28 -04:00
bsears
c358adad56 Revert "Return enrollment consent status to caller."
This reverts commit eb1dac69f0.

Reason for revert: Based on bisection, this CL is the root cause for bug 192420564, which breaks Setup Wizard.

Bug: 192420564
Change-Id: I8d9aee7fe2415e134fcc981b0548bd9ce300db55
2021-06-30 14:53:13 +00:00
Alex Johnston
0ad4783163 Fix Settings usb preference search
* Invert isPageSearchEnabled check

Bug: 192449168
Test: manual testing with TestDPC
Change-Id: I91dcf930485ad16a83cb04bf170c9608c1768ea2
2021-06-30 14:36:23 +00:00
Syaoran Kuo
28da952fb2 Merge "Add test case for on off airplane mode repeatly" 2021-06-30 13:58:41 +00:00