PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
87,709 Commits 1 Branch 0 Tags
e1e41d8d052e63c5f2959745c595ca6586a47a8c
Commit Graph

87709 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
2984c85600 Merge "[GAR] Set the correct color and style to panel UI" into sc-dev am: 5b23f3b923 am: 58e04237c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14800153

Change-Id: I0d30064bb00dde5fb32b0e9b0084fea6c37e9680
 2021-06-03 07:37:57 +00:00
Betty Chang
d1ce9256dc Merge "Remove Connect to public network for Network Rating Provider" into sc-dev am: f4fafb97ff am: d18caf8fa8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14809873

Change-Id: I460a63809a9baab78c70ed2993cd81c46254f6db
 2021-06-03 07:37:52 +00:00
tim peng
96f05f6a18 Merge "Remove flake error for AdvancedBluetoothDetailsHeaderControllerTest" into sc-dev am: 032b2b20bc am: ee96a0d778 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14782146

Change-Id: I3f82f02c89436321ec85e6f4f9992785bf0c9449
 2021-06-03 07:37:37 +00:00
TreeHugger Robot
a2602865de Merge "Fix failing test in InteractAcrossProfilesSettingsTest" into sc-dev am: 7e0fb6878d am: 0f0329cc8b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14801130

Change-Id: Ia93713cdd6700f9492d94a3209f89fe53df4ff8a
 2021-06-03 07:36:36 +00:00
Betty Chang
6c33002fa2 Merge "[GAR] Set the color to cycle left time to pass the GAR" into sc-dev am: 227f9357ab am: 8814da830f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14786144

Change-Id: I09ae20496295a87e9acece35a5279a4d795f9189
 2021-06-03 07:36:30 +00:00
Bonian Chen
9626d169c3 Merge "[Settings] Connected carrier should not be forbidden ones" into sc-dev am: b71dd1efd2 am: 7e5fcd42b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788603

Change-Id: I9e2ef08b1247f3c8e4a4262f91720ba7f9d1fcb0
 2021-06-03 07:36:25 +00:00
Kevin Chyn
14a17199e0 Merge "Fix array out of bounds in BiometricEnrollActivity" into sc-dev am: ef963fe079 am: cf3a9b989f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14801930

Change-Id: I522362e67625dd2fd565d925e1263270c7c6e773
 2021-06-03 07:36:19 +00:00
Trevor Black
a23dfc232b Merge "Remove extra app info setting under specific condition" into sc-dev am: 6c0a701540 am: 3cf1728e78 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788858

Change-Id: Ic3c89f22012b8fabd3da5547f6c91bb0ad01cfe0
 2021-06-03 07:36:09 +00:00
Yanting Yang
f52d2b66b8 Merge "Deprecate silky flag for official release" into sc-dev am: 09666f9ef4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14800152

Change-Id: I98cff1d6d9cc03e0a33c066e3683771532994b69
 2021-06-03 07:33:39 +00:00
Kunhung Li
bebc5063d2 Merge "Refine wallpaper search keywords" into sc-dev am: a19c7053a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14758322

Change-Id: I277dbe3339dee202925b2e055bcfd57e660b89d6
 2021-06-03 07:31:46 +00:00
Les Lee
5294e3f9ab wifi direct: Close the channel after leaving the Setting page 
Bug: 188375791
Bug: 184504089
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiP2pSettingsTest
Change-Id: I4eff0472fd3cb12e006b5e85f5cdb6b979c93fe5
 2021-06-03 15:31:28 +08:00
Jason Chiu
f979426151 Merge "Revise homepage colors" into sc-dev am: 132cc2127b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14797776

Change-Id: Iaa68b01d4b50767dab1052d1573ccf79e86e7573
 2021-06-03 07:30:44 +00:00
TreeHugger Robot
dbdb22e423 Merge "Fix failing test in InteractAcrossProfilesSettingsTest" into sc-dev am: 7e0fb6878d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14801130

Change-Id: Ic9aebb02b7a065f6d9f9f0d1e322d17fc2305d97
 2021-06-03 07:29:09 +00:00
Betty Chang
6b419f1075 Merge "[GAR] Set the color to cycle left time to pass the GAR" into sc-dev am: 227f9357ab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14786144

Change-Id: Ib5a59b4e9581d40f4103eb5c13a30a108797fbde
 2021-06-03 07:29:03 +00:00
Bonian Chen
9ba43f8f75 Merge "[Settings] Connected carrier should not be forbidden ones" into sc-dev am: b71dd1efd2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788603

Change-Id: I4fa26931ada47afd369a87543189add362987493
 2021-06-03 07:28:58 +00:00
Kevin Chyn
7ffcc2a517 Merge "Fix array out of bounds in BiometricEnrollActivity" into sc-dev am: ef963fe079 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14801930

Change-Id: Ia45a95eb7b5e30173b21915149e959979f68599b
 2021-06-03 07:28:53 +00:00