Commit Graph

85239 Commits

Author SHA1 Message Date
Wesley Wang
25c3524f59 Merge "Update high usage tips string" into sc-dev am: ddc8a5db98 am: 15d004a5b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109303

Change-Id: I96c42bb454176a0d1c51f63fb9cc5b323cf5b416
2021-07-01 08:46:11 +00:00
Tom Hsu
e58306ee13 Merge "[Settings] Make UI be able to update current status, after SIM absent." into sc-dev am: f5a55229fa am: 9a072482ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15151685

Change-Id: I8ae83555f74b40302cadee0a7967936a62b276a9
2021-07-01 08:46:02 +00:00
Alex Johnston
317ff89372 Merge "Fix Settings usb preference search" into sc-dev am: 4174cf1b28 am: 4055c9b50a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15155296

Change-Id: I55d67ab19ae78c853ba083995e625ceaff341444
2021-07-01 08:45:58 +00:00
Wesley Wang
be48e4bfcf Merge "Update high usage tips string" into sc-dev am: ddc8a5db98 am: dccdce75bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109303

Change-Id: If93586d489a0cef3cf0cf0199db90ed265b40e80
2021-07-01 08:45:47 +00:00
Tom Hsu
9a072482ec Merge "[Settings] Make UI be able to update current status, after SIM absent." into sc-dev am: f5a55229fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15151685

Change-Id: Ie5748b5a7829dc2bb2b86954c3815a03badc120e
2021-07-01 08:33:39 +00:00
Alex Johnston
4055c9b50a Merge "Fix Settings usb preference search" into sc-dev am: 4174cf1b28
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15155296

Change-Id: I835cc2dbc956bd53b10acc2c73b0de9069bc740c
2021-07-01 08:33:34 +00:00
Wesley Wang
dccdce75bb Merge "Update high usage tips string" into sc-dev am: ddc8a5db98
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109303

Change-Id: I1fb9bac630efc5d6e617e38b40728b94ff0073b3
2021-07-01 08:33:28 +00:00
Wesley Wang
15d004a5b8 Merge "Update high usage tips string" into sc-dev am: ddc8a5db98
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109303

Change-Id: I45d64bd2ae2014c89092635ca71528955f0e6883
2021-07-01 08:32:38 +00:00
Tom Hsu
f5a55229fa Merge "[Settings] Make UI be able to update current status, after SIM absent." into sc-dev 2021-07-01 08:28:15 +00:00
Alex Johnston
4174cf1b28 Merge "Fix Settings usb preference search" into sc-dev 2021-07-01 08:26:51 +00:00
Wesley Wang
ddc8a5db98 Merge "Update high usage tips string" into sc-dev 2021-07-01 08:22:11 +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
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
tom hsu
a8456b4aa9 [Settings] Make UI be able to update current status, after SIM absent.
- The cache of default data subscription id does not update when SIM
 absent. Therefore, uses getActiveSubscriptionIdList instead current to
 make it more precise.

Bug: 192032602
Test: Manual test. see b/192032602#7
Change-Id: I29e697e97d32ecb2e93c9620ec65215f963e4ebe
2021-07-01 05:35:46 +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
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
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
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
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
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
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
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
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
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
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
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
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
Jason Chiu
c38978f3e1 Guard against the exceptions when launching a non-existing fragment
Test: robotest
Bug: 190371550
Change-Id: I2bb7d4bdb23756634526db7e272563a1587c9640
2021-06-30 18:33:59 +08:00
TreeHugger Robot
4381b39607 Merge "Fix 'No Apps' UI issues of ManageApplications" into sc-dev am: cb00a65a0d am: 67b36c4550
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15124032

Change-Id: Ia32ab80d64cc471cc101fe42b54fd1bbcb4833e7
2021-06-30 09:55:03 +00:00
TreeHugger Robot
f1065b309c Merge "Fix 'No Apps' UI issues of ManageApplications" into sc-dev am: cb00a65a0d am: 26dfc5485d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15124032

Change-Id: I41e784c6b5f6dc56a5721e8d93794af96ed90143
2021-06-30 09:51:37 +00:00
PETER LIANG
c7ff65bc85 Merge "Update the material next style for the banner of Auto Click." into sc-dev am: c4176b73e0 am: 8a5b01dd66
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15153298

Change-Id: I236e4b5ff39eeafb4ac3bcd05a72c1134209fe68
2021-06-30 09:51:33 +00:00
TreeHugger Robot
67b36c4550 Merge "Fix 'No Apps' UI issues of ManageApplications" into sc-dev am: cb00a65a0d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15124032

Change-Id: Ic5faa67844eaf22d950540361650a123709c46fb
2021-06-30 09:51:29 +00:00