Commit Graph

82761 Commits

Author SHA1 Message Date
TreeHugger Robot
a96f90a882 Merge "Update string reference" into sc-dev am: df0a84f08a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14831291

Change-Id: I20a77c12b58c4c91945ca488780bcb8307050070
2021-06-08 02:54:01 +00:00
TreeHugger Robot
df0a84f08a Merge "Update string reference" into sc-dev 2021-06-08 02:49:07 +00:00
Betty Chang
bf23b43c87 Merge "Remove extra space under "Wi-Fi hotspot" option" into sc-dev am: e07e36f609
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14841815

Change-Id: I5ddb7cc46b87cc038f7f1d603d7eaf5688a9e701
2021-06-08 02:48:31 +00:00
Betty Chang
e07e36f609 Merge "Remove extra space under "Wi-Fi hotspot" option" into sc-dev 2021-06-08 02:31:52 +00:00
Curtis Belmonte
b90d6efe53 Merge "Set background of all face enroll status/footer bars" into sc-dev am: 58864ddc54
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14886676

Change-Id: Ibde1dd02809623e7927864da440c0ee767777101
2021-06-08 02:23:54 +00:00
Curtis Belmonte
58864ddc54 Merge "Set background of all face enroll status/footer bars" into sc-dev 2021-06-08 02:06:55 +00:00
Yanting Yang
9a58d15db6 Merge "Log class name to detect page scroll jank" into sc-dev am: 20177f9b09
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14860444

Change-Id: I996dcf082e9fa2adeaf0ee0ca5fd8eb19dab5379
2021-06-08 01:57:12 +00:00
Yanting Yang
20177f9b09 Merge "Log class name to detect page scroll jank" into sc-dev 2021-06-08 01:34:45 +00:00
Quang Luong
bd79d37bdf Merge changes from topic "StaleWifiEntries" into sc-dev am: 08e42fa917
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14882873

Change-Id: I3f1dfc689e63c0401c9ebcc76d3a4e347a9bb2f0
2021-06-08 00:32:37 +00:00
Quang Luong
08e42fa917 Merge changes from topic "StaleWifiEntries" into sc-dev
* changes:
  Add 6 GHz Wifi band to Wifi Network Details
  Do not delay updating WifiEntries for first onWifiEntriesUpdated()
2021-06-08 00:12:05 +00:00
Curtis Belmonte
ff3401a161 Merge "Apply SUW theme to add/remove button in face settings" into sc-dev am: 2968c05f31
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14885640

Change-Id: I204dca79c1c1204f9b5f6863d8c440746a19dadc
2021-06-07 23:10:17 +00:00
Curtis Belmonte
f13d5d5344 Set background of all face enroll status/footer bars
Moves the logic for setting an explicit background on the status and
footer bars shown during face and fingerprint enrollment from
BiometricEnrollIntroduction to BiometricEnrollBase. This ensures that
the status and footer bars on all biometric enroll screens will have
their backgrounds set, preventing the screen content from showing
through.

Test: Manual

Fixes: 190138494
Change-Id: If5050d07d277f51c784daecf80d5e3cdeae0ba49
2021-06-07 15:54:26 -07:00
Curtis Belmonte
2968c05f31 Merge "Apply SUW theme to add/remove button in face settings" into sc-dev 2021-06-07 22:49:52 +00:00
Curtis Belmonte
7dbe83ef5a Apply SUW theme to add/remove button in face settings
Update the button to "Set up Face Unlock" or "Delete face model" shown
on the Face Unlock Settings screen to match the primary button theme
used in Setup Wizard.

Test: Manual

Fixes: 190422391
Change-Id: Ib864cb53f366eec7d1a69c2808d7effc8a0aa05a
2021-06-07 14:02:58 -07:00
Quang Luong
1c7ba38627 Add 6 GHz Wifi band to Wifi Network Details
Display 6 GHz for the frequency pref in Wifi Network Details
when connected to a 6 GHz network.

Bug: 184170532
Test: build
Change-Id: I7d10fe0e4c95e6f0ec66c3a179c3c46828eeb545
2021-06-07 11:30:07 -07:00
Abel Tesfaye
26c9a050da Merge "Fix for Smart auto rotate text summary not updating after QS toggle is modified" into sc-dev am: c89b3afef5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14830095

Change-Id: I3a90e04d82ce0c22677c18d6e5a85620b9b910a9
2021-06-07 17:25:31 +00:00
Abel Tesfaye
c89b3afef5 Merge "Fix for Smart auto rotate text summary not updating after QS toggle is modified" into sc-dev 2021-06-07 17:11:13 +00:00
Julia Reynolds
68b08c590f Merge changes I31066a6f,I081cea0d into sc-dev am: 6d6280c634
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14822912

Change-Id: Icf9f2f46688689962e93f7063160e5beddbfbdd2
2021-06-07 15:08:17 +00:00
Julia Reynolds
6d6280c634 Merge changes I31066a6f,I081cea0d into sc-dev
* changes:
  Fix broken test
  Updates to conversation page
2021-06-07 14:50:00 +00:00
Matt Casey
45ea44c464 Merge "Fix typo in setting description." into sc-dev am: bd1c4e5fa1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14843842

Change-Id: I30946a38d48603f756438096ac9a7de4418d0a0b
2021-06-07 14:29:28 +00:00
Matt Casey
bd1c4e5fa1 Merge "Fix typo in setting description." into sc-dev 2021-06-07 14:17:15 +00:00
Matt Casey
7364e42f74 Fix typo in setting description.
Repeated word

Test: None
Bug: 179673792
Change-Id: Iee75c37fce90e1c05f651d741374029c213fa0f0
2021-06-07 14:17:03 +00:00
TreeHugger Robot
74eb92ea6f Merge "Revert DND toggle back to a button" into sc-dev am: 5484fd3060
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14801370

Change-Id: Ic6b224330480d9da7aae61d69b0720fe9bf15f65
2021-06-07 13:55:22 +00:00
TreeHugger Robot
5484fd3060 Merge "Revert DND toggle back to a button" into sc-dev 2021-06-07 13:40:54 +00:00
Yanting Yang
1fcebc0c64 Merge "Update homepage summaries" into sc-dev am: 8b3f0e8d52
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14847059

Change-Id: Ifc08e310a1fdec0f443e368082c46f66c1b779c2
2021-06-07 11:04:39 +00:00
Yanting Yang
8b3f0e8d52 Merge "Update homepage summaries" into sc-dev 2021-06-07 10:55:08 +00:00
TreeHugger Robot
267c7eb473 Merge "Rename Wi-Fi switch controller's key" into sc-dev am: d29e28ed5b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14878870

Change-Id: I8b0c5bc5132c84ab5c21b0490ea86f9dffbce35e
2021-06-07 09:02:08 +00:00
TreeHugger Robot
d29e28ed5b Merge "Rename Wi-Fi switch controller's key" into sc-dev 2021-06-07 08:48:37 +00:00
Stanley Wang
13fe2c79f3 Merge "Update the Bubbles page." into sc-dev am: 1d60ddea0c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809882

Change-Id: Idfe8951bace3d2b1f244f283f7eb4a78b7726ccc
2021-06-07 08:16:47 +00:00
Stanley Wang
1d60ddea0c Merge "Update the Bubbles page." into sc-dev 2021-06-07 08:04:03 +00:00
TreeHugger Robot
8c3f175a04 Merge "Increase the maximum height of panel fragment" into sc-dev am: 8fdc0b9d32
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14841827

Change-Id: I29ee837a1674349c1db05f254808879572d84521
2021-06-07 07:57:52 +00:00
Yanting Yang
e7fbe489d1 Log class name to detect page scroll jank
Bug: 187306869
Test: robotests & take the trace and see the cuj section name

Change-Id: Idbaa62e764323f8c35c101caf2961b6c853c440f
2021-06-07 15:53:20 +08:00
TreeHugger Robot
8fdc0b9d32 Merge "Increase the maximum height of panel fragment" into sc-dev 2021-06-07 07:38:45 +00:00
Jason Chiu
fe01ecc052 Rename Wi-Fi switch controller's key
Leverage the key of WifiPrimarySwitchPreferenceController for Settings
Search mapping it to the slice

Bug: 186181785
Test: manual, robotest
Change-Id: I1372afff93f01505c377e94b648e6f8dcbbafe54
2021-06-07 15:08:59 +08:00
TreeHugger Robot
15c2908341 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: ffe95b65ac -s ours am: a9db8202d9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idebfcfaae1f45709d6b855024a355bff18670ba0
2021-06-07 05:26:31 +00:00
Bill Yi
414f5a5bc2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 509a162ad5 -s ours am: a9a64b88e1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1659ab807e61c0e7bef294edfe1d9ab6b62f13af
2021-06-07 05:26:22 +00:00
TreeHugger Robot
6234cb9bb0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 020cfbe13a -s ours am: 01b5d0f9cf -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0e9cfd07cc8558d58c53c1a8f2343b3606e0ff49
2021-06-07 05:26:18 +00:00
Bill Yi
fa04d42538 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bb3b29aa23 -s ours am: 7631c9584f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9f2a30c74f74d018bd98c6497a39bddacdfd43ac
2021-06-07 05:25:59 +00:00
TreeHugger Robot
a9db8202d9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: ffe95b65ac -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7adc5c672a38c1b07b55ff03d6662663ed90e01b
2021-06-07 05:11:25 +00:00
Bill Yi
a9a64b88e1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 509a162ad5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I833da58640937b3edc375d5e9536c94640b719b0
2021-06-07 05:11:15 +00:00
TreeHugger Robot
01b5d0f9cf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 020cfbe13a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I64054be30d69da41dc6f388f5ef06775c65982a4
2021-06-07 05:10:49 +00:00
Bill Yi
7631c9584f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bb3b29aa23 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie51e277df3358d1d8f1fa15d7880e4b4c816a5fc
2021-06-07 05:10:38 +00:00
TreeHugger Robot
e7c366b593 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 17c5234bca -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2e76deded056a234b0ed6a75095f3d6476a86fea
2021-06-07 05:03:45 +00:00
TreeHugger Robot
85bf9b8597 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0f95249651 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idcf1e4a63837ae0f5e07032ab9583aa42af35d1d
2021-06-07 05:03:25 +00:00
TreeHugger Robot
ffe95b65ac Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-06-07 04:58:39 +00:00
TreeHugger Robot
020cfbe13a Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-06-07 04:57:07 +00:00
TreeHugger Robot
17c5234bca Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-07 04:46:26 +00:00
TreeHugger Robot
0f95249651 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-07 04:42:56 +00:00
Bill Yi
ad2c686b48 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I0ce668c4a4c8f7f14cd0173645350fd3318163c9
2021-06-07 03:47:17 +00:00
Bill Yi
a4bf78bdd9 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ife555b09b530f7960547bdf0e715819f42fd2e3f
2021-06-07 03:38:35 +00:00