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
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
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
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
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
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
Jason Chiu
817fb55032
Merge "Fix NullPointerException at VolumeSliceHelper" into sc-dev am: 9f24967458
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14622863
Change-Id: Idbe15167ca0f5dafe886af8b7fca6a8d49a960e5
2021-05-19 07:21:20 +00:00
Jason Chiu
9f24967458
Merge "Fix NullPointerException at VolumeSliceHelper" into sc-dev
2021-05-19 07:03:17 +00:00
Yi Jiang
f1a04d7284
Merge "Fixes ScreenTimeoutSettingsTest" into sc-dev am: 07532443ca
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14629551
Change-Id: I0d1a3aeb5fc2494af81dec11f9b50395e2b5dd57
2021-05-19 06:50:59 +00:00
Peiyong Lin
4e4a7f0dbd
Merge "Add Game settings support." into sc-dev am: d32d11248e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14553339
Change-Id: Id122a4cd8356f8ee735df146a1631238e81178c5
2021-05-19 06:49:45 +00:00
Yi Jiang
07532443ca
Merge "Fixes ScreenTimeoutSettingsTest" into sc-dev
2021-05-19 06:10:03 +00:00
Peiyong Lin
d32d11248e
Merge "Add Game settings support." into sc-dev
2021-05-19 05:42:14 +00:00
Jason Chiu
728081f9bb
Fix NullPointerException at VolumeSliceHelper
...
Race condition happens on accessing a map while system is destroying it.
Test: manual, robotest
Fixes: 188114877
Change-Id: I245121b95d1d4db02e3107a47c6d3ae13a5d32e5
2021-05-19 13:19:55 +08:00
Suprabh Shukla
63fd87a13a
Setting result earlier than onPause
...
Setting the result in onPause is too late for delivering it to the
requesting activity. Changing to setting the result any time the
uncommitted state is written. The state will still be committed in
onPause only.
Test: Manually with a test app using startActivityForResult.
Bug: 188477366
Change-Id: I676c99e7d2a64b644cef60ecd14728d4d49180c3
2021-05-18 22:13:47 -07:00
Weng Su
eccb787bbb
Merge "Introduce new Disconnect functionality for Wifi networks in Internet Panel only" into sc-dev am: 3d904eba71
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14622856
Change-Id: I94d660df34cf3873eab89b7cf2f7ff28b8f6ade3
2021-05-19 04:35:36 +00:00
Weng Su
46d3fc525e
Merge "Improve discoverability of the intent & actions progress" into sc-dev am: ca5f4e4952
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14622857
Change-Id: Ibe3c2cbce2440578dceb8b67f09feae66d07d2ae
2021-05-19 04:34:01 +00:00
Weng Su
3d904eba71
Merge "Introduce new Disconnect functionality for Wifi networks in Internet Panel only" into sc-dev
2021-05-19 03:48:24 +00:00
Weng Su
ca5f4e4952
Merge "Improve discoverability of the intent & actions progress" into sc-dev
2021-05-19 03:48:16 +00:00
TreeHugger Robot
08e146982b
Merge "Apply color extraction for Fingerprint enrollment" into sc-dev am: bac284a622
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14622855
Change-Id: Ia9107de5e771eac1e7862e7ca600816bdae57e12
2021-05-19 03:41:00 +00:00
TreeHugger Robot
80c3d12ff9
Merge "Visual update for FaceSettings" into sc-dev am: 2a7e608ef2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14551407
Change-Id: Iab74ccda074e474d65f70c9b3ace8105d4abee8e
2021-05-19 03:40:54 +00:00
TreeHugger Robot
aaf4959555
Merge "Fix the text contrast for biometric header" into sc-dev am: a07eb69948
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14605930
Change-Id: I633edb6a3dc4a92143d6d4fe28ac023d9f116ee9
2021-05-19 03:40:49 +00:00
TreeHugger Robot
d3f0fc54a7
Merge "Update the layout of Pattern/PIN/Password confirmation" into sc-dev am: 6d550713dd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14554361
Change-Id: I7b44bb1cf9e244e063b13ce5fbc8c83b391665aa
2021-05-19 03:40:38 +00:00
TreeHugger Robot
7bb6afbfd1
Merge "Tweak the layout for Pattern/PIN/Password enrollment" into sc-dev am: 4a67b1c099
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14554357
Change-Id: Ic60fa99f77c21aef31aa570ace8cbbd5a38394b2
2021-05-19 03:39:58 +00:00
TreeHugger Robot
bac284a622
Merge "Apply color extraction for Fingerprint enrollment" into sc-dev
2021-05-19 03:19:56 +00:00
TreeHugger Robot
2a7e608ef2
Merge "Visual update for FaceSettings" into sc-dev
2021-05-19 03:19:07 +00:00
TreeHugger Robot
a07eb69948
Merge "Fix the text contrast for biometric header" into sc-dev
2021-05-19 03:17:48 +00:00
TreeHugger Robot
6d550713dd
Merge "Update the layout of Pattern/PIN/Password confirmation" into sc-dev
2021-05-19 03:16:47 +00:00
TreeHugger Robot
4a67b1c099
Merge "Tweak the layout for Pattern/PIN/Password enrollment" into sc-dev
2021-05-19 03:15:28 +00:00
TreeHugger Robot
ba061c91ef
Merge "Controls/Pay - Use new privacy setting" into sc-dev am: 4335268c81
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14551073
Change-Id: If9642ede2761b0aee37a7afff15317b861e84d90
2021-05-19 00:08:03 +00:00
TreeHugger Robot
4335268c81
Merge "Controls/Pay - Use new privacy setting" into sc-dev
2021-05-18 23:55:18 +00:00
Yi Jiang
816b1f6edc
Fixes ScreenTimeoutSettingsTest
...
The recently added Battery Saver Preference need to be initialized in
order to avoid NPE in testing.
Bug: 188499083
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.display
Change-Id: Ib6553bcf9ed86eb46c2e0950064e34439664a1ee
2021-05-18 15:54:21 -07:00
Chloris Kuo
0e30c2599f
Merge "Fix NAS dialog string" into sc-dev am: 074eee332a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14607898
Change-Id: I856d8740ee4c90343e7cd4da2e1349efca331d33
2021-05-18 18:20:17 +00:00
Weng Su
4bf9551c30
Improve discoverability of the intent & actions progress
...
- Display "Select the network you want to use for data" on sub-title
when Wi-Fi networks is not empty
- Screenshot:
https://screenshot.googleplex.com/6nuwYoSh7UjF93Q
Bug: 186432232
Test: manual test
atest -c InternetConnectivityPanelTest
Change-Id: I9ab0ce0ca052b3444e50a914b59f38e4e7778ddf
2021-05-19 02:17:33 +08:00
Chloris Kuo
074eee332a
Merge "Fix NAS dialog string" into sc-dev
2021-05-18 17:54:50 +00:00
Weng Su
3d2950c8af
Introduce new Disconnect functionality for Wifi networks in Internet
...
Panel only
- Display the close icon on the Wi-Fi network connected to the Internet,
and performs the same action as tapping on the carrier network when
tapped it.
- Display the cog icon on the Wi-Fi network if it has no the Internet
access.
- Screenshot:
https://screenshot.googleplex.com/YBQ8onG2dFJ8Q2a
Bug: 187995278
Test: manual test
atest -c ProviderModelSliceTest
Change-Id: Id54a94c1fdfc37aff5cc37d6fb9f5478c0dccb00
2021-05-19 01:52:05 +08:00
Mill Chen
a96dad0a09
Apply color extraction for Fingerprint enrollment
...
Bug: 183710937
Test: visual verified
1) Navigate to Settings > Security > Fingerprint unlock
2) Follow the flow to register a fingerprint
3) See and check if the icon is applied to the new color
Change-Id: Ia1119c9fb245e0e1ed8257416d2942368a45e9e1
2021-05-19 01:46:20 +08:00
Peiyong Lin
83a71ca8fd
Add Game settings support.
...
Add Game settings page under Apps so that users can access game related
features and toggle settings.
Bug: b/185822999
Test: make ROBOTEST_FILTER=GameSettingsPreferenceControllerTest RunSettingsRoboTests
Change-Id: I923ba70536b7f68b5330a508b8dabf27e33f4c55
2021-05-18 17:24:51 +00:00
YUKAI HUNG
bf06c3c5f0
Merge "Align system time 12-24 hour format in the time slot information" into sc-dev am: 80f2f43d59
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14609994
Change-Id: I56c5dbb6a03ea06afd292e56d84914ffa9b27150
2021-05-18 15:45:24 +00:00
TreeHugger Robot
3ea9148b47
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 7659a826c3
-s ours am: 1aed128b64
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14617599
Change-Id: I9b9067a4878f6b3c48f16653562bd3e48039270b
2021-05-18 15:45:18 +00:00
YUKAI HUNG
80f2f43d59
Merge "Align system time 12-24 hour format in the time slot information" into sc-dev
2021-05-18 15:41:16 +00:00
TreeHugger Robot
1aed128b64
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 7659a826c3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14617599
Change-Id: I693505d6b5e10e7b061d42073280dec33dafbdea
2021-05-18 15:29:22 +00:00
Bill Yi
e8d6f07126
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9afa4248cc
-s ours am: 0ee82f4c33
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14617601
Change-Id: Ie1f2a8e5541098500f9acfb361427dfdef36dbad
2021-05-18 15:12:49 +00:00
TreeHugger Robot
f68e687f10
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 6ab5e4327c
-s ours am: 6ac3c7186a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14617606
Change-Id: If726240272002e2508990d412cf636686c72d9ed
2021-05-18 15:12:45 +00:00
Bill Yi
5bf187ec27
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8cecd68c0c
-s ours am: 712b1d5b4a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14617602
Change-Id: I5c99a25495d69681b25ae52f1a3d48508bb3e636
2021-05-18 15:12:22 +00:00
TreeHugger Robot
7659a826c3
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-05-18 15:09:42 +00:00
Bill Yi
0ee82f4c33
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9afa4248cc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14617601
Change-Id: Id52006206bc4bb7c559e8f32217d6e37fe29c657
2021-05-18 14:57:02 +00:00
TreeHugger Robot
6ac3c7186a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 6ab5e4327c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14617606
Change-Id: I02beb2105366dc036644655914ca838efd839172
2021-05-18 14:56:28 +00:00