PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
83,247 Commits 1 Branch 0 Tags
e9454809e7633acda01e5c14691d53d8c39df43c
Commit Graph

83247 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
Syaoran Kuo
e4be9a7b62 Merge "Adjuest battery saver component test for new logic" into sc-dev 2021-06-03 09:42:43 +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
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
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
tim peng
16394b6681 Merge "Remove flake error for AdvancedBluetoothDetailsHeaderControllerTest" into sc-dev am: 032b2b20bc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14782146

Change-Id: Ic5777b461d45a9ba9f35e613cc319adc706e1720
 2021-06-03 07:38:44 +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
TreeHugger Robot
56a94afcb0 Merge "Fix overlapping problem on running services page" into sc-dev am: 28128df960 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14800150

Change-Id: I2e4f112d3d1a4ef5fde0610079234544a3cacc58
 2021-06-03 07:37:56 +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
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