Menghan Li
e71750587f
Merge "Fix glifLayout is not align the preference in SuW" into sc-dev am: ceed5d817b
am: 63c739ef60
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14639274
Change-Id: Ic14dc34296c1e3774049a5f5505473d1de6caf52
2021-05-20 06:44:09 +00:00
Menghan Li
63c739ef60
Merge "Fix glifLayout is not align the preference in SuW" into sc-dev am: ceed5d817b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14639274
Change-Id: I02d96149f673917b001ae3c2a5be959b9ab783d6
2021-05-20 06:27:19 +00:00
Menghan Li
ceed5d817b
Merge "Fix glifLayout is not align the preference in SuW" into sc-dev
2021-05-20 06:13:05 +00:00
TreeHugger Robot
9d6fd54205
Merge "(2/n) Stop user from enabling OHM setting if user is using 3-button mode" into sc-dev am: 2cc1c91601
am: f154e231f9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14235150
Change-Id: Idfc92c6211e462f861af4443cebb7b08c1263140
2021-05-20 04:48:26 +00:00
TreeHugger Robot
4052fcc8bf
Merge "(2/n) Stop user from enabling OHM setting if user is using 3-button mode" into sc-dev am: 2cc1c91601
am: 7f7cf45879
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14235150
Change-Id: I32e13fb5e90283fd932e132e86daf4ba769d5df2
2021-05-20 04:46:07 +00:00
TreeHugger Robot
7f7cf45879
Merge "(2/n) Stop user from enabling OHM setting if user is using 3-button mode" into sc-dev am: 2cc1c91601
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14235150
Change-Id: Ia39af2ed11d35f002eac1dba12fb35ed3c87b600
2021-05-20 04:23:01 +00:00
TreeHugger Robot
f154e231f9
Merge "(2/n) Stop user from enabling OHM setting if user is using 3-button mode" into sc-dev am: 2cc1c91601
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14235150
Change-Id: I3161025c6c61529213cf99b38306ca287f657a51
2021-05-20 04:22:06 +00:00
TreeHugger Robot
2cc1c91601
Merge "(2/n) Stop user from enabling OHM setting if user is using 3-button mode" into sc-dev
2021-05-20 03:54:57 +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
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
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
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
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
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