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
ykhung
4ae06f8823
Add metric for new battery relative functions for S (1/2) am: a3d3c22a27 am: ae66f84815
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14622866
Change-Id: I4c37546aad5a789451ed45ff58737198687cc6b8
2021-05-19 12:57:33 +00:00
TreeHugger Robot
8ae1bc7d9c
Merge "Fix unable to send file via OPP" into sc-dev am: 5ef4fa037e am: 0151b0a8f0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327016
Change-Id: I9fff2a7b451c40443b74165ec937c6240812adeb
2021-05-19 12:42:36 +00:00
ykhung
ae66f84815
Add metric for new battery relative functions for S (1/2) am: a3d3c22a27
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14622866
Change-Id: Ia26c6fe38d5948c9c46b4a47ec261b6b900797ea
2021-05-19 12:40:19 +00:00
ykhung
98aafd8500
Add metric for new battery relative functions for S (1/2) am: a3d3c22a27
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14622866
Change-Id: I81540aec054edadc9d34c6f46337c398a3bb11ba
2021-05-19 12:36:22 +00:00
ykhung
a3d3c22a27
Add metric for new battery relative functions for S (1/2)
...
Reference the table from PM requested:
https://docs.google.com/spreadsheets/d/1TC_6MLVMvOS0p1ic0wPfQ-19AOuY8Kc8FUJdqaQSM4I/edit?ts=6098b296#gid=0
Bug: 188505537
Test: make SettingsRoboTests
Change-Id: I2a4df9ab900cbeaf9885bb2dbc21ea848920bc81
2021-05-19 12:22:20 +00:00
TreeHugger Robot
09c04410cc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 8d0376c98c -s ours am: 0b99020b5a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14416159
Change-Id: Ief2ea4249c89a9cbf17a702576f0b9cfc30bea60
2021-05-19 11:19:57 +00:00
TreeHugger Robot
b6859223b0
Merge "Remove Advanced item in Language & input Settings." into sc-dev am: f2ec0fbf83 am: dbe3c72bb6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14410006
Change-Id: Ie5139f823f78bf147edb8770266c823be061dae3
2021-05-19 11:13:33 +00:00
Kevin Chyn
b3f9271fa9
Merge "Cancel enrollment when back or negative buttons pressed" into sc-dev am: 08b7833120 am: c60fcecf32
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14414017
Change-Id: Ie3b5db627f3598ece2ac21cf8f9ab5c829109acc
2021-05-19 10:36:28 +00:00
menghanli
0afc2de85e
Fix glifLayout is not align the preference in SuW
...
Bug: 186076332
Test: Run initBCTestEnv_S.sh and switch to RTL and LTR language to
check layout
Change-Id: I5f22b8853d036f22a2e66a6144660950c268d89b
2021-05-19 09:23:14 +00:00
bsears
f17a812842
Merge "Revert "Fixes 'no ripple effect' issue for screen attention setting"" into sc-dev am: deb2acc9b3 am: 15b21dfed4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14410366
Change-Id: Ib3f4d3bad60cb72c1c6407e0bdfc1f4e01823a8b
2021-05-19 09:20:30 +00:00
Weng Su
99d8fcfae2
[Provider model] Revise the Internet Panel title sub-text
...
- Display "Tap a network to connect" on sub-title when Wi-Fi networks is
not empty
- Screenshot:
https://screenshot.googleplex.com/5TzpJDLghpCQnDP
Bug: 188594439
Test: manual test
atest -c InternetConnectivityPanelTest
Change-Id: I0e3f0eb269fb4fe040a62be9ee84105879af82f7
2021-05-19 15:35:41 +08:00