Commit Graph

83360 Commits

Author SHA1 Message Date
Wesley Wang
e71e0176f0 Merge "Update filter logic for BatteryDiffEntries" into sc-dev am: a6a4fe474c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15154916

Change-Id: If4b2d991ddd95391b987246e40a6b34a5cd5b958
2021-07-01 10:39:16 +00:00
Wesley Wang
a6a4fe474c Merge "Update filter logic for BatteryDiffEntries" into sc-dev 2021-07-01 10:05:38 +00:00
TreeHugger Robot
b58a2527b7 Merge "Update title and subtext of Contact search in Work profile settings" into sc-dev am: 69e246ab89
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15126543

Change-Id: I885a4ffa3d7cc3d416e45bfe20aaf5993857c2af
2021-07-01 09:37:57 +00:00
Betty Chang
4414631723 Merge "Add Adaptive Connectivity switch on/off string for fixing string gender" into sc-dev am: 60d2057417
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15165946

Change-Id: I0b2e424022ff77a13af0907b9dbc2723dcf055f9
2021-07-01 09:37:51 +00:00
TreeHugger Robot
69e246ab89 Merge "Update title and subtext of Contact search in Work profile settings" into sc-dev 2021-07-01 09:02:39 +00:00
Betty Chang
60d2057417 Merge "Add Adaptive Connectivity switch on/off string for fixing string gender" into sc-dev 2021-07-01 08:53:10 +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
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
Wesley.CW Wang
15ca9a632f Update filter logic for BatteryDiffEntries
- Use user id and package name to query the battery entry list instead of uid, to handle the
 cases which enter app info page without uid like launch icon -> app
 info

Bug: 178197718
Test: make SettingsRoboTests
Change-Id: I665e57ff3eabf23485455fb2e1af2e0376af1e40
2021-07-01 15:48:23 +08: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
a460e4f890 Update title and subtext of Contact search in Work profile settings
Test: visual
Bug: 184610902
Change-Id: I5391ce3c1dc4aef6ec9e840f382d74a6a399e562
2021-07-01 07:22:40 +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
changbetty
b453e44bf8 Add Adaptive Connectivity switch on/off string for fixing string gender
Bug: 189234188
Test: Manual test
Change-Id: I8a3df2a0f4b364e4bc31e0efd116312b5fdf3b42
2021-07-01 14:57:52 +08: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
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
f421525d2c Merge "Fix ManageApplications pinned header overlaps content" into sc-dev 2021-07-01 02:38:18 +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
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
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
a86c8be5fa Merge "Revert "Return enrollment consent status to caller."" into sc-dev 2021-06-30 20:10:58 +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
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
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
TreeHugger Robot
cb00a65a0d Merge "Fix 'No Apps' UI issues of ManageApplications" into sc-dev 2021-06-30 09:47:11 +00:00
PETER LIANG
5ed90daed0 Merge "Update the material next style for the banner of Auto Click." into sc-dev am: c4176b73e0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15153298

Change-Id: I08278c201a5a0f18715b51ff1a45fb0cef19ecf8
2021-06-30 09:42:47 +00:00
PETER LIANG
c4176b73e0 Merge "Update the material next style for the banner of Auto Click." into sc-dev 2021-06-30 09:39:41 +00:00
Peter_Liang
1eba90f572 Update the material next style for the banner of Auto Click.
Action:
Apply the illustrationPreference from SettingsLib to the banner.

Bug: 190585192
Bug: 192413239
Test: manual test
Change-Id: I7d78804b4fa89735edfb73f01f31771821bcd8c2
2021-06-30 09:39:23 +00:00
Stanley Wang
cb3626eaf1 Merge "Update Adaptive connectivity page." into sc-dev am: 8cd20c0bb1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15142232

Change-Id: I9d2df7a84dd4bf2b2d9b368f4e8e78d2be3dcb28
2021-06-30 09:37:19 +00:00
Stanley Wang
8cd20c0bb1 Merge "Update Adaptive connectivity page." into sc-dev 2021-06-30 09:23:51 +00:00
Stanley Wang
e722fbe277 Update Adaptive connectivity page.
- Use MainSwitchPreference.
- Use the TopIntroPreference to display the summary.
- Use the IllustrationPreference to display the stastic
  illustration.
- Add new illustrations for adaptive connectivity.

Fix: 178673083
Test: robotest and test the switch preference manually
Change-Id: I2376f4433b61ce1d3da287de92660fbeea5dd64e
2021-06-30 16:12:17 +08:00
Wesley.CW Wang
f01c5cfa8e Update high usage tips string
Bug: 183689347
Test: make SettingsRoboTests
Change-Id: Id38c9a7e10827dcf72a0f5016723f51c8f119a98
2021-06-30 15:58:48 +08:00
Peter Wang
249c3677d3 Merge "Add a cancel string for ToggleSubscriptionDialog to handle Tamil translation" into sc-dev am: baecf00ce2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15140324

Change-Id: Id1c48c2db818bba69fcbf1e5766ed1dc9266edca
2021-06-30 06:55:01 +00:00
Peter Wang
baecf00ce2 Merge "Add a cancel string for ToggleSubscriptionDialog to handle Tamil translation" into sc-dev 2021-06-30 06:52:43 +00:00
TreeHugger Robot
e19759b6ab Merge "Password settings: Fix duplicate title" into sc-dev am: d8cd67b52d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15147962

Change-Id: I72a317e62bff33ea10ed93950cd927c7b1c9a101
2021-06-30 06:48:38 +00:00
TreeHugger Robot
d8cd67b52d Merge "Password settings: Fix duplicate title" into sc-dev 2021-06-30 06:35:33 +00:00
Stanley Wang
44a2f596e2 Change the illustration in one-hand mode page. am: 913fbf7e0c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15064552

Change-Id: I92aa51a281c60ec0a2931db206b3b17ee2901acb
2021-06-30 06:12:56 +00:00
Stanley Wang
913fbf7e0c Change the illustration in one-hand mode page.
- Different one-hand modes need to display different illustrations.

Fix: 191334556
Test: rebotest and see the UI
Change-Id: Id6edba40142e008c618fdb3536424edd2b77f9b0
2021-06-30 13:47:34 +08:00
PETER LIANG
6cf9f75c0a Merge "Replace the AnimatedImagePreference with IllustrationPreference." into sc-dev am: 1a77fce131
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15080037

Change-Id: Ied0fbfa9439b2731c973dc3444e4d3db62c9f96d
2021-06-30 00:48:40 +00:00
PETER LIANG
1a77fce131 Merge "Replace the AnimatedImagePreference with IllustrationPreference." into sc-dev 2021-06-30 00:38:20 +00:00
Ahaan Ugale
437c037830 Password settings: Fix duplicate title
For the autofill service settings, "Autofill service" is both the
section title and the preference title. This change removes the
duplicate preference title and promotes the app label from the summary
string to the title in its place.

Fix: 192403526
Test: manual - single profile, personal+work profile, change service and
 re-check
Change-Id: Ia012232ba2856e0757289982bc3045d948ff4aa8
2021-06-29 17:21:01 -07:00