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
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
c22daa064e
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: Ibbd8e71e04b746b6585c4d31adfbeb35992f939a
2021-06-04 23:42:26 +00:00
Kevin Chyn
81b9af18cd
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: I5570bde4923eb68e2e2f4c5fe3314708af0dd550
2021-06-04 23:42:22 +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
Chloris Kuo
1eccd6da65
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: Ia21e1152e45625d4ef4890b0559804c18a513b4a
2021-06-04 20:39:51 +00:00
Chloris Kuo
f9bde76ab9
Merge "Fix NotificationAssistantPreferenceController constructor" into sc-dev
2021-06-04 20:27:46 +00:00
Kevin Chyn
ade59af392
Update fingerprint/face enrollment to lock icon
...
Bug: 187460696
Test: manual
Change-Id: I490ad4246e54ed4ae2e8539e8e9eabba1ccecff6
2021-06-04 12:49:31 -07:00
Kevin Chyn
3e27fd8752
Update fingerprint intro drawable
...
Bug: 187460696
Test: manual
Change-Id: I92ae38b8851be1e1ad91c9723264249424b9078d
2021-06-04 12:49:23 -07:00
Kevin Chyn
47257c05c8
Remove SUW-specific fingerprint enroll description
...
Bug: b/187460696
Test: adb shell am start -n com.google.android.setupwizard/.SetupWizardTestActivity
Change-Id: I5db49dd27439445aae9819dbdd0728ac5c02f0cd
2021-06-04 12:47:35 -07:00
TreeHugger Robot
b767671a45
Merge "Fix LifecycleObserver implementation in SmartAutoRotateBatterySaverController" into sc-dev am: 8d9d889a8e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14628750
Change-Id: I825bab7e1f98b80f4acaa89f4b9624b4ca9444d3
2021-06-04 18:42:24 +00:00
Chloris Kuo
5028e6e6a6
Fix NotificationAssistantPreferenceController constructor
...
Fix flaky test due to the constructor must either only take Context, or
(Context, String).
Bug: 187998873
Test: CodeInspectionTest, NotificationAssistantPreferenceControllerTest
Change-Id: Ie383ea6773afda05adfb7aa9d7de9e27676f6b29
2021-06-04 11:39:36 -07:00
TreeHugger Robot
8d9d889a8e
Merge "Fix LifecycleObserver implementation in SmartAutoRotateBatterySaverController" into sc-dev
2021-06-04 18:31:03 +00:00
Weng Su
e7124d8cb1
Increase the maximum height of panel fragment
...
- Need to increase the panel size to show more slice rows
Bug: 189912933
Test: manual test
make RunSettingsRoboTests
Change-Id: I35e2933b4df25e84928d21493a2fc3754bf064fb
2021-06-04 21:31:11 +08:00
TreeHugger Robot
60a0b58c6a
Merge "Storage Settings hides categories when loading" into sc-dev am: 03d4644673
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14772155
Change-Id: I0649f0efeb1cfde02031534c7715b312134d2dc5
2021-06-04 11:28:41 +00:00