Commit Graph

83626 Commits

Author SHA1 Message Date
TreeHugger Robot
1476c1a9e9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b475f57f13 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14822651

Change-Id: Ibd2912a6d73dd89bca96cef80fe65de083fd92e3
2021-06-03 19:35:34 +00:00
Bill Yi
fc601649d9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 79ef9e3fc8 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14807224

Change-Id: I89c120f2139d0025bc68f29c7867650d4f6f6ce8
2021-06-03 19:35:25 +00:00
TreeHugger Robot
9ed875897b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: bba877accb -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14807228

Change-Id: Ice81a271e5c6f70b86559ac1f174759a8d3d1f0b
2021-06-03 19:34:38 +00:00
TreeHugger Robot
37e8f3f696 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-06-03 19:26:07 +00:00
TreeHugger Robot
7221374cb4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 23e3a2b7f2 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14807226

Change-Id: I99c5a89b3fcf1769a90b84fb8fdaf2760eaba66c
2021-06-03 19:17:01 +00:00
Bill Yi
aaa1ec13a4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6df7694b57 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14807225

Change-Id: Id22fcec0a379548a7a8ab597ca60d9cf398a779c
2021-06-03 19:16:47 +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
23e3a2b7f2 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-06-03 19:01:32 +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
Chloris Kuo
1bb421e6e2 Merge "Fix flaky NotificationAssistantPreferenceControllerTest" into sc-dev am: 8f5ccfaef0 am: 511a2ceffa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14810398

Change-Id: I3feb82139f684ed0c9107102857caeef544b0399
2021-06-03 17:45:11 +00:00
Chloris Kuo
511a2ceffa Merge "Fix flaky NotificationAssistantPreferenceControllerTest" into sc-dev am: 8f5ccfaef0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14810398

Change-Id: I143807946ce9ad4591320aef21ed34b175e08faf
2021-06-03 17:42:33 +00:00
Chloris Kuo
c2a0a1c3ae Merge "Fix flaky NotificationAssistantPreferenceControllerTest" into sc-dev am: 8f5ccfaef0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14810398

Change-Id: Id6966bb3aa9ba661dc6241bf34199b3524126c58
2021-06-03 17:36:55 +00:00
Chloris Kuo
8f5ccfaef0 Merge "Fix flaky NotificationAssistantPreferenceControllerTest" into sc-dev 2021-06-03 17:29:59 +00:00
Abel Tesfaye
a44ce91272 Merge "Use list+ toggle on devices without face detection" into sc-dev am: 040e5ef894 am: 09ed6e8e29
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14040065

Change-Id: Id25985076f0dbb76c2744aa5833a35458046bffa
2021-06-03 17:19:24 +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
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
Julia Reynolds
c94f997a2f Fix broken test
Test: robotests
Fixes: 189352955
Change-Id: I31066a6fdd72e923369e613b656ffe767b3e3b5c
2021-06-03 10:52:18 -04: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
TreeHugger Robot
47f39928ee Merge "[Settings] Modify the ordering of mobile plan preference." into sc-dev am: 36c45e0ffd am: fb8d1ab61b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14819338

Change-Id: I2acfc5a8139a708dbd3acb642405bea5214be66b
2021-06-03 14:45:40 +00:00
Les Lee
54ef94eded Merge "wifi direct: Close the channel after leaving the Setting page" into sc-dev am: c48cf5ee37 am: 0c4c0e5e33
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14786728

Change-Id: I352a679b8e247c0215f8c5890f3a99e7fae23de3
2021-06-03 14:45:24 +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
4eb046c301 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia0c5f6521d4f9753287aeefae610ae6168ebac1a
2021-06-03 14:38:44 +00:00
Bill Yi
6df7694b57 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ie80bb50e4314ed1517c9cce073508f00232952bb
2021-06-03 14:35:21 +00:00
Bill Yi
79ef9e3fc8 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib0518e9fef6a8e2d3ed71fda6d3acd6a5f8553b2
2021-06-03 14:32:28 +00:00
Bill Yi
f79b09d2bd Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Id7cdf9e26a6376493b203dfb8d6eb7dd777af745
2021-06-03 14:29:03 +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
Les Lee
44149f10c9 Merge "wifi direct: Close the channel after leaving the Setting page" into sc-dev am: c48cf5ee37
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14786728

Change-Id: Ic42db18cbc727089259f13729c2d0553fcc8b7cb
2021-06-03 14:23:28 +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
Les Lee
0c4c0e5e33 Merge "wifi direct: Close the channel after leaving the Setting page" into sc-dev am: c48cf5ee37
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14786728

Change-Id: If754ac8946aa0e6faf3fba705b15b4fe1519c3ae
2021-06-03 14:22:10 +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
Les Lee
c48cf5ee37 Merge "wifi direct: Close the channel after leaving the Setting page" into sc-dev 2021-06-03 14:08:51 +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
Treehugger Robot
394f87fb3d [automerger skipped] Merge "Enable the clear credentials buttons when wifi keys are installed." am: 5f1034bce0 am: 2b98c25bcf -s ours am: 8e34fc722f -s ours
am skip reason: Merged-In I69828b64a7e3c707c27b4582d64ff0ddb863a4ff with SHA-1 fae7509721 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1725994

Change-Id: I61d0e3fc95ac7609109302c7ca9fa8db6f8347fd
2021-06-03 10:27:42 +00:00
TreeHugger Robot
7076e28e95 Merge "Fix broken test" into sc-dev am: f8641a4d86 am: 6ee940be8a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809883

Change-Id: I297b0cf052903f189788a08e60348b593bccddc4
2021-06-03 10:27:37 +00:00
Syaoran Kuo
de68d97f8f Merge "Adjuest battery saver component test for new logic" into sc-dev am: e4be9a7b62 am: 0278cde7ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14292665

Change-Id: I605edc87a9e26838bcc13f0fb48a40ac8473be47
2021-06-03 10:27:18 +00:00
Treehugger Robot
8e34fc722f [automerger skipped] Merge "Enable the clear credentials buttons when wifi keys are installed." am: 5f1034bce0 am: 2b98c25bcf -s ours
am skip reason: Merged-In I69828b64a7e3c707c27b4582d64ff0ddb863a4ff with SHA-1 fae7509721 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1725994

Change-Id: I8979806a6b599663c2eddc500bc9ca518ca16080
2021-06-03 10:26:13 +00:00
Yi-Ling Chuang
5b219a34ab Disable RecyclerView animation to fix the broken UI
RecyclerView has item animation by default. In this bug, RV animation
seems to be interrupted by the page transitions(Shared Axis), and so
items could not finish sliding to its position.

Hence, disable RV animation to fix it.

Fixes: 189720797
Test: Navigate to Mobile & Wifi usage page and see the normal UI.
Change-Id: I52920715ae4b63ef78a73fcb9c76c6d20f80e012
2021-06-03 18:12:07 +08:00
Treehugger Robot
2b98c25bcf Merge "Enable the clear credentials buttons when wifi keys are installed." am: 5f1034bce0
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1725994

Change-Id: I7a48bd13efccbb49ebd57ee298b7b71dd5410060
2021-06-03 10:10:25 +00:00
TreeHugger Robot
2d68db1cef Merge "Fix broken test" into sc-dev am: f8641a4d86
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809883

Change-Id: I2c3f66b65295549d17a8993f92903660eee2671e
2021-06-03 10:04:33 +00:00
Syaoran Kuo
40f15073b0 Merge "Adjuest battery saver component test for new logic" into sc-dev am: e4be9a7b62
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14292665

Change-Id: Iaa5b48938ada0766d31ea9f5b9952ef7e2ffbca6
2021-06-03 10:04:15 +00:00
TreeHugger Robot
6ee940be8a Merge "Fix broken test" into sc-dev am: f8641a4d86
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809883

Change-Id: I2196df639936515d02c2543f990494de91db8cee
2021-06-03 10:02:46 +00:00
Syaoran Kuo
0278cde7ed Merge "Adjuest battery saver component test for new logic" into sc-dev am: e4be9a7b62
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14292665

Change-Id: I231a64099acb408f5ae8e984274bcd8d279b2262
2021-06-03 10:02:16 +00:00
Treehugger Robot
5f1034bce0 Merge "Enable the clear credentials buttons when wifi keys are installed." 2021-06-03 09:56:49 +00:00
TreeHugger Robot
f8641a4d86 Merge "Fix broken test" into sc-dev 2021-06-03 09:55:08 +00:00
Syaoran Kuo
e4be9a7b62 Merge "Adjuest battery saver component test for new logic" into sc-dev 2021-06-03 09:42:43 +00:00