Stanley Wang
d19ad8e565
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: I4873e2b15c26b9348c43cfaa383d8e62fb5b35bc
2021-06-07 08:08:00 +00:00
Stanley Wang
1d60ddea0c
Merge "Update the Bubbles page." into sc-dev
2021-06-07 08:04:03 +00:00
TreeHugger Robot
b9041286aa
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: I63c367f653a1c85a238cd8d1fd442bb460eb2f7e
2021-06-07 08:01:42 +00:00
TreeHugger Robot
8fdc0b9d32
Merge "Increase the maximum height of panel fragment" into sc-dev
2021-06-07 07:38:45 +00:00
TreeHugger Robot
e605b8d705
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-06-07 06:58:25 +00:00
TreeHugger Robot
f127ff7be0
[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: I0da5b4402095b9b48c648527c5bc44e4b1f19063
2021-06-07 05:27:59 +00:00
Bill Yi
c1baa56445
[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: I656fb0d040d00a8ea03bf918b6ee7e4395ee0930
2021-06-07 05:27:52 +00:00
TreeHugger Robot
64f45aff8e
[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: I52dd881854e565fb60c7d0d369a171d6e1525f54
2021-06-07 05:27:30 +00:00
Bill Yi
f1236b1743
[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: I47dede8fa3b1b05facb38bffe5ecb5d40997dafa
2021-06-07 05:27:18 +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
7663ae6f6b
[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: I0017fe2f9f98708926062ddc758ee77d45cfd63b
2021-06-07 05:05:23 +00:00
TreeHugger Robot
946f0b1fe4
[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: I5ea51a631ebd43488e5a6a74feb0ce072b07fd40
2021-06-07 05:05:05 +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
TreeHugger Robot
f10272ddc4
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-06-07 04:35:59 +00:00
Bill Yi
d1c2769b54
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib08bd8483d4ae26f48b03aadf242055da9b6bad9
2021-06-07 03:51:05 +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
efffd6f45b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I18003e4dadc5ac398986ed0fe72cb5824c4e2097
2021-06-07 03:40:02 +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
dedd647b97
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: I425454a57490bdb44ebbd01dbf35cc48fba94762
2021-06-07 02:55:56 +00:00
TreeHugger Robot
297c48d04d
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: I2705f11283e98901896144c7fcd4710700f1bfe2
2021-06-07 02:55:20 +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
71c447494a
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: I690efa597ac55bb601d7bf2608ee3e8b56d6e045
2021-06-04 23:44:09 +00:00
Kevin Chyn
e926e6757f
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: I301973cb4053811181a9c7564e739317fa8c45b8
2021-06-04 23:44:01 +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
7327a3426d
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: I7369b7103d64a354574ae87dbc2eecb01788029a
2021-06-04 20:41:33 +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
e84551c9d4
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: I7abd4ab0af12f4cbb7a7ff30995a2ccea968fefe
2021-06-04 18:43:58 +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
1a181a3239
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: I998d4981c82300ae92134f9fd71d6dded45af483
2021-06-04 11:30:19 +00:00
TreeHugger Robot
03d4644673
Merge "Storage Settings hides categories when loading" into sc-dev
2021-06-04 11:09:01 +00:00
Stanley Wang
a608284e61
Merge "Fix NPE in SettingsMainSwitchPreference." into sc-dev am: d9aa0b070f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14831309
Change-Id: I06bd1f7f4d1e5700750640953e3b6a11ae1c6b0d
2021-06-04 10:14:39 +00:00
TreeHugger Robot
9aa430c23e
Merge "Apply sliding transition to biometric settings" into sc-dev am: 7f13b83ef1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14819341
Change-Id: I1a51f38d48b7afdbb5f527cea2cff95df0d93e85
2021-06-04 10:14:34 +00:00