Commit Graph

91082 Commits

Author SHA1 Message Date
Jason Chiu
604a803b4e Merge "Guard against the exceptions when launching a non-existing fragment" into sc-dev am: 1f4eb8fbcc am: d24ee9c0ad am: e1de78a270
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15142234

Change-Id: I92de90842c61b32669ae9f52e01f74496eda2949
2021-07-01 07:54:52 +00:00
Jason Chiu
b06fc98859 Merge "Guard against the exceptions when launching a non-existing fragment" into sc-dev am: 1f4eb8fbcc am: ab902d4d84 am: 0ee32dcd2b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15142234

Change-Id: I750b5d50b3fbdd7153aea85d7df36f0bce4e3715
2021-07-01 07:54:45 +00:00
Jason Chiu
ae1fc0dada Merge "Guard against the exceptions when launching a non-existing fragment" into sc-dev am: 1f4eb8fbcc am: 8cdbad13e6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15142234

Change-Id: I741bfd7d164924d30f32ab0567bdcd85875e35d3
2021-07-01 07:50:05 +00:00
Jason Chiu
e1de78a270 Merge "Guard against the exceptions when launching a non-existing fragment" into sc-dev am: 1f4eb8fbcc am: d24ee9c0ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15142234

Change-Id: I189c81e167c158a513bc4e0df8e9c4f039057ccb
2021-07-01 07:42:40 +00:00
Jason Chiu
0ee32dcd2b Merge "Guard against the exceptions when launching a non-existing fragment" into sc-dev am: 1f4eb8fbcc am: ab902d4d84
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15142234

Change-Id: Ie292d02ec2bb04aaa903d64003bedf8416c207f2
2021-07-01 07:37:26 +00:00
Jason Chiu
8cdbad13e6 Merge "Guard against the exceptions when launching a non-existing fragment" into sc-dev am: 1f4eb8fbcc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15142234

Change-Id: I198d2557bbd966d105e7a8daf8665b3a10d26536
2021-07-01 07:36:50 +00:00
Jason Chiu
d24ee9c0ad Merge "Guard against the exceptions when launching a non-existing fragment" into sc-dev am: 1f4eb8fbcc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15142234

Change-Id: I9f806b71618c2447ddf9ad2322f9971ea3b1d89c
2021-07-01 07:25:42 +00:00
Jason Chiu
ab902d4d84 Merge "Guard against the exceptions when launching a non-existing fragment" into sc-dev am: 1f4eb8fbcc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15142234

Change-Id: I14b3f1890c9b278f21e781c2a9348d57528e8b29
2021-07-01 07:24:42 +00:00
Jason Chiu
1f4eb8fbcc Merge "Guard against the exceptions when launching a non-existing fragment" into sc-dev 2021-07-01 07:10:56 +00:00
TreeHugger Robot
7a108c2d01 Merge "Fix ManageApplications pinned header overlaps content" into sc-dev am: f421525d2c am: dfb8409116 am: 325a4da467
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15126430

Change-Id: Ifea0933ba36e56ce1de25816b8d56557ae965e7b
2021-07-01 03:27:17 +00:00
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
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