Betty Chang
6ff88f0c39
Merge "Fix a NPE when forget wifi network" into sc-dev am: 407e6650bc
am: 23c1ad4123
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14424448
Change-Id: I7fd9c8762f7e31bae8c98dc7e8ae78ba3afd1c84
2021-05-20 01:15:06 +00:00
Betty Chang
db08ca0830
Merge "Add scrollView with config layout and button layout" into sc-dev am: 1637f3cd26
am: 58318ccb5f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14438397
Change-Id: I8d91e3de6d1ad1d1cef5fa17f579194f8058dcf5
2021-05-20 01:11:30 +00:00
Menghan Li
2fbcc8a1cd
Merge "Fix broken tests on Accessibility package" into sc-dev am: ad3dd1abbc
am: 1aa7f9c3ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14436939
Change-Id: I814d1da68060a0019062b26295514e95e3e4729b
2021-05-20 01:11:25 +00:00
TreeHugger Robot
df1d288b83
Merge "Fix borken test on Bluetooth and connected package" into sc-dev am: 5fe34bf7b5
am: b0218592e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14436938
Change-Id: Ib2fe8a95101768d61b3b28d5bdda885e32276046
2021-05-20 01:11:19 +00:00
Yanting Yang
a886b37991
[automerger skipped] Merge "TopLevelStoragePreferenceControllerTest converted to JUnit" into sc-dev am: cd60664cc3
am: 9b448ebdb9
-s ours
...
am skip reason: Merged-In Ia22ebac4baec60f72b8516e9e79998cd788266ab with SHA-1 8e712c1501
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14410005
Change-Id: I1d0b5d6c1d44e469fbd5579d3e07f94c559f6ef5
2021-05-20 01:11:14 +00:00
Stanley Wang
584f09fb55
Merge "Fix the "Video call" can be searched on unsupported device." into sc-dev am: 2248941d43
am: c517e4535b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14424445
Change-Id: I497c768eb637b6795f5a9931985659b5634b4bde
2021-05-20 01:11:08 +00:00
Alex Salo
8b1e82f69b
Merge "Fix NullPointerException in SmartAutoRotateCameraStateController" into sc-dev am: c26fabff2a
am: aabbf2e0ef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14162986
Change-Id: Ic32bdfe6b6f4c3ba9f801d24031511551f8d8617
2021-05-20 01:11:02 +00:00
Stanley Wang
237f77840e
Merge "Use MainSwitchPreference on Bubbles, Screen Saver and One-Handed mode pages." into sc-dev am: 9abe5df134
am: f41ba6124a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14160600
Change-Id: Ifb09c19c2f682425f179e7779639ebb24b1ca56b
2021-05-20 01:10:57 +00:00
Arc Wang
7e252a4021
Merge "Cleanup Storage Settings" into sc-dev am: 3576b10330
am: a298a39a2a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14408668
Change-Id: I35d3101d816f30d4443f3147853ab64be155d1e4
2021-05-20 01:10:51 +00:00
Jeremy Goldman
f9cb40eba5
Merge "Set summary if VPN is AlwaysOn Type" into sc-dev am: da602e196e
am: 03b2d99ba3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14424438
Change-Id: Ie0fa8e48c0a113f073ded7e6d298684d9caacd71
2021-05-20 01:10:46 +00:00
TreeHugger Robot
0f312601fb
Merge "Fix back navigation in biometric enrollment." into sc-dev am: 619321198c
am: 298f774060
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14427973
Change-Id: Iea6da855a74498ea4690586239126d7854e6d986
2021-05-20 01:10:41 +00:00
Kevin Chyn
9e7a27f2bf
Merge changes from topic "credential-removal-strings" into sc-dev am: 177d76986a
am: 4431af41b9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14365935
Change-Id: Ia5e3163644c71b032c202a48bb7d8aeb72783899
2021-05-20 01:10:35 +00:00
Kevin Chyn
78a3668420
Update credential removal strings am: a435a5a288
am: 39f85272a6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14357317
Change-Id: I55b618c8d42093c6b5845f7011faf8d48eaa4851
2021-05-20 01:10:29 +00:00
Amit Mahajan
47f60c06ce
Merge "Get rid of redundant mSubId." into sc-dev am: e2de71a6a4
am: 433ecf9a5a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14354534
Change-Id: I6f1f054ac65e7ea04ee6a435aa8b56e16adb791a
2021-05-20 01:10:24 +00:00
Yi Jiang
9fb96d69c7
Merge "Fixes 'no ripple effect' issue for screen attention setting" into sc-dev am: f164cb1976
am: 3179d1e1ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14418428
Change-Id: Ic6712170b4825caae5920cbf2caf7c74a533ff49
2021-05-20 01:10:19 +00:00
Wesley Wang
7c75a501d0
Merge "Update battery help message layout" into sc-dev am: 0df7148f1e
am: 60983ec7ba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14424446
Change-Id: I85d38982caf40dd5a7d975e77f58255a21557c09
2021-05-20 01:10:13 +00:00
Trevor Black
3750ebd446
Merge "Update Android Settings for the latest Extra App Info design" into sc-dev am: b6f2f39d27
am: 933819c4eb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327037
Change-Id: I37196fb47d5dd5d22fb7e12096ab0372f62f0298
2021-05-20 01:03:12 +00:00
Yu-Han Yang
791b6fadc7
Fix footer issues
...
1. setContentDescription for "learn more"
2. set searchable="false"
Bug: 187471260
Bug: 188490701
Test: on device
Change-Id: Iaa6907fdf2b6c47cbc1386a88a08ac31f3676367
2021-05-19 18:01:25 -07:00
Arc Wang
4a2acd2e20
Fix UnsupportedOperationException in Display Settings
...
Remove android:textColorHint from Theme.Settings to fix the regression.
This is a quick fix, each EditText should set its hintTextColor
attribute before there is a fix to apply the attribute globally in
Settings APP.
Bug: 188405076
Test: manually launch 'Font size' and 'Display size'.
Change-Id: If3313be47e0c3e8ce9d41a6e87cdf2e7067ce54b
2021-05-20 01:01:21 +00:00
Colin Cross
e503f316a3
Merge "Update style name"
2021-05-20 00:48:34 +00:00
TreeHugger Robot
5ea5b74764
Merge "Add null check for app labels" into sc-dev am: cc28a0826e
am: d03c199819
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14426523
Change-Id: Ia93d6383e836002daa3a7a0cc9f3103ab178cb65
2021-05-20 00:45:51 +00:00
Wesley.CW Wang
fb6500410f
Update style name
...
Bug: 187923403
Test: make SettingsRoboTests
Change-Id: I01455cef919cb8692df9d275c8dff0c68d75861f
(cherry picked from commit 2b6a081a0b
)
2021-05-19 17:43:34 -07:00
Jan Tomljanovic
b242934da5
Merge "Launch SecurityHub fragment on SECURITY_SETTINGS intent when available." into sc-dev am: b6cea338a0
am: e509a694c8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14339810
Change-Id: I3c49a39461d08d5272936504d5a63b6cd7389634
2021-05-19 23:44:52 +00:00
Sally Yuen
9a313b52cb
Merge "set enabled state of persist switch when Extra Dim state is changed" into sc-dev am: 478b218230
am: b77b7385b4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14414318
Change-Id: Ifad9645509eceb365433f6fb91a8afda9beb7443
2021-05-19 21:59:26 +00:00
TreeHugger Robot
1ce65545d0
Merge "Update app usage page footer string" into sc-dev am: 16f8b4c943
am: bccec996c0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14424447
Change-Id: I1a29c0feaf45f87d4557b077c677ec4609ab4f49
2021-05-19 21:44:10 +00:00
Betty Chang
9bf920f223
Merge "Assign StaticIpConfiguration builder value to global variable" into sc-dev am: 35e244754c
am: 26fcdf4745
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419452
Change-Id: Ic7d93eeda0273211401c7a86b6f2b5dca426a540
2021-05-19 21:11:44 +00:00
TreeHugger Robot
8742209c02
Merge "Setting result earlier than onPause" into sc-dev am: c57c351060
am: 0925ba9f24
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14637113
Change-Id: Ida9880e4f0afdc8ac22abc717fc025146ae7d118
2021-05-19 20:49:22 +00:00
TreeHugger Robot
33a02ecb1b
Merge "Setting result earlier than onPause" into sc-dev am: c57c351060
am: bd016efe52
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14637113
Change-Id: Iea82919144c670f7d5d6024ead8f4c8a6fc0372c
2021-05-19 20:46:57 +00:00
TreeHugger Robot
bd016efe52
Merge "Setting result earlier than onPause" into sc-dev am: c57c351060
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14637113
Change-Id: I56777a5df9c5af025e5298c0c73d0ed151c31c37
2021-05-19 20:31:16 +00:00
TreeHugger Robot
0925ba9f24
Merge "Setting result earlier than onPause" into sc-dev am: c57c351060
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14637113
Change-Id: I81795d747ae1256aba6526c7a681186fdf551072
2021-05-19 20:28:49 +00:00
TreeHugger Robot
c57c351060
Merge "Setting result earlier than onPause" into sc-dev
2021-05-19 20:11:09 +00:00
TreeHugger Robot
d5131e7aa9
Merge "Remove the Summary of Backup in System Settings" into sc-dev am: 31a697eb79
am: 722ac92514
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14410004
Change-Id: Id7c5546a71616e6885233445b0ea875764c63509
2021-05-19 20:08:23 +00:00
Yi Jiang
8aaa9f5549
Defers initialization of preferences.
...
In Screen Timeout Settings, preferences should not be initialized in
onAttach() because the setting style hasn't been loaded yet. This change
defers the initialiaztion of those preferences so that they appear
correctly.
Test: manually tested.
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.display
Bug: 183909540
Change-Id: I86cfe196549d709ed763faa004fff7b631365b1e
2021-05-19 12:18:23 -07:00
Jeremy Goldman
ed7bbfed0a
Merge "If the CarrierConfigManager is still null, return that the preference is not available." into sc-dev am: d6913243a1
am: d41def87bd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409956
Change-Id: I672e3cdd40d099b950d66e52b4781056f6c3379f
2021-05-19 19:09:08 +00:00
Menghan Li
784cbe08f1
Merge "[Material Next] Typography for font style" into sc-dev am: 4ec4cf32f1
am: f47694d4c5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409968
Change-Id: I884d411b843d738370a9b8868bb7cd159a75d6e1
2021-05-19 17:32:47 +00:00
Jack Yu
8ebb08b699
Merge "API Review: Rename CAPABILITY_ALLOWED_NETWORK_TYPES_USED" into sc-dev am: 3616520985
am: 9c60e581e8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14554359
Change-Id: I4d65366285eb9aa38e83ddf26edd681b77920d3e
2021-05-19 17:06:52 +00:00
Jack Yu
2b2a1f8894
Merge "API Review: Rename CAPABILITY_ALLOWED_NETWORK_TYPES_USED" into sc-dev am: 3616520985
am: a67151ad2f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14554359
Change-Id: Ia7c13617cbc5d429737a4bbb07e34d0b3c76e92f
2021-05-19 16:50:07 +00:00
Jack Yu
9c60e581e8
Merge "API Review: Rename CAPABILITY_ALLOWED_NETWORK_TYPES_USED" into sc-dev am: 3616520985
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14554359
Change-Id: Id6cec29f31d94a378bd78c630b5a7d571bba64c7
2021-05-19 16:47:43 +00:00
Jack Yu
a67151ad2f
Merge "API Review: Rename CAPABILITY_ALLOWED_NETWORK_TYPES_USED" into sc-dev am: 3616520985
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14554359
Change-Id: I10842db389af23abb685d1e0d4bca799bae48e6f
2021-05-19 16:26:54 +00:00
Jack Yu
3616520985
Merge "API Review: Rename CAPABILITY_ALLOWED_NETWORK_TYPES_USED" into sc-dev
2021-05-19 16:26:18 +00:00
Jason Chang
ecb58cbbc5
(2/n) Stop user from enabling OHM setting if user is using 3-button
...
mode
Return One-Handed mode getAvailabilityStatus to UNSUPPORTED_ON_DEVICE
when SystemNavigationMode is 3-button.
Bug: 184903678
Test: manual
Test: manual verified on Settings > System > Gesture page
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.gestures
.OneHandedEnablePreferenceControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.gestures
.SwipeBottomToNotificationPreferenceControllerTest"
Change-Id: I454dabb5cc267d544732fa5079f3146154d0568c
2021-05-20 00:25:26 +08:00
YUKAI HUNG
737e6d449d
Merge "Rename variables and refine the format style from ag/14346184" into sc-dev am: 37d6d0835c
am: ff80cd7dd4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419441
Change-Id: I9a9310bc3face17fa2e94ee3b3a594361fb44846
2021-05-19 15:58:03 +00:00
Bill Yi
2f6785dfd6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe0e09fdb4
-s ours am: d92ec7a9cc
-s ours am: 7c02bd8602
-s ours am: 3808659f80
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14416157
Change-Id: Ia0f604fc7ae560c1ac176331c0233204bbdd47c8
2021-05-19 15:25:17 +00:00
Bill Yi
c1ebacd82e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c73e6bf08d
-s ours am: d7caf65594
-s ours am: 383a5aa78e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14415146
Change-Id: I5ae1e2bd9ee1ce3998dae69bfe5555b22d9bb29f
2021-05-19 14:32:57 +00:00
Antoan Angelov
5eabf5464f
Merge "Update ActionDisabledByAdminDialogHelper" into sc-dev am: eb45fd3f2a
am: 57d52482cc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441130
Change-Id: I872babca5324d9a9ac1cf9db6392a12fcf4ebfb7
2021-05-19 14:32:43 +00:00
Antoan Angelov
3bd2b1cae2
Merge "Update ActionDisabledByAdminDialogHelper" into sc-dev am: eb45fd3f2a
am: 8019ba0d5b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441130
Change-Id: I52b3d1cd995eefab222e447072f13eb3571250e8
2021-05-19 14:30:50 +00:00
Antoan Angelov
8019ba0d5b
Merge "Update ActionDisabledByAdminDialogHelper" into sc-dev am: eb45fd3f2a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441130
Change-Id: Ie1a010c2ca3b2d07108b3a21251bb0554212f9b4
2021-05-19 14:06:58 +00:00
Antoan Angelov
57d52482cc
Merge "Update ActionDisabledByAdminDialogHelper" into sc-dev am: eb45fd3f2a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441130
Change-Id: I1d2ca81504f78e98d2f27d34ca8b037ffc433719
2021-05-19 14:05:09 +00:00
Antoan Angelov
eb45fd3f2a
Merge "Update ActionDisabledByAdminDialogHelper" into sc-dev
2021-05-19 13:50:06 +00:00
ykhung
587a8f9800
Add metric for new battery relative functions for S (1/2) am: a3d3c22a27
am: 98aafd8500
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14622866
Change-Id: If2b61e48c16f0671b66ce0b8a7c884680130e1cc
2021-05-19 12:59:11 +00:00