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
7024c27f8a
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: I4ea2c6799893bc29b2685ffaf7d4971cfc1f32b0
2021-05-05 18:13:08 +00:00
TreeHugger Robot
712a9f3c38
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: I1f62173557d7fd4969378a7119ff62ca2da8b89e
2021-05-05 18:12:46 +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
ykhung
9db43b8f76
Add new constructor to create BatteryHistEntry from interpolation
...
https://matthew-brett.github.io/teaching/linear_interpolation.html
Bug: 184807417
Test: make SettingsRoboTests
Change-Id: I6dbdb3db8243e40bc54bde3aab7157fda2719de9
2021-05-06 00:42:14 +08:00
Yanting Yang
d1312e8e6e
Add summary back to the homepage
...
Also update some summaries with new strings.
Bug: 183586663
Test: robotests & atest & visual
Change-Id: I692be9b34e8867501aaa8c8e40428870b99644f8
2021-05-06 00:27:37 +08:00
Tsung-Mao Fang
2042dac123
Fix loading ring overlapping problem
...
By design, the loading ring is in the middle of the recycler view.
In the Android S, recyclerview isn't matched the screen's height.
So, if the recyclerview doesn't contains any item, the height could be
very low and then it causes to overlaps with drop down view.
The simple solution is to fix height of view of progress
bar, so it won't rely on the height of recycler view anymore.
Fix: 184643347
Test: Go to app notification page, and no overlapping problem.
Change-Id: I9f4fddba0254ac0cb0ba0b128a7dcc2de05d1fce
2021-05-05 23:43:46 +08:00
Mill Chen
129036cf75
Fix color filling on some Wifi pages
...
Since there's no edge-to-edge in the theme that Wifi page applied, it
caused the different colors filled in status bar and collapsing
toolbar area separately. It can be fixed by updating the theme to
Theme.SubSettings.
Fix: 187016196
Fix: 187021412
Test: visual verified
Change-Id: I686861c37acfb1eeddda1278cd70fa5bfd44cc1d
2021-05-05 23:41:16 +08:00
Mill Chen
ecd1495977
Fix searching condition for biometric settings
...
The preferences that are related to biometric settings should only be
searchable if the device supports the multiple biometric auth. However
we can see these preferences still can be searched even the device
doesn't support the feature, which is caused by that there's no
guardence. So the availiability of the preferences need to be updated to
prevent revealing unsupported preference from Settings search.
Fixes: 187167774
Test: manual test
1) Navigate to Settings search on a device without face auth
2) Search for face
3) See if there's something about face unlock
Change-Id: I6f120e8d9002a1e8f0be9361fdbea193776e4d7d
2021-05-05 23:35:53 +08:00
TreeHugger Robot
d5d3c7c768
Merge "Apply dynamic color for Erase all data(factory reset screen" into sc-dev am: ea1d3228b7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14438399
Change-Id: Id89b8538c7d7cbb430b883963511a03b56f0c0db
2021-05-05 14:30:00 +00:00
TreeHugger Robot
ea1d3228b7
Merge "Apply dynamic color for Erase all data(factory reset screen" into sc-dev
2021-05-05 14:18:18 +00:00
Julia Reynolds
01ca4818b5
Add placeholder summary
...
So the scren doesn't shift when the summary is added
asynchronously
Test: manual
Fixes: 183474692
Change-Id: I658191de1e53140b823e06a5f7959dc77e5a7fcb
2021-05-05 10:13:46 -04:00
TreeHugger Robot
1ccf7b5975
Merge "Fix the different color between status bar and action bar" into sc-dev am: 660341876d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439316
Change-Id: Ib12b49706b814befb4bdca4cdb0960b2fce75d42
2021-05-05 14:05:13 +00:00
Wesley.CW Wang
7d0988f26d
Update battery settings string
...
Bug: 168635076
Bug: 183689347
Test: make SettingsRoboTests
Change-Id: I1650c1c391ec3444f53360cd0f87f226b988ea04
2021-05-05 21:42:59 +08:00
TreeHugger Robot
660341876d
Merge "Fix the different color between status bar and action bar" into sc-dev
2021-05-05 13:30:13 +00:00
Betty Chang
23c1ad4123
Merge "Fix a NPE when forget wifi network" into sc-dev am: 407e6650bc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14424448
Change-Id: I45837eb7c4abaa69090bf47ab82f2fa2aaf71937
2021-05-05 11:10:23 +00:00
Betty Chang
58318ccb5f
Merge "Add scrollView with config layout and button layout" into sc-dev am: 1637f3cd26
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14438397
Change-Id: If2c4ed2f1516aaed5317c0042fdb24f169aafde2
2021-05-05 11:09:46 +00:00
Betty Chang
407e6650bc
Merge "Fix a NPE when forget wifi network" into sc-dev
2021-05-05 10:39:29 +00:00
Betty Chang
1637f3cd26
Merge "Add scrollView with config layout and button layout" into sc-dev
2021-05-05 10:39:13 +00:00
Tsung-Mao Fang
d3cd751f02
Apply dynamic color for Erase all data(factory reset screen
...
Enable the dynamic color flag, and remove some unused theme in layout.
Test: Rebuilt apk and see the screen
Fix: 185557130
Change-Id: I7ed73c808be4942e5ffd461982e73a4ff7f7f2db
2021-05-05 18:14:48 +08:00
Menghan Li
1aa7f9c3ab
Merge "Fix broken tests on Accessibility package" into sc-dev am: ad3dd1abbc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14436939
Change-Id: I90ed7abf4cceb99bd36a45a6b73e6354a12f72e1
2021-05-05 08:30:03 +00:00
TreeHugger Robot
b0218592e5
Merge "Fix borken test on Bluetooth and connected package" into sc-dev am: 5fe34bf7b5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14436938
Change-Id: I752c8d71dbf700e15a01aced4141b349935c64ac
2021-05-05 08:29:58 +00:00
Yanting Yang
9b448ebdb9
Merge "TopLevelStoragePreferenceControllerTest converted to JUnit" into sc-dev am: cd60664cc3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14410005
Change-Id: I6803324eed0d41e8f7e24fb41e34e16d24061afb
2021-05-05 08:29:52 +00:00
Sunny Shao
4c1219189c
Fix the different color between status bar and action bar
...
- use the Theme.SubSettings
Bug: 186608887
Test: manual review
Change-Id: I15392e7555472622a4eee3bad11ae8d69d03b438
2021-05-05 16:18:04 +08:00
Menghan Li
ad3dd1abbc
Merge "Fix broken tests on Accessibility package" into sc-dev
2021-05-05 08:14:24 +00:00
TreeHugger Robot
5fe34bf7b5
Merge "Fix borken test on Bluetooth and connected package" into sc-dev
2021-05-05 07:36:35 +00:00
Yanting Yang
cd60664cc3
Merge "TopLevelStoragePreferenceControllerTest converted to JUnit" into sc-dev
2021-05-05 07:32:45 +00:00
Jeremy Goldman
8e712c1501
TopLevelStoragePreferenceControllerTest converted to JUnit
...
Helper function composed to return thread future, to guarantee
concurrent function finishes before test condition is checked.
Additionally a @VisibleForTesting helper function is used rather than
robolectric reflection helpers to set a class variable.
Fixes: 187249674
Test: atest -c TopLevelStoragePreferenceControllerTest
Change-Id: Ia22ebac4baec60f72b8516e9e79998cd788266ab
Merged-In: Ia22ebac4baec60f72b8516e9e79998cd788266ab
(cherry picked from commit 899eb7282d
)
2021-05-05 07:31:35 +00:00
changbetty
7c2090b870
Add scrollView with config layout and button layout
...
Screenshot: https://photos.app.goo.gl/xmySTmdzbQeXksJC9
Bug: 186883458
Test: manaul test
Change-Id: I9c6855e95b032fbd71dce8399678521879363629
2021-05-05 15:26:18 +08:00
menghanli
71bc131f88
Fix broken tests on Accessibility package
...
The VectorDrawableState would be new memory location to cause the
VectorDrawableState are different.
Bug: 187240532
Test: make RunSettingsRoboTests -j52 ROBOTEST_FILTER=AccessibilityButtonPreviewPreferenceControllerTest
Test: make RunSettingsRoboTests -j52 ROBOTEST_FILTER=FloatingMenuLayerDrawableTest
Change-Id: I33bc9076ee288beb044af29e9974f5f6328f29b8
2021-05-05 14:54:54 +08:00
Hugh Chen
db53d1c6f8
Fix borken test on Bluetooth and connected package
...
Bug: 187239965
Test: make RunSettingsRoboTests -j56
Change-Id: Ic0d60a6cd46b1211efb2021f079c0b0a6534b383
2021-05-05 14:31:01 +08:00
Jeremy Goldman
c5cf69b1cf
Create unit test for the VpnInfoPreference
...
Currently the Settings VPN library doesn't including much testing
support, so this is intended as a start, in order to improve reliability
and stability of the area.
Test: atest -c VpnInfoPreferenceTest
Bug: 187245804
Change-Id: Id5acb699e0a68f479f3b0b6e6614c2e4e43b163b
2021-05-05 14:27:36 +08:00
Stanley Wang
c517e4535b
Merge "Fix the "Video call" can be searched on unsupported device." into sc-dev am: 2248941d43
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14424445
Change-Id: Ie358cb133c9beae339d80fc3b2188a70350b48d0
2021-05-05 05:36:33 +00:00
Stanley Wang
2248941d43
Merge "Fix the "Video call" can be searched on unsupported device." into sc-dev
2021-05-05 05:07:47 +00:00
Alex Salo
aabbf2e0ef
Merge "Fix NullPointerException in SmartAutoRotateCameraStateController" into sc-dev am: c26fabff2a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14162986
Change-Id: Iaaf287f08586514e48411aa7c540be08cb1588ff
2021-05-05 04:30:42 +00:00
Alex Salo
c26fabff2a
Merge "Fix NullPointerException in SmartAutoRotateCameraStateController" into sc-dev
2021-05-05 04:12:38 +00:00
Stanley Wang
f41ba6124a
Merge "Use MainSwitchPreference on Bubbles, Screen Saver and One-Handed mode pages." into sc-dev am: 9abe5df134
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14160600
Change-Id: Ie0124aac157e8349f9868a5958e1d6a7fc135eb3
2021-05-05 03:38:15 +00:00
Arc Wang
a298a39a2a
Merge "Cleanup Storage Settings" into sc-dev am: 3576b10330
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14408668
Change-Id: I6c3311651e5d3e7edb58d2b3d55eb54b46845a3e
2021-05-05 03:38:03 +00:00
Stanley Wang
81524c89cc
Fix the "Video call" can be searched on unsupported device.
...
The non-indexable does not work due to the NPE.
Fixes: 186594185
Test: robo test and see the search result.
Change-Id: Idc733b3521a774fa8b61a853aa078f50afc331cb
2021-05-05 11:32:10 +08:00