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

82353 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
TreeHugger Robot
5dbc9e8124 Merge "Add placeholder summary" into sc-dev 2021-05-05 17:47:18 +00: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
TreeHugger Robot
61f5f2d94c 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: I924cf471ee28d9ff7930a9458292109bffc30566
 2021-05-05 14:30:53 +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
db419cab2a 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: Ida3b64173f631dc27e58c59c5cb6c8d24fe3b303
 2021-05-05 14:05:19 +00: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
475a143729 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: Ie66bc1331908f9b5f5c2f739468f6a0f6a8c19c9
 2021-05-05 11:10:56 +00:00
Betty Chang
de3cffda3d 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: Ib5fcf6d55687946210db17bb25f192408ccaba8a
 2021-05-05 11:10:33 +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
22387787b0 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: Ib3fd76a8da8df96959d5192bce952c43080c740d
 2021-05-05 08:21:46 +00:00
TreeHugger Robot
fa20df2cf4 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: Ie25837addbb5848914c3292d53b087e8b56a0cc8
 2021-05-05 08:21:41 +00:00
Yanting Yang
a831fb43ba [automerger skipped] Merge "TopLevelStoragePreferenceControllerTest converted to JUnit" into sc-dev am: cd60664cc3 -s ours 
am skip reason: Merged-In Ia22ebac4baec60f72b8516e9e79998cd788266ab with SHA-1 899eb7282d is already in history

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

Change-Id: Ic60b59a28abfcc8e851147d9fbebee4055182296
 2021-05-05 08:19:58 +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
dcd49621ae 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: Ifef9438e936f2e1e0eb1feb2799190b918c5abac
 2021-05-05 05:36:17 +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
2ee354712e 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: I2af36a8053399de626a6a21d74e6beff5aac6731
 2021-05-05 04:30:05 +00:00
Alex Salo
c26fabff2a Merge "Fix NullPointerException in SmartAutoRotateCameraStateController" into sc-dev 2021-05-05 04:12:38 +00:00
Stanley Wang
34c9c10617 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: I6ccc986128b457d750f8c550a040428bc4e50508
 2021-05-05 03:38:11 +00:00
Arc Wang
ddc9e22f72 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: I23fae74a9cf6b2e0ceeefdf91707b0f5c250271e
 2021-05-05 03:38:04 +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
Stanley Wang
9abe5df134 Merge "Use MainSwitchPreference on Bubbles, Screen Saver and One-Handed mode pages." into sc-dev 2021-05-05 03:19:26 +00:00
Arc Wang
3576b10330 Merge "Cleanup Storage Settings" into sc-dev 2021-05-05 03:13:37 +00:00
Jeremy Goldman
aa3fee0833 Merge "Set summary if VPN is AlwaysOn Type" into sc-dev am: da602e196e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14424438

Change-Id: I045b5709ef078367b7a646d7dec705acb5aedbcf
 2021-05-05 01:32:57 +00:00
Jeremy Goldman
da602e196e Merge "Set summary if VPN is AlwaysOn Type" into sc-dev 2021-05-05 01:06:01 +00:00
TreeHugger Robot
7c3659352e Merge "Fix back navigation in biometric enrollment." into sc-dev am: 619321198c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14427973

Change-Id: I0100378ff8a1248754ecc9e99c4487fd412b8688
 2021-05-04 23:53:04 +00:00
TreeHugger Robot
619321198c Merge "Fix back navigation in biometric enrollment." into sc-dev 2021-05-04 23:23:39 +00:00
Joe Bolinger
43d978bd7b Fix back navigation in biometric enrollment. 
Using the back buttons can cause a crash in at least two cases. Skipping
face enrollment and then starting/stopping any enrollment can lead to
an invalid token and failed HAT request. Backing out of the activity and
restarting it can also lead to using a stale token that fails.

Fix: 179336333
Test: manual on device
Change-Id: I0c1133e4c3d9c97997043ddc9374aa3cfc4f1c97
 2021-05-04 14:43:17 -07:00
Kevin Chyn
008734333e Merge changes from topic "credential-removal-strings" into sc-dev am: 177d76986a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14365935

Change-Id: Ie4f759b138f4364a882c306a761b4520224df306
 2021-05-04 20:33:25 +00:00
Kevin Chyn
24fe2f2a66 Update credential removal strings am: a435a5a288 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14357317

Change-Id: If28985c8f00a9baf61c7deee8d5ddf1c6ca7c141
 2021-05-04 20:33:23 +00:00