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

83215 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Betty Chang
58e04237c8 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: I16cda9264d779fce79cc8bf93f25b290a320f93a
 2021-06-03 07:25:56 +00:00
Betty Chang
d18caf8fa8 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: I4d23766f6fa93033b2490cdf1edeff58c4ee16d6
 2021-06-03 07:25:50 +00:00
Betty Chang
5b23f3b923 Merge "[GAR] Set the correct color and style to panel UI" into sc-dev 2021-06-03 07:21:17 +00:00
Betty Chang
f4fafb97ff Merge "Remove Connect to public network for Network Rating Provider" into sc-dev 2021-06-03 07:21:04 +00:00
tim peng
ee96a0d778 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: I405c34349758d79aa9fff506491324615e4d824b
 2021-06-03 07:15:43 +00:00
tim peng
032b2b20bc Merge "Remove flake error for AdvancedBluetoothDetailsHeaderControllerTest" into sc-dev 2021-06-03 07:03:37 +00:00
TreeHugger Robot
f3125b7d99 Merge "Fix slider RTL problem" into sc-dev am: 7bebe57631 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788607

Change-Id: I008a18d9e183099fe1fe41fcc4fc9484f89a500f
 2021-06-03 06:45:22 +00:00
TreeHugger Robot
9ba96e3d30 Merge "Fix voice access problem on location page." into sc-dev am: 89fbeb6407 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14782145

Change-Id: Iaac39f73a0ff5fa7c9f3e55a8f25302d9059b25e
 2021-06-03 06:45:16 +00:00
TreeHugger Robot
d38e7e2568 Merge "Update battery defender tip subtext" into sc-dev am: 2702e5ce80 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788605

Change-Id: I3aa67149060a4715c5b7535017fe8d7c2be3f60b
 2021-06-03 06:45:10 +00:00
Stanley Wang
090c1db54b Merge "SettingsMainSwitchPreference should display the restricted icon if it is restricted." into sc-dev am: b4b35a8c38 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14758319

Change-Id: I58e5b740f9f0d09081b6fcbaba6285988bdedece
 2021-06-03 06:44:50 +00:00
TreeHugger Robot
3da51e2fa1 Merge "Remove the face unlock category" into sc-dev am: 3af33cd3fc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14732241

Change-Id: Idb13354016ee0ad9598f62fffd6370e8da55d513
 2021-06-03 06:41:46 +00:00
TreeHugger Robot
5ec95d91ec Merge "Apply sliding transition to trust agent." into sc-dev am: fffda8de08 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14786716

Change-Id: Ibf7dc474c7340e636be1626cfd51f3d5847cd1a6
 2021-06-03 06:41:40 +00:00
Menghan Li
7f352f0030 Merge "Fix the link text "Learn more" in the accessibility pages with help links could not convey the link's purpose clearly" into sc-dev am: 58ed6a90fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702759

Change-Id: I6d9b4b991b1a4b4158254eb6b36286d3638a7ee2
 2021-06-03 06:41:34 +00:00
Wesley Wang
d2d83c7bdd Merge "Update battery settings string" into sc-dev am: e678e2da06 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14788594

Change-Id: Id3bcdd00f6cfe30454bd53a070e9793031aaf321
 2021-06-03 06:41:28 +00:00
Les Lee
9d89f8fc86 Merge "wifi: Use new API for data usage function" into sc-dev am: 5246f75bda 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14786726

Change-Id: Ifa114d809aab701ec16a5c72e8ae9a3e3d5528b8
 2021-06-03 06:41:18 +00:00
Wesley Wang
80bb5b005e Merge "Update battery error layout" into sc-dev am: 431e77d429 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14758085

Change-Id: I6dbeed62f155f116039dd8194bc827b50c4b4d5b
 2021-06-03 06:33:15 +00:00
TreeHugger Robot
975ddf380c Merge "Remove all dividers in privacy page" into sc-dev am: 2076ebf2f7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14786727

Change-Id: Ibeae45225b86bf44efe777cbea31c8325886e46a
 2021-06-03 06:33:09 +00:00
TreeHugger Robot
fb0cacb30f Merge "Fix biometric content overlap with top/bottom bars" into sc-dev am: 9a839db046 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14752842

Change-Id: Ie8efe236e01704370a77a86f4501b21e6789bb3f
 2021-06-03 06:33:02 +00:00
Abel Tesfaye
8b9c1ce735 Merge "Update smart auto rotate string" into sc-dev am: 0dbbd148d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14504138

Change-Id: Iea6cdbdc543b4c7a6f3c0b2907a6cd2c3045d764
 2021-06-03 06:32:56 +00:00
TreeHugger Robot
8eb8bfec86 Merge "Further refactoring on ActionDisabledByAdminDialog classes." into sc-dev am: 9e1e5ddb72 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14700128

Change-Id: I35927c0b212ab83aa4c49bd082c6c0d5fdcf3cf9
 2021-06-03 06:32:47 +00:00
ykhung
6ba22a3b9a Remove missed added testing locale to cause flaky 
Bug: 189998237
Test: make SettingsRoboTests
Change-Id: Id36c72ff8eee02c1e64f29a0dbefa0eb9804845a
 2021-06-03 14:24:18 +08:00
TreeHugger Robot
eab1381514 Merge "Fix overlapping problem on running services page" into sc-dev am: 28128df960 am: f09ee2983d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14800150

Change-Id: Iece29034d9d822723de9306d9663c205d9062c83
 2021-06-03 05:28:52 +00:00
TreeHugger Robot
f09ee2983d 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: I0d0e6024ff1ad86d009570cff19984da30c2f341
 2021-06-03 05:09:14 +00:00