TreeHugger Robot
06f88f8368
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: I51a442a235f2e9fd485d2d5b88c62dc56c2f4ac6
2021-06-03 14:23:48 +00:00
Les Lee
fe09f24058
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: I58503a02ee57f7884dad7c51cb3f18012747ce17
2021-06-03 14:23:28 +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
24c377d097
[automerger skipped] Merge "Enable the clear credentials buttons when wifi keys are installed." am: 5f1034bce0
am: 2b98c25bcf
-s ours am: 8e34fc722f
-s ours am: 394f87fb3d
-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: Iac93802bafe3b79c0c9b6be2b362307cd77a6466
2021-06-03 11:00:27 +00:00
TreeHugger Robot
80086988aa
Merge "Fix broken test" into sc-dev am: f8641a4d86
am: 6ee940be8a
am: 7076e28e95
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809883
Change-Id: Ifee98512336878eb1f315db0d7615ade7c6c4b4b
2021-06-03 11:00:19 +00:00
Syaoran Kuo
3c845b402a
Merge "Adjuest battery saver component test for new logic" into sc-dev am: e4be9a7b62
am: 0278cde7ed
am: de68d97f8f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14292665
Change-Id: Ic1757ac4beeac0226058ff0ffe85bd5200cc8c51
2021-06-03 11:00:01 +00: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
2a87d48741
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: I0f2c1b8b3fdb3eb8cc152490b13938b30f5c4642
2021-06-03 10:02:51 +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
d6d1e6946c
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: I26b57760dc23e58043695947921c95e6e80bf117
2021-06-03 10:02:32 +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
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
Syaoran Kuo
e4be9a7b62
Merge "Adjuest battery saver component test for new logic" into sc-dev
2021-06-03 09:42:43 +00:00
Stanley Wang
73a61a80b6
Update the Bubbles page.
...
- Update the MainSwitch title.
- Add the TopIntroPreference to show the description.
- Use the IllustrationPreference to display the Lottie
illustration.
Fix: 187418760
Test: robotest and see the UI
Change-Id: Ie5ce6ba7fbded065677e7e0697f3c525d97ee2d8
2021-06-03 17:41:26 +08:00
Les Lee
249de94dea
Merge "wifi: Use new API for data usage function" am: c0245bb982
am: 38f9e01f84
am: 88684d39c9
am: d654827f82
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1697487
Change-Id: I2180593befc40f41a83bbb791d19403e0688ab4c
2021-06-03 09:34:29 +00:00
Galia Peycheva
429875ad4f
Merge "Use SettingsLib string for blur developer option" into sc-dev am: 33a9f49892
am: 175a8661bd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788507
Change-Id: I78bce7edb11eb15b037dd6af2f3a1a6bf8a3cb5a
2021-06-03 09:32:13 +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
Galia Peycheva
7d25b50b2c
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: I4e5fe8e199fee7e6e05eea39679acb9dc964ac25
2021-06-03 09:30:54 +00:00
Les Lee
d654827f82
Merge "wifi: Use new API for data usage function" am: c0245bb982
am: 38f9e01f84
am: 88684d39c9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1697487
Change-Id: If11a87d067d7044043dd92eaa253d3ba152e2a67
2021-06-03 09:26:08 +00:00
Les Lee
88684d39c9
Merge "wifi: Use new API for data usage function" am: c0245bb982
am: 38f9e01f84
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1697487
Change-Id: Ib58a8e48d74ff56ff28859dd635b758762934617
2021-06-03 09:14:20 +00:00
Galia Peycheva
33a9f49892
Merge "Use SettingsLib string for blur developer option" into sc-dev
2021-06-03 09:12:36 +00:00
YUKAI HUNG
c736e56822
Merge "Remove missed added testing locale to cause flaky" into sc-dev am: fa476aef12
am: f1864c0efb
am: e4144d397e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809876
Change-Id: I11ba01c1dc7456c2eb568f95ba29d7611e2bf6da
2021-06-03 09:04:20 +00:00
YUKAI HUNG
e4144d397e
Merge "Remove missed added testing locale to cause flaky" into sc-dev am: fa476aef12
am: f1864c0efb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809876
Change-Id: I52fbbda3a116c3de86fec1f438c1004d177e6745
2021-06-03 08:43:22 +00:00
Hugh Chen
10e4599219
Fix phishing attacks over Bluetooth due to unclear warning message
...
This CL add more prompts presented for users to avoid phishing attacks.
Screenshot:
https://screenshot.googleplex.com/p5PZbphN46ddPFV.png
https://screenshot.googleplex.com/6Q2wKfPbNQmTtx8.png
https://screenshot.googleplex.com/987VpYgNUZL2K4T.png
https://screenshot.googleplex.com/9eVg6SAGScVXU8U.png
Bug: 167403112
Test: manually test
Change-Id: Iadec059b662fd91754ad573bbe688702cdd3c9af
2021-06-03 16:42:09 +08:00
YUKAI HUNG
83d97a9e1c
Merge "Remove missed added testing locale to cause flaky" into sc-dev am: fa476aef12
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809876
Change-Id: I23bc6382dbe300689347f6397411e04b15e9dee9
2021-06-03 08:21:00 +00:00
YUKAI HUNG
8a7e4b9ed0
Merge "Remove missed added testing locale to cause flaky" into sc-dev am: fa476aef12
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809876
Change-Id: Iad303c040bdf806760267e64bf767b1bca2802db
2021-06-03 08:19:20 +00:00
Les Lee
38f9e01f84
Merge "wifi: Use new API for data usage function" am: c0245bb982
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1697487
Change-Id: I24ba0a9ea96c9d0ff63b691f10a07b900cbbd399
2021-06-03 08:18:16 +00:00
YUKAI HUNG
f1864c0efb
Merge "Remove missed added testing locale to cause flaky" into sc-dev am: fa476aef12
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809876
Change-Id: I61002511a174b39d69fe6580c4ade4c737bc7d1c
2021-06-03 08:17:20 +00:00
Tsung-Mao Fang
0b9ce16c13
Fix broken test
...
Fix: 190017630
Test: robo test
Change-Id: I46978a3f3d3d564cd9fcabad47edf6907d4e4966
2021-06-03 16:10:36 +08:00
Betty Chang
ca0f312276
Merge "[GAR] Set the correct color and style to panel UI" into sc-dev am: 5b23f3b923
am: 58e04237c8
am: 2984c85600
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14800153
Change-Id: Ic5fb17ba015e659eff67625946c74cfe307a027c
2021-06-03 07:52:08 +00:00
Betty Chang
d15a754fe1
Merge "Remove Connect to public network for Network Rating Provider" into sc-dev am: f4fafb97ff
am: d18caf8fa8
am: d1ce9256dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809873
Change-Id: Ib59dc98922e083ecd37a8417bcce43b14408ac3b
2021-06-03 07:51:56 +00:00
tim peng
62e1eb7d88
Merge "Remove flake error for AdvancedBluetoothDetailsHeaderControllerTest" into sc-dev am: 032b2b20bc
am: ee96a0d778
am: 96f05f6a18
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14782146
Change-Id: Ie9ec9163ba38c7cf671d8b7b1374b6069726628b
2021-06-03 07:51:14 +00:00
YUKAI HUNG
fa476aef12
Merge "Remove missed added testing locale to cause flaky" into sc-dev
2021-06-03 07:50:55 +00:00
Betty Chang
1da8b1909d
Merge "[GAR] Set the correct color and style to panel UI" into sc-dev am: 5b23f3b923
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14800153
Change-Id: I6936974270bd665aa01d5b563f4312605842a725
2021-06-03 07:39:20 +00:00
Betty Chang
8689d3ebc1
Merge "Remove Connect to public network for Network Rating Provider" into sc-dev am: f4fafb97ff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809873
Change-Id: I675fa7fc41dd061792bd4133a99b487b9dc516eb
2021-06-03 07:39:02 +00:00