Linyu He
e6c3d5d893
Merge "Revert "List apps which requested the TURN_SCREEN_ON appOp permi..."" into udc-dev am: e346dc6779
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22715841
Change-Id: I0a228f9c512ee444a245e67b10a83849e53ed51b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 20:04:09 +00:00
Treehugger Robot
4ec47457ec
Merge "Revert "Destroy activity in onStop()"" into udc-dev am: 6112e583d7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22691451
Change-Id: Ib9d623e75db46f94f9b617077c9f7f96926f427f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 19:58:43 +00:00
Linyu He
e346dc6779
Merge "Revert "List apps which requested the TURN_SCREEN_ON appOp permi..."" into udc-dev
2023-04-18 19:36:45 +00:00
Treehugger Robot
6112e583d7
Merge "Revert "Destroy activity in onStop()"" into udc-dev
2023-04-18 19:07:33 +00:00
Liana Kazanova
94f08e4ba1
Revert "List apps which requested the TURN_SCREEN_ON appOp permi..."
...
Revert submission 22338257-turnScreenOnPermission_pregrant
Reason for revert: b/278739832
Reverted changes: /q/submissionid:22338257-turnScreenOnPermission_pregrant
Change-Id: Iada276497c37c0e89a2cde8706394949d468e8e5
2023-04-18 17:47:14 +00:00
Treehugger Robot
b24b622c3c
Merge "Fallback to "Extended Compatibility" if Speed feature is not ready" into udc-dev am: dc02736824
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22651125
Change-Id: I655b1178eaea787df684067ee4e09283f3969625
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 16:56:25 +00:00
Treehugger Robot
dc02736824
Merge "Fallback to "Extended Compatibility" if Speed feature is not ready" into udc-dev
2023-04-18 16:21:11 +00:00
Philip Junker
821e2b5d8b
Merge "List apps which requested the TURN_SCREEN_ON appOp permission" into udc-dev am: c57e5c0e2c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22223104
Change-Id: I35d6b22c7ca33e80abb265a9f0bb1fbaf1eb2279
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 15:53:33 +00:00
Philip Junker
c57e5c0e2c
Merge "List apps which requested the TURN_SCREEN_ON appOp permission" into udc-dev
2023-04-18 15:36:55 +00:00
Weng Su
d965ff3049
Fallback to "Extended Compatibility" if Speed feature is not ready
...
- Fallback to the "Extended Compatibility" design when the following conditions occur
- 5 GHz band is not supported on the device
- 5 GHz SAP available channels cannot be obtained from WifiManager
- 6 GHz SAP available channels cannot be obtained from WifiManager
Bug: 272450463
Test: manual test
atest -c WifiTetherSettingsTest
atest -c WifiTetherViewModelTest \
WifiHotspotRepositoryTest \
WifiTetherSecurityPreferenceControllerTest.java \
WifiTetherMaximizeCompatibilityPreferenceControllerTest
Change-Id: If7c8c41ebe86f5e7d8e4737ab7a82d38c9d633de
2023-04-18 20:49:25 +08:00
TreeHugger Robot
6abeadaf77
Merge "[Settings] Update the footer link in Regional Preferences" into udc-dev am: c974342073
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22700947
Change-Id: Iabc92854c80d421f2941ab04ad86ee46d6e4cedc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 11:38:58 +00:00
TreeHugger Robot
c974342073
Merge "[Settings] Update the footer link in Regional Preferences" into udc-dev
2023-04-18 11:17:16 +00:00
Zoey Chen
4f01523156
Merge "[Settings] Fix the layout index" into udc-dev am: cd719845d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573648
Change-Id: I887e0086b36b621cfdd8ad3d5000e24914757fef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 10:32:39 +00:00
Zoey Chen
cd719845d6
Merge "[Settings] Fix the layout index" into udc-dev
2023-04-18 10:02:40 +00:00
Zoey Chen
5e987f49dd
[Settings] Update the footer link in Regional Preferences
...
Bug: 277573274
Test: local test
Change-Id: I0c02cee71365f98d89d98e4147e1eb5245b7ede9
2023-04-18 09:59:24 +00:00
Philip Junker
58e7b70df3
List apps which requested the TURN_SCREEN_ON appOp permission
...
Bug: 272053372
Test: manually installed an app which requests the permission and verified it shows up correctly in Settings > Apps > special app access > Turn screen on
Test: atest AppFilterRegistryTest
Test: atest TurnScreenOnDetailsTest
Test: m -j RunSettingsRoboTests
Test: adb shell am start -a android.settings.TURN_SCREEN_ON_SETTINGS
Change-Id: I7c47d4b1c0b33c7ba6209bb64acf93cb07d9a717
2023-04-18 09:12:44 +00:00
Jason Hsu
2fb71a4548
Merge "Fix pair another dialog doesn't show up after pairing in all bluetooth device page." into udc-dev am: 80016ad92a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22477523
Change-Id: Ia5edae7485315c2cfab27ad65d533d287d3f60ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 09:02:16 +00:00
Jason Hsu
80016ad92a
Merge "Fix pair another dialog doesn't show up after pairing in all bluetooth device page." into udc-dev
2023-04-18 08:47:37 +00:00
Zoey Chen
e9f6efa2b6
[Settings] Fix the layout index
...
The index of language label's layout is 0 and index of num layout is 1, so the select tp speak will read the language label first.
The root cause of the incorrect index is, the language label's layout starts with the parent layout instead of the num layout in the hierarchy view. Adjust the language label's layout and add these views one by one in the parent view.
Also fix the layout's jumping when user switches the page to "Remove language"
Bug: 277173513
Test: local test
Change-Id: I0d5879a07183713fa50b38f6321a15dd32582518
2023-04-18 08:46:23 +00:00
Treehugger Robot
8cf1fe7757
Merge "[BiometricsV2] fix enrolling rotate failed" into udc-dev am: 2a0d6ead1a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22651124
Change-Id: I43de2b80470465f59792f037bd33ebf081c72474
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 05:07:20 +00:00
Treehugger Robot
2a0d6ead1a
Merge "[BiometricsV2] fix enrolling rotate failed" into udc-dev
2023-04-18 04:56:12 +00:00
YK Hung
5b55ef3c9e
Merge "Cleanup smart battery entries (1/3)" into udc-dev am: d9f390010b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22639713
Change-Id: I8e5dde75c20ade2e97220f79893d608d1908be3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 02:25:03 +00:00
YK Hung
d9f390010b
Merge "Cleanup smart battery entries (1/3)" into udc-dev
2023-04-18 01:59:06 +00:00
Daniel Chapin
b215d94d51
Revert "Destroy activity in onStop()"
...
This reverts commit 7a89f15fed
.
Reason for revert: Droidfood blocking bug b/278178618
Change-Id: Ie26b73e1e9584f632625375d36168a42e95e5f02
2023-04-18 00:16:21 +00:00
Jay Sullivan
d8ca8de897
Merge "[Safety Labels] Filter out auto, wear and tv" into udc-dev am: 4d5ac5a89f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22562077
Change-Id: I4fdeabc560b05e96633729158e904243d08b8aec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-17 20:23:56 +00:00
Becca Hughes
7d818f8f53
Merge "Add dialog for enabling a provider in settings" into udc-dev am: e18613ccc6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22605959
Change-Id: Ifd7a9e4a9aa944b320db9f92add53accc7be9478
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-17 20:11:44 +00:00
Jay Sullivan
4d5ac5a89f
Merge "[Safety Labels] Filter out auto, wear and tv" into udc-dev
2023-04-17 19:53:43 +00:00
Becca Hughes
e18613ccc6
Merge "Add dialog for enabling a provider in settings" into udc-dev
2023-04-17 19:42:57 +00:00
Fabian Kozynski
25cc8f2fce
Merge "Update strings for device controls settings" into udc-dev am: 2099f58d3e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22623556
Change-Id: If4e9398bb55ccdc93538ef7e42b8eb827107d055
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-17 18:22:58 +00:00
lbill
d4ce5542fd
Fix Settings crash on non face service support devices am: e85d588904
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22670382
Change-Id: I905e91e606f3cc1289d197f660fdea1896e94448
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-17 18:19:43 +00:00
Becca Hughes
b69351b06d
Add dialog for enabling a provider in settings
...
Test: manual
Bug: 277923170
Merged-In: I404444115f178faf5545dec9686096fcdfdf73de
Change-Id: I404444115f178faf5545dec9686096fcdfdf73de
2023-04-17 18:06:50 +00:00
Fabian Kozynski
2099f58d3e
Merge "Update strings for device controls settings" into udc-dev
2023-04-17 18:06:33 +00:00
lbill
e85d588904
Fix Settings crash on non face service support devices
...
Doing some improvement for stability:
1. Check hasSystemFeature(PackageManager.FEATURE_FACE) for non-face
service devices.
2. Wrap addAuthenticatorsRegisteredCallback()
3. Find mPreference before addAuthenticatorsRegisteredCallback
Bug: 276680407
Bug: 278174667
Bug: 277647959
Bug: 277725506
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER= \
FaceSettingsFooterPreferenceControllerTest
Change-Id: I81346b6eb8c44106c5e52867d69c8736203dd558
2023-04-17 11:45:13 +00:00
YK Hung
fdfcc1577c
Merge "Update the card preference buttons margin" into udc-dev am: ebb97daa57
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22672141
Change-Id: I65026417d504fa45093c1ec55b972fd9495a20e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-17 09:23:54 +00:00
Wesley Wang
742e506d13
Cleanup smart battery entries (1/3)
...
- Remove smart battery entry from battery settings page since
restriction app info already move to app list page and smart battery
feature will keep as enabled, smart battery page will be empty
- Enable battery usage list page for AOSP
Bug: 277175992
Test: make SettingsRoboTests
Change-Id: I9221cecbfc8445b8f470975551f600e94e3128d5
2023-04-17 16:50:21 +08:00
YK Hung
ebb97daa57
Merge "Update the card preference buttons margin" into udc-dev
2023-04-17 08:49:48 +00:00
Milton Wu
562bbc8193
[BiometricsV2] fix enrolling rotate failed
...
Clean help message during progress changed, and reload help message from
ViewModel in onStart of enrolling page.
Bug: 275513362
Test: atest FingerprintEnrollProgressViewModelTest
Test: enable biometrics v2, and manully rotate screen when help msg
is shown, and check help msg is kept after screen rotation.
Change-Id: I44220050806038ee62750f8945b8ba8f8bb9c282
2023-04-17 08:06:53 +00:00
Treehugger Robot
930cc10239
Merge "Customize ChooseLockGeneric SUW options" into udc-dev am: 7d3b07f6cb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22304962
Change-Id: Ibc9d1a20f9ee6daa0c3df6815f243c30a801de26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-17 07:32:00 +00:00
Treehugger Robot
7d3b07f6cb
Merge "Customize ChooseLockGeneric SUW options" into udc-dev
2023-04-17 06:59:18 +00:00
ykhung
1d51ffc91e
Update the card preference buttons margin
...
old: https://screenshot.googleplex.com/BtqQdQwDcLqRuKf
new: https://screenshot.googleplex.com/BJWhutT5SVHpXyb
Bug: 246960554
Test: presubmit
Change-Id: I329938ec25db0b92cff0cf067f31b5f0fc1674aa
2023-04-17 14:57:41 +08:00
Treehugger Robot
359615c024
Merge "Fix enrolled pages not hide during SUW" into udc-dev am: 019e8ceb72
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22613578
Change-Id: I44a659148fe12da3505564dba64317e8ad90fea3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-17 06:00:45 +00:00
Treehugger Robot
019e8ceb72
Merge "Fix enrolled pages not hide during SUW" into udc-dev
2023-04-17 05:23:17 +00:00
Chaohui Wang
a6bb9038c6
Merge "Migrate latest changes in "Alarms and Reminders"" into udc-dev am: a42119c6a8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22635695
Change-Id: Ic86209951ecff51aec422dc56f9b383cc8dd4512
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-15 17:06:21 +00:00
Chaohui Wang
a42119c6a8
Merge "Migrate latest changes in "Alarms and Reminders"" into udc-dev
2023-04-15 16:32:54 +00:00
Treehugger Robot
5d0874cb25
Merge "Store the PIN length to disk when Pin auto confirm feature is enabled" into udc-dev am: e1ae1c6516
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22550309
Change-Id: I27c856966efc6ae81ff9db71e4e2ad957de50397
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-14 21:09:36 +00:00
Treehugger Robot
e1ae1c6516
Merge "Store the PIN length to disk when Pin auto confirm feature is enabled" into udc-dev
2023-04-14 20:46:49 +00:00
Hao Dong
67d216cef5
Merge "Count isActivityEmbedded() state to show split screen warning dialog" into udc-dev am: bba66e54b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22641346
Change-Id: I82ae8ae892c27d73877f8db343bc56989792f5d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-14 19:40:14 +00:00
Hao Dong
bba66e54b3
Merge "Count isActivityEmbedded() state to show split screen warning dialog" into udc-dev
2023-04-14 19:04:55 +00:00
Treehugger Robot
14a3b919e2
Merge "Fix rotate device at face unlock detailed page, device will display redundant face unlock header." into udc-dev am: 9ce2e21857
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22613587
Change-Id: If93cc68137273adb327fe4192c0d51ef687ff7cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-14 17:51:21 +00:00
Treehugger Robot
9ce2e21857
Merge "Fix rotate device at face unlock detailed page, device will display redundant face unlock header." into udc-dev
2023-04-14 17:11:40 +00:00