PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
84,681 Commits 1 Branch 0 Tags
a988c56a252e10de1cc7ab8e72a65b9bc35ea200
Commit Graph

84681 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
55be0e9053 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: I856463521ea32b2b6bf64b2cb6d11802ec45fd84
 2021-05-06 05:52:01 +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
Jason Hsu
f39be2afea Merge "Align dark theme in accessibility page with the dark theme in display page." into sc-dev am: 8caef2218c am: 7649fa90f7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14408669

Change-Id: Ie9cff4e328fdec2c967e6c54309bc2cabd936836
 2021-05-06 05:49:53 +00:00
TreeHugger Robot
400cca93b4 Merge "Update Prevent Ringing summary when it turn off" into sc-dev am: 3aca460dfc am: 17877ef23e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14442220

Change-Id: Ie7b7bac2f5b8956f6f74c1bdef702ffbe1703d0a
 2021-05-06 05:49:40 +00:00
TreeHugger Robot
1f00925c74 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: Id24b4e7f3a0852e1a85415e6232ed99b318ba3f3
 2021-05-06 05:49:10 +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
7649fa90f7 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: Ia51c9a07e0aca890c746906abf35ef8a5c5d821c
 2021-05-06 05:29:24 +00:00
TreeHugger Robot
17877ef23e 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: I479cc73697ab81973f04f8ba7ead8e26cb439688
 2021-05-06 05:29:02 +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
1b23d619b8 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: I294102407ed1ee0dae97e4485b454a1b44c80f5e
 2021-05-06 05:27:13 +00:00
TreeHugger Robot
cb07496c14 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: I2db1d3c880208cee5852c987c8edfdd6a5908a36
 2021-05-06 05:26:58 +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
f7f80cbec2 Merge "wifi: Use new API for wifi data usage function" into sc-dev am: 0dc1ee01f8 am: a9ca9bec05 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419446

Change-Id: I331c1524bde3d55a118bf2d95534850bd73a0963
 2021-05-06 04:15:34 +00:00
Les Lee
a9ca9bec05 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: Ide9fa05ddab430487c903a49f14e37fbdef49e24
 2021-05-06 03:53:29 +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
Les Lee
ab3528dc86 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: Iaf7e07ae15cffcef51b8621f6512e68f7eb5f409
 2021-05-06 03:51:06 +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
6c1e450359 Merge "[Provider Model] Fix settings crash issue" into sc-dev am: f396c0af28 am: e6e27e32bb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439968

Change-Id: Iba77df02a2fa1e69cf1742f4062c45c0f8f5665b
 2021-05-06 02:57:25 +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
a59fe14784 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: Ia521623543a767b5cd4bce0132e5d033b265a229
 2021-05-06 02:33:01 +00:00
TreeHugger Robot
e6e27e32bb 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: I2a890de31d8986b9781a3eb085f8fd295ef72b4a
 2021-05-06 02:21:06 +00:00
Weng Su
2452d722e9 [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: b43f98b65c -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/+/14352149

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

Change-Id: I9a51161c174fcc8b64dc74401deb603bea980cd6
 2021-05-06 01:54:37 +00:00
Weng Su
312e7f028d [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 am: a2b6fa6d46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352149

Change-Id: I70b071a8ec4bf27d1288153c3d2f90d746162b10
 2021-05-06 01:53:39 +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
d2c87251c5 [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: Merged-In I5f857b2079e0f550e4be601d27dd54dac56b2f57 with SHA-1 1f24c6a968 is already in history

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

Change-Id: Id026a6b6f05aa9745cb4b97e5716f74d67f0334e
 2021-05-06 01:35:00 +00:00
Weng Su
b43f98b65c [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: Merged-In I5f857b2079e0f550e4be601d27dd54dac56b2f57 with SHA-1 1f24c6a968 is already in history

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

Change-Id: I2257f4e5c1aba94edb3245ba85d71c520739b209
 2021-05-06 01:29:53 +00:00
Jeremy Goldman
8c07c41e73 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: Idc1107134c06c395f73a7b4ac9f53f18291d1027
 2021-05-06 01:29:46 +00:00
Weng Su
a2b6fa6d46 [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 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352149

Change-Id: I90270144eb2d7dab6527eb024f5bce1ec251c789
 2021-05-06 01:29:20 +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
Jeremy Goldman
3266345a56 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: Idbc1e23f571f26d7beddf5695e171fd57688d191
 2021-05-06 01:28:23 +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
Weng Su
b4e67f049b [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 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352149

Change-Id: I8975bd562f3faaf709697aa18ffbf4103d8a1c67
 2021-05-06 01:27:48 +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
d334d18b59 Merge "Add new constructor to create BatteryHistEntry from interpolation" into sc-dev am: f9ebf6600f am: a5d73fdde8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14436937

Change-Id: I5023922b6ea2887d4a0a19cb87847d34b2674336
 2021-05-05 18:30:35 +00:00
TreeHugger Robot
d2a1068245 Merge "Add placeholder summary" into sc-dev am: 5dbc9e8124 am: 644b7a7c11 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441563

Change-Id: Ib8ae3b332d3e3c98d76ab38e3646fcc762fc563e
 2021-05-05 18:30:01 +00:00