Kevin Chyn
d0b69e24b1
Merge changes I490ad424,I92ae38b8,I5db49dd2 into sc-dev am: 4a0a03f0e4 am: e926e6757f am: c9ef612518
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14840764
Change-Id: I5f63620ddbcaf0856ad309080bf4908862461272
2021-06-05 00:12:58 +00:00
Kevin Chyn
c9ef612518
Merge changes I490ad424,I92ae38b8,I5db49dd2 into sc-dev am: 4a0a03f0e4 am: e926e6757f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14840764
Change-Id: Ifa515fe41d6c0ea2d94a9d4567b7da80a9625cb2
2021-06-04 23:58:19 +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 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
80d21be186
Merge "Fix NotificationAssistantPreferenceController constructor" into sc-dev am: f9bde76ab9 am: 7327a3426d am: e83a9465b2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14829751
Change-Id: Id7a47696bcdd5a3389e407833c9dda6189fb821f
2021-06-04 21:10:58 +00:00
Chloris Kuo
e83a9465b2
Merge "Fix NotificationAssistantPreferenceController constructor" into sc-dev am: f9bde76ab9 am: 7327a3426d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14829751
Change-Id: I4146ddd2a733f32aae801bcc2a2475054204276e
2021-06-04 20:55:40 +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
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
549dac0dc3
Merge "Storage Settings hides categories when loading" into sc-dev am: 03d4644673 am: 1a181a3239 am: e6c6db1f61
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14772155
Change-Id: I321a39dc2d76d16a8f4551f7e5157a0d1a1fc7b3
2021-06-04 12:04:29 +00:00
TreeHugger Robot
e6c6db1f61
Merge "Storage Settings hides categories when loading" into sc-dev am: 03d4644673 am: 1a181a3239
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14772155
Change-Id: Iaeae2fa4a87f76f86ca061306ac96915c5fdf9fd
2021-06-04 11:43:28 +00: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
TreeHugger Robot
3214921966
Merge "Fix phishing attacks over Bluetooth due to unclear warning message" into sc-dev am: 367fe0eae0 am: da161056df am: 528cd80fb4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809886
Change-Id: Iaa0e167df5e27023e82108621d8dd9af5c3e6f90
2021-06-04 06:58:15 +00:00
Arc Wang
f70ef2f826
Merge "Set font size 20 for StorageItemPreference" into sc-dev am: 466be8d6fe am: b8940dc2c1 am: 990656ee7e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14831293
Change-Id: I1b2ba3d060de5c18d83bc881abdc91e577cd6d0f
2021-06-04 06:58:08 +00:00
TreeHugger Robot
648a638343
Merge "Fix phishing attacks over Bluetooth due to unclear warning message" into sc-dev am: 367fe0eae0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809886
Change-Id: I6480bccc251cc6577f113b2a5152a19572fca416
2021-06-04 06:29:50 +00:00
Arc Wang
0879f52360
Merge "Set font size 20 for StorageItemPreference" into sc-dev am: 466be8d6fe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14831293
Change-Id: Ibff01d4d28144eb40a92ae6e1d532c834344a296
2021-06-04 06:29:45 +00:00
TreeHugger Robot
da161056df
Merge "Fix phishing attacks over Bluetooth due to unclear warning message" into sc-dev am: 367fe0eae0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809886
Change-Id: I04e4a269da323bbf06a2ecca565113f1468a6c36
2021-06-04 06:25:15 +00:00
Arc Wang
b8940dc2c1
Merge "Set font size 20 for StorageItemPreference" into sc-dev am: 466be8d6fe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14831293
Change-Id: I95d071c983cbeba702d53ab0716a8ad3ba57e4c0
2021-06-04 06:25:09 +00:00
TreeHugger Robot
367fe0eae0
Merge "Fix phishing attacks over Bluetooth due to unclear warning message" into sc-dev
2021-06-04 06:17:01 +00:00
Arc Wang
466be8d6fe
Merge "Set font size 20 for StorageItemPreference" into sc-dev
2021-06-04 04:06:08 +00:00
Arc Wang
51b3e7a093
Storage Settings hides categories when loading
...
To hide sorting animation.
- Storage Settings always loads cache and updates UI, then
loads storage size and updates UI.
Remove the chche design because storage category preferences
will hide during loading, it no meaning to load from cache
and update UI.
- Hides loading circle before storage category preferences
become visible, it prevents flickers.
- Remove Calculating... summary of StorageItemPreference.
- Private storage category preferences and secondary user
preference become visible at
StorageItemPreferenceController#onLoadFinished.
Bug: 188731179
Bug: 185547228
Bug: 188615591
Test: atest com.android.settings.deviceinfo
atest com.android.settings.deviceinfo.storage
make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.deviceinfo
make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.deviceinfo.storage
manual visual
Change-Id: I3ebef5829ef4f806add07f58fa02520804768be5
2021-06-04 11:50:12 +08:00
Arc Wang
578affca57
Set font size 20 for StorageItemPreference
...
To improve UX.
Bug: 189390237
Test: manual visual
Change-Id: Ice40b7c8c86f7f4c220d43fd7f4a035e6160e50d
2021-06-04 10:45:36 +08:00
TreeHugger Robot
4a3da4a2f2
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-06-03 19:29:35 +00:00
TreeHugger Robot
b475f57f13
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-06-03 19:09:39 +00:00
TreeHugger Robot
bba877accb
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-06-03 19:07:07 +00:00
TreeHugger Robot
dd8f1b8365
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-06-03 19:04:58 +00:00
TreeHugger Robot
5753862c9e
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-06-03 18:51:21 +00:00
TreeHugger Robot
f189c24095
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-06-03 18:49:21 +00:00
Abel Tesfaye
f3cb092d6d
Merge "Use list+ toggle on devices without face detection" into sc-dev am: 040e5ef894 am: 09ed6e8e29 am: a44ce91272
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14040065
Change-Id: Ifde0dcd5fa3cebe535d2f305c077642b265d51f2
2021-06-03 17:33:59 +00:00
Abel Tesfaye
084d9f864b
Merge "Use list+ toggle on devices without face detection" into sc-dev am: 040e5ef894
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14040065
Change-Id: I99312fa02d58f7aff05b38c8d804635e814c2f85
2021-06-03 16:56:50 +00:00
Abel Tesfaye
09ed6e8e29
Merge "Use list+ toggle on devices without face detection" into sc-dev am: 040e5ef894
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14040065
Change-Id: Ia50dc8db66f913e916bc43a82ce010d0be0793c7
2021-06-03 16:52:43 +00:00
Abel Tesfaye
040e5ef894
Merge "Use list+ toggle on devices without face detection" into sc-dev
2021-06-03 16:40:58 +00:00
TreeHugger Robot
761dc36e53
Merge "[Settings] Modify the ordering of mobile plan preference." into sc-dev am: 36c45e0ffd am: fb8d1ab61b am: 47f39928ee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14819338
Change-Id: If3eb1c95f6d85a24044a4c0404da8df0660f4fc6
2021-06-03 15:08:14 +00:00
Bill Yi
63d431cc10
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1966dd5e76cefd8e8f0677baed1f126e0e6eb2af
2021-06-03 14:55:46 +00:00
Bill Yi
fd3f0ca4e3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib26a56ed3bcfccc0790194113da3691d499f11b8
2021-06-03 14:51:55 +00:00
Bill Yi
4f1e0067d9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I126614a40aceddc4dc59f7a34f19a1200a3088ea
2021-06-03 14:48:08 +00:00
Bill Yi
6dece1ee8e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I57219c7709c527cc09d1289a9b15f10ca93b1bea
2021-06-03 14:44:41 +00:00
Bill Yi
6fbb03b185
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I74332e7a4c547a586f7a8a18fff4576de67a0c5a
2021-06-03 14:43:05 +00:00
Bill Yi
11d9d5023f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ibd401397fed86b685cc30f9c0b6d5216ae8abd5c
2021-06-03 14:41:35 +00:00
TreeHugger Robot
d4d5f05a99
Merge "[Settings] Modify the ordering of mobile plan preference." into sc-dev am: 36c45e0ffd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14819338
Change-Id: I59fb897332b5cd4a4654208c42a01a38f94ef698
2021-06-03 14:24:18 +00:00
TreeHugger Robot
fb8d1ab61b
Merge "[Settings] Modify the ordering of mobile plan preference." into sc-dev am: 36c45e0ffd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14819338
Change-Id: I08afbbf499563ef1fa818fbf4a10cbc2a951c244
2021-06-03 14:22:19 +00:00
TreeHugger Robot
36c45e0ffd
Merge "[Settings] Modify the ordering of mobile plan preference." into sc-dev
2021-06-03 14:09:08 +00:00
Zoey Chen
3251ab68f9
[Settings] Modify the ordering of mobile plan preference.
...
Bug: 189409514
Test: make
Change-Id: I76a04b9c38ead0e3b9a2a4a21b50660caa15632b
2021-06-03 20:02:01 +08:00
Galia Peycheva
7d2c0454f6
Merge "Use SettingsLib string for blur developer option" into sc-dev am: 33a9f49892 am: 175a8661bd am: 429875ad4f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788507
Change-Id: I7fab7b07823a9e4e66c5f1f073a6bde240b1b90c
2021-06-03 09:47:59 +00:00
Galia Peycheva
ce064482cd
Merge "Use SettingsLib string for blur developer option" into sc-dev am: 33a9f49892
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788507
Change-Id: I03bbc5361392321d43c7d6eb1873df384a29d8ad
2021-06-03 09:32:06 +00:00
Galia Peycheva
175a8661bd
Merge "Use SettingsLib string for blur developer option" into sc-dev am: 33a9f49892
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788507
Change-Id: Ib994e20ef6e0c23f6270a3d224a38bbbe1efd79b
2021-06-03 09:31:00 +00:00