Commit Graph

83587 Commits

Author SHA1 Message Date
Quang Luong
7639f70132 Do not delay updating WifiEntries for first onWifiEntriesUpdated() am: ada75fbe7e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14846992

Change-Id: Ie311bf6f8ae2034b611f344b3d66fbefc848f5e6
2021-06-08 00:32:57 +00:00
Curtis Belmonte
15b30be39e 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: I4245c1e56b7e8de42251ab139c8302edec3c3662
2021-06-07 23:10:41 +00: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
Abel Tesfaye
443e1b4beb 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: Ibf6b611b7fa4b1a0a75c985b90a5f375fb1fc6c6
2021-06-07 17:25:20 +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
b03f1946c1 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: Icf370ce52002a252644003bcfbdbc45b7fa248c5
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
5e6d42bf1e 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: I7cda59b4e5fb02d850c735a2ebf86daf320ac8b7
2021-06-07 14:31:36 +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
326d9d2129 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: I5bfbbcf1c6567468b2bcd6aa87810b8de558f668
2021-06-07 13:56:02 +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
8cb77c6609 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: I92b4ab966f8958fdc18a3adb1e7e5b4a428b85e5
2021-06-07 11:06:48 +00:00
Yanting Yang
8b3f0e8d52 Merge "Update homepage summaries" into sc-dev 2021-06-07 10:55:08 +00:00
TreeHugger Robot
aba2346cb3 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: I1283432f102827b4e5bda55c0c89334523295f6a
2021-06-07 09:02:14 +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
a4dc97984f 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: Ia9b3cc366fa96ee2c60880d9d529708a3fdf7337
2021-06-07 08:19:03 +00:00
Stanley Wang
1d60ddea0c Merge "Update the Bubbles page." into sc-dev 2021-06-07 08:04:03 +00:00
TreeHugger Robot
b4968ee8b5 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: I435e86f2fd5aa3b60b4da0c75b5386802c50d16d
2021-06-07 08:00:10 +00: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
d5002c9bcc [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: If290b6ce4223b701f7aab6decc14fdfd4e9e6eea
2021-06-07 05:26:19 +00:00
Bill Yi
db6b29ab00 [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: I26d0f4af012c7d95d1d3cd0d0559d5d9ff57ff51
2021-06-07 05:26:10 +00:00
TreeHugger Robot
a3e8bf90e1 [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: I22e524750e4208a91d11abd8b1165e241a8effbf
2021-06-07 05:26:07 +00:00
Bill Yi
6bf5d879a4 [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: I6a42c5e5a60103c2cdcff7086fc1eda4695f8032
2021-06-07 05:25:52 +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
3dd0eb202d [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: I69e50ff0cd2ea931ad09a23a79f34444b9073188
2021-06-07 05:03:31 +00:00
TreeHugger Robot
145c80e0b5 [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: I1ce0465f8665eff6c26413cb928d95e55f35f756
2021-06-07 05:03:26 +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
77e6610566 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-06-07 04:58:17 +00:00
TreeHugger Robot
4a08c8498c Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-06-07 04:57:47 +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
Bill Yi
bb3b29aa23 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: If7d61282d38d4d53fd15c2a5d2d9b72777cd8375
2021-06-07 03:34:10 +00:00
Bill Yi
d5ad833f15 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia726dc7609d52ae736e34e5a3a5ef35f0f5104a0
2021-06-07 03:30:43 +00:00
Bill Yi
d132c6a8a3 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I388b68cdaf49c96b272e25d64434dc575cb717c6
2021-06-07 03:26:32 +00:00
Bill Yi
509a162ad5 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I7d3900e4010febbecd776f59089d71ae01456432
2021-06-07 03:22:51 +00:00
Bill Yi
9c88dc614f Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I11980069f072d9032b0ce1c2604f9a6d70910156
2021-06-07 03:19:35 +00:00
Bill Yi
3dbdb383ad Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I4ce0771c0f32c3419e9eba1271d11111106bfcde
2021-06-07 03:18:04 +00:00
Les Lee
9dabe5005c Merge "Usage Settings: Fix NPE when subscriberId is Null." into sc-dev am: 787685b2cc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14847052

Change-Id: I78ee71bfac73cbece7efe1c6fbaf91c2e03ae5ce
2021-06-07 02:53:41 +00:00
TreeHugger Robot
14cdceb10a Merge "Add key for StorageDashboardFragment" into sc-dev am: b734aa3f7f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14841816

Change-Id: I7a4e9eda41709d631c242355db63de5dcd61314e
2021-06-07 02:53:31 +00:00
Les Lee
787685b2cc Merge "Usage Settings: Fix NPE when subscriberId is Null." into sc-dev 2021-06-07 02:41:28 +00:00
TreeHugger Robot
b734aa3f7f Merge "Add key for StorageDashboardFragment" into sc-dev 2021-06-07 02:37:51 +00:00