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
c534a58163
Update system settings to honor device defaults for assistant invocation
...
Bug: 190186067
Change-Id: Ie3b46a79ee73feb677ce2e6e549864a1919a662c
2021-06-07 10:19:28 -04: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
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
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
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
d0745b39b6
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: Ibb93d30549d00dc7cd85f2d17332d27dcab5657a
2021-06-07 02:51:30 +00:00
TreeHugger Robot
cb0a247abf
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: Ife95f2185be80d42d377aebcfd2cfce0be97005a
2021-06-07 02:51:11 +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
Yanting Yang
3e2313e958
Update homepage summaries
...
- Network & internet
- Connected devices
- Display
- Wallpaper & style
- Accessibility
- Tips & support
- Also clear the redundant codes and tests.
Fixes: 183642373
Fixes: 189981034
Fixes: 190011428
Fixes: 190015037
Test: robotests & visual
Change-Id: Ide19fa5aff67e093d86b259c5e7a307b9ad37550
2021-06-06 12:28:03 +08:00
Les Lee
204f0215da
Usage Settings: Fix NPE when subscriberId is Null.
...
For mobile, a old API: buildTemplateMobileAll doesn't includes the
merged wifi network, call the new API: buildTemplateCarrierMetered
to replace the old one.
But new API: buildTemplateCarrierMetered requires non-null subscriberId.
Call old API: buildTemplateMobileAll when subscriberId is NULL since
the matched result is always empty when subscriberId is NULL. No any different
between buildTemplateCarrierMetered and buildTemplateMobileAll.
Bug: 190233044
Bug: 190135429
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SettingsDumpServiceTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageLibTest
Change-Id: Ic6dada8260029e47e044d016ebc701c25dbf9b2a
2021-06-05 03:14:18 +00:00
Kevin Han
cbc3c1780d
Merge "Move unused apps count calculation to bg thread" into sc-dev am: 603cd6c44c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14795269
Change-Id: I0aacb5fd54793c53b7f5ca15cbfb16128a7d6e80
2021-06-04 23:41:35 +00:00
Kevin Chyn
0a8fcd8fe9
Merge changes I490ad424,I92ae38b8,I5db49dd2 into sc-dev am: 4a0a03f0e4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14840764
Change-Id: Id795687f5bc58a57a75f8222030f220a46f1988b
2021-06-04 23:41:23 +00:00
Kevin Han
603cd6c44c
Merge "Move unused apps count calculation to bg thread" into sc-dev
2021-06-04 23:35:55 +00:00
Kevin Chyn
4a0a03f0e4
Merge changes I490ad424,I92ae38b8,I5db49dd2 into sc-dev
...
* changes:
Update fingerprint/face enrollment to lock icon
Update fingerprint intro drawable
Remove SUW-specific fingerprint enroll description
2021-06-04 23:26:19 +00:00
Quang Luong
ada75fbe7e
Do not delay updating WifiEntries for first onWifiEntriesUpdated()
...
The first callback of onWifiEntriesUpdated() after an onStart() should
update the list of WifiEntries without a delay. The callbacks afterwards
should remain delayed to show the progress bar.
Bug: 187473420
Test: build, visual inspection of entries being updated
Change-Id: Ie11ac156673b261157411e4d6216c454266b51a9
2021-06-04 14:08:26 -07:00
Chloris Kuo
d07a484c46
Merge "Fix NotificationAssistantPreferenceController constructor" into sc-dev am: f9bde76ab9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14829751
Change-Id: I02e0e2ff3b9d6012a3ada8b215f79eec4e844c3b
2021-06-04 20:39:39 +00:00
Chloris Kuo
f9bde76ab9
Merge "Fix NotificationAssistantPreferenceController constructor" into sc-dev
2021-06-04 20:27:46 +00:00