Betty Chang
75b844f7bc
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: Ifda73111d172a98944ac52b4455f6b82ab7c62e9
2021-05-05 11:11:04 +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
Menghan Li
e2910f3fba
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: Ia2319700ca8796bb97484996c0c83aef5a64273c
2021-05-05 08:21:41 +00:00
TreeHugger Robot
6d6d9c4bdc
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: Ib638a4f0a428a181943780620d4d1fdcc0f6420f
2021-05-05 08:21:35 +00:00
Yanting Yang
ba105f617c
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: I5aed7ca3fad02f6aba2fb7d7b777178266c9cb29
2021-05-05 08:21:31 +00: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
Stanley Wang
ed4b94b1e5
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: I80da11c586dc8b9d08cfa9c7a623079a18bf7cc0
2021-05-05 05:36:37 +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
2ee6647640
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: I30cbe453d0b2b8a8b16e8bad2c52a73a038abdfa
2021-05-05 04:30:45 +00:00
Alex Salo
c26fabff2a
Merge "Fix NullPointerException in SmartAutoRotateCameraStateController" into sc-dev
2021-05-05 04:12:38 +00:00
Stanley Wang
172053b7bc
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: I9691fe7ccb54a1a110b2f1871f3ea2b5236d2e41
2021-05-05 03:38:23 +00:00
Arc Wang
d215628ceb
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: I1250116e48ace44b73e5cf24dbc142664497d544
2021-05-05 03:38:14 +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
21cb774f4a
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: I17f9d521b70b0cfd9ce8e1fbbd34dc45feae0628
2021-05-05 01:32:58 +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
cea8e0e990
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: Id4c97ee5fed79eb4d11a8e1838fa90289264fdb5
2021-05-04 23:53:15 +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
61cfaed5fd
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: I9ac93a0e4f065c4ceaf1dd63f93b0d2db0496268
2021-05-04 20:34:19 +00:00
Kevin Chyn
13720c397c
Update credential removal strings am: a435a5a288
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14357317
Change-Id: I1a387cc1db0d571d789f9a88487c07b65b9c4fc9
2021-05-04 20:34:18 +00:00
Amit Mahajan
9001b49658
Merge "Get rid of redundant mSubId." into sc-dev am: e2de71a6a4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14354534
Change-Id: I3eedebe2b8c970f7d7e02110e127dd1f367e6a29
2021-05-04 20:34:08 +00:00
Kevin Chyn
177d76986a
Merge changes from topic "credential-removal-strings" into sc-dev
...
* changes:
Update combined settings summary
Update credential removal strings
2021-05-04 20:13:00 +00:00
Amit Mahajan
e2de71a6a4
Merge "Get rid of redundant mSubId." into sc-dev
2021-05-04 20:11:56 +00:00
Yi Jiang
790d1c0d0e
Merge "Fixes 'no ripple effect' issue for screen attention setting" into sc-dev am: f164cb1976
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14418428
Change-Id: Ifeba6d6b2bdd3c4ca7130301b470e4ad13d9143f
2021-05-04 20:02:31 +00:00
Yi Jiang
f164cb1976
Merge "Fixes 'no ripple effect' issue for screen attention setting" into sc-dev
2021-05-04 19:28:31 +00:00
Wesley Wang
ce4941d236
Merge "Update battery help message layout" into sc-dev am: 0df7148f1e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14424446
Change-Id: I967c0e444451d4c3ae48a425398b418b74c0b7c1
2021-05-04 18:04:30 +00:00
Trevor Black
bcaf17b803
Merge "Update Android Settings for the latest Extra App Info design" into sc-dev am: b6f2f39d27
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327037
Change-Id: I6096d1c857ffa6f628fcc1c19446b49a8d952137
2021-05-04 18:04:18 +00:00
Wesley Wang
0df7148f1e
Merge "Update battery help message layout" into sc-dev
2021-05-04 17:54:11 +00:00
Trevor Black
b6f2f39d27
Merge "Update Android Settings for the latest Extra App Info design" into sc-dev
2021-05-04 17:38:26 +00:00
TreeHugger Robot
9fe500d2d8
Merge "Add null check for app labels" into sc-dev am: cc28a0826e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14426523
Change-Id: I28575cd41858d9bdd4715aa6b83073d8dfc697b2
2021-05-04 17:19:31 +00:00
TreeHugger Robot
cc28a0826e
Merge "Add null check for app labels" into sc-dev
2021-05-04 17:03:37 +00:00
Jan Tomljanovic
1e89e49d75
Merge "Launch SecurityHub fragment on SECURITY_SETTINGS intent when available." into sc-dev am: b6cea338a0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14339810
Change-Id: I0c4ba3ee5ed28bc7ec784d462628b08e0156948f
2021-05-04 15:42:49 +00:00
Sally Yuen
5e1e2e0bc5
Merge "set enabled state of persist switch when Extra Dim state is changed" into sc-dev am: 478b218230
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14414318
Change-Id: I9f174c8546317601d7923c974a6af7993667b55d
2021-05-04 15:42:40 +00:00
Julia Reynolds
bdcb525982
Add null check for app labels
...
Test: manual
Fixes: 187173056
Change-Id: I1affd901bc644597e4af7fc65c81f919c8589ed5
2021-05-04 11:40:09 -04:00
Jan Tomljanovic
b6cea338a0
Merge "Launch SecurityHub fragment on SECURITY_SETTINGS intent when available." into sc-dev
2021-05-04 15:35:43 +00:00
Sally Yuen
478b218230
Merge "set enabled state of persist switch when Extra Dim state is changed" into sc-dev
2021-05-04 15:26:12 +00:00
TreeHugger Robot
38cba6fe03
Merge "Update app usage page footer string" into sc-dev am: 16f8b4c943
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14424447
Change-Id: I7f47c8ca8d8125fdffefc549653c121dba05f4df
2021-05-04 14:40:22 +00:00
Arc Wang
e64f01ccfc
Cleanup Storage Settings
...
There is AOSP built in file browser for image/video/audio
file category, this change cleanup APP based category
for image/video/audio.
Bug: 183078080
Test: atest com.android.settings.deviceinfo
atest com.android.settings.deviceinfo.storage
make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.deviceinfo
make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.deviceinfo.storage
Change-Id: I925fc9296b8c2df5bd793668f66a12beb7744469
2021-05-04 22:21:53 +08:00
TreeHugger Robot
16f8b4c943
Merge "Update app usage page footer string" into sc-dev
2021-05-04 14:21:52 +00:00
Betty Chang
7e5ce1804b
Merge "Assign StaticIpConfiguration builder value to global variable" into sc-dev am: 35e244754c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419452
Change-Id: I4c5df04cbb0f72cece5eb8980fa2cbe93a7e6216
2021-05-04 14:16:59 +00:00
TreeHugger Robot
c0a43ad330
Merge "Remove the Summary of Backup in System Settings" into sc-dev am: 31a697eb79
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14410004
Change-Id: Ia5af426eedef781ebb6467e78214d87b3e993998
2021-05-04 14:16:47 +00:00
Betty Chang
35e244754c
Merge "Assign StaticIpConfiguration builder value to global variable" into sc-dev
2021-05-04 14:04:56 +00:00