Fangqiu Su
0a3a5b74a1
Merge "Update uiautomator references in packages/apps/Settings/tests/anomaly-tester"
2023-05-11 19:50:53 +00:00
Treehugger Robot
b570c10767
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2023-05-11 19:28:21 +00:00
Treehugger Robot
a5af82be11
Merge changes from topic "tc_change_2305100725_23" into udc-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eac02feb2d
Import translations. DO NOT MERGE ANYWHERE
2023-05-11 19:28:21 +00:00
Treehugger Robot
81ac516705
Merge "Fix string" into udc-dev
2023-05-11 19:21:54 +00:00
Yuxin Hu
715a70603c
Add AndroidJUnitTest for developer option switch
...
Bug: b/270994705
Test: m -j45
atest SettingsRoboTests:GraphicsDriverEnableAngleAsSystemDriverControllerTest
atest -c GraphicsDriverEnableAngleAsSystemDriverControllerJUnitTest
Change-Id: Idbb93458a64894c3eba78a8f9373c40e3ddf35c5
2023-05-11 17:59:21 +00:00
Hao Dong
0ff2d2b2af
Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." into udc-dev am: c753221adf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121665
Change-Id: Iaaab846636e37e82b01d0a11881083be760a482a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 17:54:13 +00:00
Becca Hughes
f7c4d9c903
Fix string
...
Test: make
Bug: 281047738
Change-Id: I7f65749cbdee95ab9447dc0b055d66fd962547dc
2023-05-11 17:45:30 +00:00
Hao Dong
cddf296c82
Hide description text view if there is overlap.
...
1. Includes udfps enroll view in xml files and cleans up FingerprintEnrollEnrolling adding udfps enroll view code.
2. Clean up SETTINGS_SHOW_UDFPS_ENROLL_IN_SETTINGS flag.
3. If description text view has overlap with udfps progress view, hide the description text view.
Test: atest FingerprintEnrollEnrollingTest
Test: manually test by setting both display and text largest size and
start enrolling fingerprint; the description is hidden if it's too long.
Bug: 260970216
Change-Id: I085dc62993ffa22d018dd57517c96d69e9d9cbcb
2023-05-11 17:34:07 +00:00
Hao Dong
c753221adf
Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." into udc-dev
2023-05-11 17:17:06 +00:00
tom hsu
5e2862f2e3
[Settings] Avoid to unregister wrong observer
...
Bug: 262345047
Test: atest passed.
Change-Id: If324e8f35c15053b48320f86ff22759a6a68a62f
2023-05-12 01:10:19 +08:00
Treehugger Robot
e2ff838b0c
Merge "Ordering the SIM display name by slot ID to the preference summary." into udc-dev am: 59ec10b05a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157342
Change-Id: I2b2bbe36980949ff99d36f18013c2be2d3767e5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 15:25:02 +00:00
Treehugger Robot
59ec10b05a
Merge "Ordering the SIM display name by slot ID to the preference summary." into udc-dev
2023-05-11 14:52:04 +00:00
Treehugger Robot
1fa9e9fac5
Merge "[Settings] Remove redundant code." into udc-dev am: 643b51c42e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157343
Change-Id: Ic40b7e453eab49009aa6be24f39fef3e4641c393
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 14:43:41 +00:00
TreeHugger Robot
c639d6fd91
Merge "Fix failing test case in AllInOneTetherSettingsTest" into udc-dev am: c271732a85
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157341
Change-Id: I8065f98bd78eb7529427906611bccdc4c860cd31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 14:42:25 +00:00
Treehugger Robot
643b51c42e
Merge "[Settings] Remove redundant code." into udc-dev
2023-05-11 14:28:30 +00:00
jasonwshsu
5656caecd0
Correct shortcut summary to have different software types of shortcut result
...
Root Cause: Did not consider different software types shortcut in AccessibilityShortcutPreferenceFragment
Solution: Add support for different software shortcut types
Bug: 263451053
Test: manual change shortcut type and check
Change-Id: Ic425fdab790d4bbf1de6418ada382e420a9860fc
2023-05-11 22:23:16 +08:00
Weng Su
e485615662
Fix failing test cases in MobileNetworkSummaryControllerTest
...
- Remove obsolete test items
- Update the new callback interface
Bug: 280044539
Bug: 280044731
Test: Manual test
atest -c MobileNetworkSummaryControllerTest
Change-Id: I8460c620c62981dd5ee3b280c1a7467c43dbceb1
2023-05-11 14:15:07 +00:00
Oli Thompson
08b4973f8e
Update Work profile settings
...
Change work apps toggle to a primary toggle
make Xprofile contact search toggle disable/enable when work profile is turned off
Add footer and change strings
Add tests
Test: atest ContactSearchPreferenceControllerTest, atest WorkModePreferenceControllerTest
Bug: 253009702 275538029
Change-Id: I3b2044a5fe3f2aff0748d66e701a3f0d7667ab7a
2023-05-11 14:02:27 +00:00
TreeHugger Robot
c271732a85
Merge "Fix failing test case in AllInOneTetherSettingsTest" into udc-dev
2023-05-11 14:01:25 +00:00
tom hsu
75b24e421e
[Settings] Remove redundant code.
...
Bug: 280236099
Test: make passed
Change-Id: I34e0632887ac38658761abd7d6a7e9f1e0f84bf1
2023-05-11 21:12:29 +08:00
Treehugger Robot
a0c32784ea
Merge "Avoid showing "0 minute" in the charge time label" into udc-dev am: 86f145d22a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157339
Change-Id: I8305321fbd714d439171437c8500f063ee01d8a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 12:58:03 +00:00
Jason Hsu
db3a350e4d
Merge "Update hearing aids to hearing devices" into udc-dev am: f7f38b2d66
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123003
Change-Id: Ie46216f90ac9df4776e626885b218cf306b3dbb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 12:57:38 +00:00
Treehugger Robot
86f145d22a
Merge "Avoid showing "0 minute" in the charge time label" into udc-dev
2023-05-11 12:54:55 +00:00
tom hsu
50dc4e857b
Ordering the SIM display name by slot ID to the preference summary.
...
Bug: 271975836
Test: Manual Test
Change-Id: Ib28062c8d0f1299cf30d494561c161fc4532dbc9
2023-05-11 20:48:09 +08:00
Weng Su
571d9b1f37
Fix failing test case in AllInOneTetherSettingsTest
...
- Add the necessary mock classes
Bug: 280067520
Test: Manual test
atest -c AllInOneTetherSettingsTest
Change-Id: I6576c6997b43103ea810008b7a1a245e3e42015c
2023-05-11 20:43:34 +08:00
Jason Hsu
f7f38b2d66
Merge "Update hearing aids to hearing devices" into udc-dev
2023-05-11 12:15:02 +00:00
Treehugger Robot
cb9d74cea2
Merge "Record app optimization mode backup into BatteryHistoricalLog" into udc-dev am: 1b91f61633
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23124522
Change-Id: Ia53318c8bf1dcd32af55934506a2ea0d15250e86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 11:33:42 +00:00
ykhung
7fdd0e9ef9
Avoid showing "0 minute" in the charge time label
...
Remove the charge to full time label if its value is invalid
https://screenshot.googleplex.com/5psbvFpcm2CFdRB
Test: make test RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.*
Fix: 278740808
Change-Id: I765cdcdee8525adb2583d5950bc646c604c744de
2023-05-11 19:13:38 +08:00
Treehugger Robot
1b91f61633
Merge "Record app optimization mode backup into BatteryHistoricalLog" into udc-dev
2023-05-11 10:54:55 +00:00
Treehugger Robot
4d61561fa3
Merge "Fix non-hearing devices show in pair new hearing devices page" into udc-dev am: 59fa9de0cf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155081
Change-Id: I94f33e7f52875dbccbf6327430a6192ce01a4ff7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 10:10:41 +00:00
Treehugger Robot
59fa9de0cf
Merge "Fix non-hearing devices show in pair new hearing devices page" into udc-dev
2023-05-11 09:42:23 +00:00
Mill Chen
f321799f43
Update string for touch sounds
...
Bug: 274081150
Test: visual verify
Change-Id: I953f108884cafc91e2a3a76bd1292ea30386d862
2023-05-11 17:24:32 +08:00
TreeHugger Robot
402ffdeaf6
Merge "Remove search entries from old pages when SC is on." into udc-dev am: d2e8495f4c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23122025
Change-Id: Iacfe9bbe1a258baac3e48c24e283b1ed3954cf2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 08:44:49 +00:00
jasonwshsu
7eeed19d28
Update hearing aids to hearing devices
...
* We change the string 'hearing aids' to 'hearing devices', here are
some left strings need to be updated.
Bug: 281782174
Test: flash rom and check UI
Change-Id: I0e3395c91d42b037158d135d1cbe519acac50aa0
2023-05-11 16:41:54 +08:00
Yanting Yang
bc297b9f3c
Make “Reset app preferences” restricted by DISALLOW_APPS_CONTROL
...
When DISALLOW_APPS_CONTROL restriction is enabled, users should not be
able to enable/disable apps, clear app caches and clear app data.
“System >Reset options > Reset app preferences” can take the above
actions which should be restricted by DISALLOW_APPS_CONTROL to fix the
security vulnerability.
Bug: 278559731
Test: Verify change by turning on/off DISALLOW_APPS_CONTROL with TestDPC.
Change-Id: I387a95aa7f54fe04d5ed92372e43a88d5fe3e79a
2023-05-11 16:29:07 +08:00
Angela Wang
fb0d23955d
Fix non-hearing devices show in pair new hearing devices page
...
Non-hearing devices are listed in "pair new hearing devices page" if we click the "See more devices" button and go back from "general pair new devices page".
Root cause:
Two types of Bluetooth scanning happen simultaneously and the scanning results of different scanning methods are handled in the same place. Currently the BLE scanning callback “onScanResult()” directly calls “onDeviceAdded()” method to handle the new scanned devices. This method is mainly called when receiving a broadcast of a new device found in Bluetooth classic scanning. The general pair new devices page uses Bluetooth classic scanning and the pair new hearing devices page uses Bluetooth LE scanning. The life cycle ordering when going back from general pair new devices page to pair new hearing devices page will be "pair new hearing devices page".onStart() -> "general pair new devices page".onStop(). It means the classic scanning is not stopped while the BLE scanning starts and this causes the scanning results from classic scanning unexpectedly added to the list which should only show the scanning results from BLE scanning.
Solution:
Separates the handling part of two scanning methods. Leaves "onDeviceAdded" handling Bluetooth classic scanning results only, and handles BLE scanning results in the “onScanResult” callback directly.
Bug: 279374435
Test: checks the result by switching back from "general pair new devices page" to "pair new hearing devices page"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DeviceListPreferenceFragmentTest
Change-Id: Iebdde401ffb3dc0569478730a140a5dd7add115b
2023-05-11 08:28:12 +00:00
TreeHugger Robot
d2e8495f4c
Merge "Remove search entries from old pages when SC is on." into udc-dev
2023-05-11 08:14:04 +00:00
SongFerng Wang
2319563b00
Merge "Update the wording for LE Audio" into udc-dev am: c487d5a10c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23156659
Change-Id: I7745d09826da393c5d3c2377f37ab2761d313dc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 07:40:02 +00:00
SongFerng Wang
c487d5a10c
Merge "Update the wording for LE Audio" into udc-dev
2023-05-11 07:11:11 +00:00
Milton Wu
d126303343
Enable presubmit biometrics unit tests
...
Enable biometrics/biometrics2/password unit tests
Bug: 281627891
Test: atest :presubmit in Settings folder
Change-Id: I2587b50b75a161c7b19f1e3430e41b98cfe6cf63
Merged-In: I2587b50b75a161c7b19f1e3430e41b98cfe6cf63
(cherry picked from commit a90536b632
)
2023-05-11 06:07:08 +00:00
TreeHugger Robot
758c01fbb8
Merge "Show disable dialog box when none is selected" into udc-dev am: 1742524dd3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23139605
Change-Id: I91aaaf25b6b8e8d865b4104eac643bb97bf52a8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 05:13:36 +00:00
Tom Hsu
07db6514d3
Merge "[Settings] Avoid NPE if BT device is changed by framework." into udc-dev am: 5576947555
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23141916
Change-Id: I75594ae645fa1556b08f639f4f3c014d7038103b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 05:13:06 +00:00
TreeHugger Robot
1742524dd3
Merge "Show disable dialog box when none is selected" into udc-dev
2023-05-11 05:02:34 +00:00
SongFerngWang
f4c5c8ef5e
Update the wording for LE Audio
...
Add the summary for LE Audio toggle
Bug: 280000165
Test: build pass
Change-Id: Ic1eee71d6ff70d01e9a37ab0ec06cfaf639fe963
2023-05-11 12:30:59 +08:00
Tom Hsu
5576947555
Merge "[Settings] Avoid NPE if BT device is changed by framework." into udc-dev
2023-05-11 04:30:19 +00:00
Wesley Wang
cf1190c7cb
Update battery health state intent (2/3)
...
- Update the extra from overheated to longlife
Bug: 278192441
Test: make SettingsRoboTests
Change-Id: I5a906e64effbd9aaf84446c0670249afefdf7da8
2023-05-11 11:27:16 +08:00
Bill Yi
2b214a4e1a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7a494fc7c5
-s ours am: c8c199020a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121132
Change-Id: I9aff000835f3d1642e505e8543adbe7d059f359f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 03:22:08 +00:00
ykhung
8f56114489
Record app optimization mode backup into BatteryHistoricalLog
...
App optimization mode format:
https://screenshot.googleplex.com/di9DDzBfYf7ihfV
App optimization mode backup format:
https://screenshot.googleplex.com/GkVW5HrgGvmv5yh
Bug: 192523697
Test: make SettingsRoboTests
Change-Id: I60a9a76a8ffc89d625ee3f77c138a19181c81c38
2023-05-11 10:48:47 +08:00
Bill Yi
c8c199020a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7a494fc7c5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121132
Change-Id: Id8b9494bf8edd0e1ea401b95e3bdfc558c58eb49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 02:40:17 +00:00
Becca Hughes
8e9119f5ab
Show disable dialog box when none is selected
...
Also remove from CMPP since that will be
hidden.
Test: ondevice
Bug: 281147573
Merged-In: Ic2b59c42ed4ddbc83a770b8bb99c641d2f1a383d
Change-Id: Ic2b59c42ed4ddbc83a770b8bb99c641d2f1a383d
2023-05-11 02:28:54 +00:00