PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
82,533 Commits 1 Branch 0 Tags
41d658583642cc642713ada3a845f1ec3971b68c
Commit Graph

82533 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
461b72cdc7 [automerger skipped] Merge "[DO NOT MERGE] Modify Wi-Fi details settings to restricted style" into rvc-dev am: 21ab21168b -s ours am: fdcf96ee99 -s ours am: 2c8ed65745 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If9595e9becec89031b14a641432585a5180c9e2e
 2021-05-06 07:22:51 +00:00
TreeHugger Robot
2c30777afa [automerger skipped] Merge "[DO NOT MERGE] Modify Wi-Fi details settings to restricted style" into rvc-dev am: 21ab21168b -s ours am: fd32dc93c9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If1bb853639cb83accad5abb75d81eb66aa24a2b0
 2021-05-06 07:14:24 +00:00
Les Lee
f38761e027 Merge "wifi: Use new API for wifi data usage function" am: 7469890c87 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1628759

Change-Id: Id4c98842b11cb4102059fdbbe76d5c4b527302fe
 2021-05-06 07:14:01 +00:00
Yi Jiang
1bfd8eda4f Merge "Fixes NPE in Screen attention setting" into sc-dev am: d0af03e11c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14443109

Change-Id: I77106574c53b936d82030bc8cc027521c77af554
 2021-05-06 07:06:59 +00:00
TreeHugger Robot
2c8ed65745 [automerger skipped] Merge "[DO NOT MERGE] Modify Wi-Fi details settings to restricted style" into rvc-dev am: 21ab21168b -s ours am: fdcf96ee99 -s ours 
am skip reason: Merged-In I5f857b2079e0f550e4be601d27dd54dac56b2f57 with SHA-1 1f24c6a968 is already in history

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

Change-Id: I1f266c1eaf5463e5970008dc027ded775be88a97
 2021-05-06 07:06:57 +00:00
TreeHugger Robot
95b1b57aff Merge "Fix color filling on some Wifi pages" into sc-dev am: b720318fd3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439324

Change-Id: I0ac438a4a3fa145dbff54ffbe48c88b7db0d4c3f
 2021-05-06 07:06:43 +00:00
TreeHugger Robot
50ace76f98 Merge "Fix loading ring overlapping problem" into sc-dev am: dff47cf00a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439454

Change-Id: I85e251bc9aa9e42735abbe292ec7c596dfcd74b7
 2021-05-06 07:05:54 +00:00
Les Lee
7469890c87 Merge "wifi: Use new API for wifi data usage function" 2021-05-06 06:57:03 +00:00
Yi Jiang
d0af03e11c Merge "Fixes NPE in Screen attention setting" into sc-dev 2021-05-06 06:55:33 +00:00
TreeHugger Robot
b720318fd3 Merge "Fix color filling on some Wifi pages" into sc-dev 2021-05-06 06:54:14 +00:00
TreeHugger Robot
fd32dc93c9 [automerger skipped] Merge "[DO NOT MERGE] Modify Wi-Fi details settings to restricted style" into rvc-dev am: 21ab21168b -s ours 
am skip reason: Merged-In I5f857b2079e0f550e4be601d27dd54dac56b2f57 with SHA-1 1f24c6a968 is already in history

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

Change-Id: Ia72b0e0d3827762aed6b92b100d5979df3f130f0
 2021-05-06 06:53:25 +00:00
TreeHugger Robot
fdcf96ee99 [automerger skipped] Merge "[DO NOT MERGE] Modify Wi-Fi details settings to restricted style" into rvc-dev am: 21ab21168b -s ours 
am skip reason: Merged-In I5f857b2079e0f550e4be601d27dd54dac56b2f57 with SHA-1 1f24c6a968 is already in history

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

Change-Id: Ia495305891c49e3ffee19d7bee3f0107f6085ad3
 2021-05-06 06:52:02 +00:00
TreeHugger Robot
dff47cf00a Merge "Fix loading ring overlapping problem" into sc-dev 2021-05-06 06:51:24 +00:00
Mill Chen
efbcc69cc4 Fix inconsist color filling on collapsing toolbar 
Some pages are updating the background color for action bar after action
bar is created, which will break the animation of collapsing toolbar. It
also causes the different color filled in the status bar and collapsing
toolbar area separately. Removing the styleActionbar method from
EntityHeaderController can fix this issue.

Fix: 187019164
Test: robotests && visual verified
1) Settings -> Apps -> See all apps -> pick up either app -> Mobile data
& Wi-Fi
2) Scrolling the content and see if the toolbar has the different color
between status bar and toolbar

Change-Id: Ic0842b9e6c48662872694534a3696c4b8900481f
 2021-05-06 14:46:30 +08:00
TreeHugger Robot
21ab21168b Merge "[DO NOT MERGE] Modify Wi-Fi details settings to restricted style" into rvc-dev 2021-05-06 06:30:13 +00:00
TreeHugger Robot
565fae6f4b Merge "Update battery settings string" into sc-dev am: 1ae9a706ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439450

Change-Id: Icf787d0d45c0f859843153f6a290e497c0fbb17c
 2021-05-06 06:13:19 +00:00
YUKAI HUNG
dd98b47255 Merge "Add abnormal interpolation info to log unexpected conditions" into sc-dev am: b3267fb2ea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439969

Change-Id: I2b6c5ee5c3ef4bdb50091f4d31ed84e0777afafc
 2021-05-06 06:12:38 +00:00
TreeHugger Robot
1ae9a706ff Merge "Update battery settings string" into sc-dev 2021-05-06 05:55:49 +00:00
YUKAI HUNG
b3267fb2ea Merge "Add abnormal interpolation info to log unexpected conditions" into sc-dev 2021-05-06 05:54:00 +00:00
TreeHugger Robot
7ed90fe7db Merge "Fix searching condition for biometric settings" into sc-dev am: a75ba398fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439453

Change-Id: I21825cc582faf3320115c16579ee77de38ea018e
 2021-05-06 05:50:25 +00:00
TreeHugger Robot
a75ba398fe Merge "Fix searching condition for biometric settings" into sc-dev 2021-05-06 05:37:08 +00:00
Jason Hsu
c982d4581e Merge "Align dark theme in accessibility page with the dark theme in display page." into sc-dev am: 8caef2218c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14408669

Change-Id: I4dbf1b5603e80a7f383da2f6bf2a4a5f1ddb04b2
 2021-05-06 05:27:31 +00:00
TreeHugger Robot
a8b3277b18 Merge "Update Prevent Ringing summary when it turn off" into sc-dev am: 3aca460dfc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14442220

Change-Id: I4e147e373c327911bb9a6d9b945855c4f4b454f2
 2021-05-06 05:27:23 +00:00
Jason Hsu
8caef2218c Merge "Align dark theme in accessibility page with the dark theme in display page." into sc-dev 2021-05-06 05:18:50 +00:00
TreeHugger Robot
3aca460dfc Merge "Update Prevent Ringing summary when it turn off" into sc-dev 2021-05-06 05:07:25 +00:00
Les Lee
67b79fe9f5 Merge "wifi: Use new API for wifi data usage function" into sc-dev am: 0dc1ee01f8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419446

Change-Id: Id679cd941f052b587f3efb26c1e11787ee58d050
 2021-05-06 03:52:02 +00:00
ykhung
953b7e3bf5 Add abnormal interpolation info to log unexpected conditions 
Bug: 184807417
Test: make SettingsRoboTests
Change-Id: I11156c85b6b955dd505b41a9a41be0756638f1dd
 2021-05-06 11:48:20 +08:00
Les Lee
0dc1ee01f8 Merge "wifi: Use new API for wifi data usage function" into sc-dev 2021-05-06 03:17:20 +00:00
TreeHugger Robot
74ae8103aa Merge "[Provider Model] Fix settings crash issue" into sc-dev am: f396c0af28 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439968

Change-Id: I960b95f216bbb3d8a5f1c94d128a8912be4a184d
 2021-05-06 02:33:03 +00:00
TreeHugger Robot
f396c0af28 Merge "[Provider Model] Fix settings crash issue" into sc-dev 2021-05-06 01:52:53 +00:00
lesl
fd41cce94b wifi: Use new API for wifi data usage function 
For wifi, a old API: buildTemplateWifiWildcard will includes the merged
wifi which is included to mobile usage. It should not double count
again. Call new API: buildTemplateWifi with
NetworkId: NetworkTemplate.WIFI_NETWORKID_ALL
and null subscriberId to get non-merged wifi usage.

Test: make RunSettingsRoboTests ROBOTEST_FILTER=AppDataUsageTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AppDataUsagePreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageSummaryTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageSummaryPreferenceTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageSummaryPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageUtilsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SettingsDumpServiceTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiSettingsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageInfoControllerTest
Test: Manual Test, wifi data usage count correctly.
Bug: 176396812
Merged-In: Ia4d8fa67ea3cb75c2d35be9ab60e5c5ffa391ffb
Change-Id: Ia4d8fa67ea3cb75c2d35be9ab60e5c5ffa391ffb
 2021-05-06 09:37:09 +08:00
Weng Su
c3546f25ac [automerger skipped] [DO NOT MERGE] Modify Wi-Fi details settings to restricted style am: 1f24c6a968 am: 632eb0d54a -s ours am: 41b7d11496 am: 2e9640d5b0 am: e304f37927 -s ours am: 2f3389ff0c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I184301b146a5669819e60d2b6733ce55f7f0e168
 2021-05-06 01:35:03 +00:00
Weng Su
2f3389ff0c [automerger skipped] [DO NOT MERGE] Modify Wi-Fi details settings to restricted style am: 1f24c6a968 am: 632eb0d54a -s ours am: 41b7d11496 am: 2e9640d5b0 am: e304f37927 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I36aa2286aec58e930f4f868d3c092b7629c402d6
 2021-05-06 01:28:54 +00:00
Jeremy Goldman
ae056efa5a Merge "Create unit test for the VpnInfoPreference" into sc-dev am: 0a6a6269e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14436936

Change-Id: Ideedc7704c9e7497c3aaf641fa6450247becfd22
 2021-05-06 01:28:30 +00:00
Weng Su
696dfe87b1 [automerger skipped] [DO NOT MERGE] Modify Wi-Fi details settings to restricted style am: 1f24c6a968 am: 632eb0d54a -s ours am: 41b7d11496 am: 7a8de548ce -s ours am: 6e761235fd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6779497f56bda2d76615549d4a75a0d9fb026881
 2021-05-06 01:28:06 +00:00
Jeremy Goldman
0a6a6269e3 Merge "Create unit test for the VpnInfoPreference" into sc-dev 2021-05-06 01:08:35 +00:00
Weng Su
6e761235fd [automerger skipped] [DO NOT MERGE] Modify Wi-Fi details settings to restricted style am: 1f24c6a968 am: 632eb0d54a -s ours am: 41b7d11496 am: 7a8de548ce -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I777137193db9eb406825545a9d591145d1b8694d
 2021-05-06 00:57:51 +00:00
Weng Su
e304f37927 [automerger skipped] [DO NOT MERGE] Modify Wi-Fi details settings to restricted style am: 1f24c6a968 am: 632eb0d54a -s ours am: 41b7d11496 am: 2e9640d5b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352149

Change-Id: Ibaef95b9f82be90e11e76af1838b4561087ac062
 2021-05-06 00:57:15 +00:00
Weng Su
7a8de548ce [automerger skipped] [DO NOT MERGE] Modify Wi-Fi details settings to restricted style am: 1f24c6a968 am: 632eb0d54a -s ours am: 41b7d11496 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352149

Change-Id: Ia231ae0efc338828b1cdf84d1330234b10af0aaa
 2021-05-06 00:42:38 +00:00
Weng Su
2e9640d5b0 [automerger skipped] [DO NOT MERGE] Modify Wi-Fi details settings to restricted style am: 1f24c6a968 am: 632eb0d54a -s ours am: 41b7d11496 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352149

Change-Id: Ifcf837b36c99311ada4c7e1655dbd8a6b6ac6ad7
 2021-05-06 00:41:08 +00:00
Weng Su
41b7d11496 [automerger skipped] [DO NOT MERGE] Modify Wi-Fi details settings to restricted style am: 1f24c6a968 am: 632eb0d54a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I76f3b2ce80dd10bffb768862de34bc94b1f3d4b2
 2021-05-06 00:16:30 +00:00
Weng Su
632eb0d54a [DO NOT MERGE] Modify Wi-Fi details settings to restricted style am: 1f24c6a968 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352149

Change-Id: I45816ca240725b57db5a68ac1b960dab5b8f1b0b
 2021-05-05 23:59:31 +00:00
Weng Su
88cafbaa24 [Provider Model] Fix settings crash issue 
- The GlobalSettingsChangeListener needs to be closed after the life
cycle is destroyed

Bug: 185756174
Bug: 186404332
Bug: 186591527
Test: manual test
atest -c InternetUpdaterTest

Change-Id: I9fbad3b303055c6c7a61ccad8efe69cefef56c58
 2021-05-06 05:53:41 +08:00
Yi Jiang
f54a2be819 Fixes NPE in Screen attention setting 
Bug: 186904496
Test: make RunSettingsRoboTests
    ROBOTEST_FILTER=com.android.settings.display
Change-Id: I9bd1e6824e19cf8ea281f7af482d13ef47f36256
 2021-05-05 12:06:51 -07:00
TreeHugger Robot
eee6a74723 Merge "Add new constructor to create BatteryHistEntry from interpolation" into sc-dev am: f9ebf6600f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14436937

Change-Id: Id3888ea162250350f0f970c0463376a8fea3d1dc
 2021-05-05 18:13:02 +00:00
TreeHugger Robot
05975b3b48 Merge "Add placeholder summary" into sc-dev am: 5dbc9e8124 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441563

Change-Id: I17205beed76ea647d27843d2b0761cd98c530127
 2021-05-05 18:12:37 +00:00
TreeHugger Robot
f9ebf6600f Merge "Add new constructor to create BatteryHistEntry from interpolation" into sc-dev 2021-05-05 18:06:07 +00:00
Edgar Wang
aa48592b40 Update Prevent Ringing summary when it turn off 
Bug: 187145174
Test: manual & robotest
Change-Id: Ifc06a38ff65f084db2803c56b5a37224c5b9b810
 2021-05-06 01:49:24 +08:00
TreeHugger Robot
5dbc9e8124 Merge "Add placeholder summary" into sc-dev 2021-05-05 17:47:18 +00:00
Mill Chen
2918626258 Update the theme for Notification history page 
Fix: 187241188
Test: visual verified
1) Enable the light theme
2) Settings > Notifications > Notification history
3) See if the color of icon in the status bar is white

Change-Id: I2f198a10b71d0d0f7c92db0feab2154a1c8f25c6
 2021-05-06 01:18:01 +08:00