YK Hung
83de631175
Merge "Update battery health state intent (2/3)" into udc-dev
2023-05-15 03:27:44 +00:00
Milton Wu
abfb8a5e9d
Fix FaceUpdater.enroll unit test fail in aosp
...
Ignore related tests
Bug: 281627891
Test: atest FaceUpdaterTest
Change-Id: I028a7dd7fd2e56889ac27051678ca954c896da20
2023-05-14 02:57:05 +00:00
Jason Hsu
4ea92477bb
Merge "Move 'Audio Output' to Accessibility hearing device page" into udc-dev am: 181cfa3aa5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157344
Change-Id: I4032413c971afa68b665e3cc1448dafad0bfcb67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 14:45:18 +00:00
Jason Hsu
181cfa3aa5
Merge "Move 'Audio Output' to Accessibility hearing device page" into udc-dev
2023-05-12 14:20:23 +00:00
Treehugger Robot
2318405bcb
Merge "Update battery settings remaining time format" into udc-dev am: e99f757f60
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199829
Change-Id: I5ec64979638d3764a69c8a08f9c8916be7c0598b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 12:39:22 +00:00
Treehugger Robot
e99f757f60
Merge "Update battery settings remaining time format" into udc-dev
2023-05-12 12:29:14 +00:00
Oli Thompson
ef25255311
Merge "Update Work profile settings" into udc-dev am: 787a054c93
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252125
Change-Id: Ida56d040d8ea5361f3aa57dd8fecd62124a438d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 11:36:03 +00:00
Oli Thompson
787a054c93
Merge "Update Work profile settings" into udc-dev
2023-05-12 11:05:57 +00:00
Wesley Wang
77deb463a0
Update battery settings remaining time format
...
- Update the remaining time format to align with status bar
- Remove unused test case since no more less than 7 or 15 remaining time
case for battery settings
screenshots:
https://screenshot.googleplex.com/8jPYPj7yznGFU4b.png
https://screenshot.googleplex.com/5GYXA2tusSUVmVQ.png
https://screenshot.googleplex.com/3EnB3ejAxAzP28q.png
https://screenshot.googleplex.com/5jeUxwBEyHotf9d.png
Bug: 281685505
Test: make SettingsLibRoboTests
Change-Id: If33e1828582845f78d8ef666c2b74ab5bba22357
2023-05-12 11:05:05 +00:00
Tom Hsu
db6119e840
Merge "[Settings] Avoid to unregister wrong observer" into udc-dev am: 0af8c60342
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162866
Change-Id: I968669dafda341eb56e4f8d43fd4c51854595b7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 06:00:22 +00:00
jasonwshsu
212470d0a6
Move 'Audio Output' to Accessibility hearing device page
...
* Extract the common part into HearingAidHelper.
* Remove abstract getHearingDevice(). Change to get the hearing device when needed.
* Move several classes from Bluetooth into Accessibility
Bug: 281783079
Test: make RunSettingsRoboTests ROBOTEST_FILTER="(HearingDeviceAudioRoutingBasePreferenceControllerTest|AccessibilityHearingAidPreferenceControllerTest|HearingAidHelperTest|HearingAidAudioRoutingPreferenceControllerTest|HearingDeviceCallRoutingPreferenceControllerTest)"
Change-Id: I79049107409b7086c6dcc8d48a6323e171ed1535
2023-05-12 13:46:53 +08:00
Tom Hsu
0af8c60342
Merge "[Settings] Avoid to unregister wrong observer" into udc-dev
2023-05-12 05:16:28 +00:00
Zoey Chen
6d57de3418
Merge "[Panlingual] Do not show dialog in recycle. Set LocaleEditor as the parent fragment and control the dialog." into udc-dev am: 4d917d990f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23074017
Change-Id: I7b86992ad5572b2c4bd86b1c5935839bceaa1186
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 03:54:12 +00:00
Zoey Chen
4d917d990f
Merge "[Panlingual] Do not show dialog in recycle. Set LocaleEditor as the parent fragment and control the dialog." into udc-dev
2023-05-12 03:37:37 +00:00
Zoey Chen
fb6b6b0bcc
[Panlingual] Do not show dialog in recycle. Set LocaleEditor as the
...
parent fragment and control the dialog.
Keep the dialog and the locale list after rotation
Bug: 279527362
Change-Id: I349fd9d0fea5b43a8bbb2a23fa60fc4c5436c5cf
Test: make RunSettingsRoboTests -j128 ROBOTEST_FILTER=LocaleListEditorTest
Test: atest LocaleDialogFragmentTest
2023-05-12 02:40:13 +00:00
TreeHugger Robot
d1d6fd9d9d
Merge "Fix failing test cases in MobileNetworkSummaryControllerTest" into udc-dev am: b7b444896e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157345
Change-Id: I2c3a7b4b301c24dea7eb94115e47c5ec6185ccac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 02:05:56 +00:00
TreeHugger Robot
b7b444896e
Merge "Fix failing test cases in MobileNetworkSummaryControllerTest" into udc-dev
2023-05-12 01:34:00 +00:00
Hao Dong
2386847a2f
Merge "Hide description text view if there is overlap." into udc-dev am: 1eb3724e1f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162325
Change-Id: Ibbea1584e774a5249bfb73d8f3e98b175b963225
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 22:51:36 +00:00
Hao Dong
1eb3724e1f
Merge "Hide description text view if there is overlap." into udc-dev
2023-05-11 22:10:55 +00:00
Fangqiu Su
3c36f4c88e
Merge "Update uiautomator references in packages/apps/Settings/tests/anomaly-tester" am: 0a3a5b74a1
am: 942671e18a
am: 1cc65c8dce
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558310
Change-Id: I0d81ddfa513a5e523c9268384156dab62bae1e97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 21:47:41 +00:00
Yuxin Hu
37dc9f703c
Merge "Add AndroidJUnitTest for developer option switch" into udc-dev am: 6e3aba5366
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23149451
Change-Id: I17ef944bc6163feee27ea59fcde09f9d65bbd37f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 21:43:22 +00:00
Fangqiu Su
1cc65c8dce
Merge "Update uiautomator references in packages/apps/Settings/tests/anomaly-tester" am: 0a3a5b74a1
am: 942671e18a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558310
Change-Id: I4350f048408914f3d46bfb54a546fc9861c565bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 21:00:02 +00:00
Yuxin Hu
6e3aba5366
Merge "Add AndroidJUnitTest for developer option switch" into udc-dev
2023-05-11 20:48:57 +00:00
Fangqiu Su
942671e18a
Merge "Update uiautomator references in packages/apps/Settings/tests/anomaly-tester" am: 0a3a5b74a1
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558310
Change-Id: I4d7c2aa70600ffecdda7aa467926993732e1fb72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 20:19:48 +00:00
Fangqiu Su
0a3a5b74a1
Merge "Update uiautomator references in packages/apps/Settings/tests/anomaly-tester"
2023-05-11 19:50:53 +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
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
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
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
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
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
Treehugger Robot
1b91f61633
Merge "Record app optimization mode backup into BatteryHistoricalLog" into udc-dev
2023-05-11 10:54:55 +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
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
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
Angela Wang
16fc56f72c
Merge "Disabled state UI of Flash Notifications preview button" into udc-dev am: 22d3116188
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081916
Change-Id: I580326606ec0e281f42e57dd464be5265e9bf948
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 02:15:50 +00:00
Angela Wang
22d3116188
Merge "Disabled state UI of Flash Notifications preview button" into udc-dev
2023-05-11 01:41:47 +00:00
Hao Dong
755a67a931
Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen.
...
Bug: 279823572
Test: atest FingerprintSettingsFragmentTest
Test: atest ChooseLockGenericTest
Change-Id: Ie4bc18bf245eb7a755862401c710d85381063ff9
Merged-In: Ie4bc18bf245eb7a755862401c710d85381063ff9
2023-05-10 23:26:02 +00:00
tom hsu
0617631408
[Settings] Avoid NPE if BT device is changed by framework.
...
- Do not register only one BT device for primary to avoid primary
BT devcie change to another.
- Register and unregister all BT devices
Bug: 280236099
Test: atest passed
Change-Id: I610144c7f8f649e40d99cf1dc7f50d1f3b80f109
2023-05-11 02:53:19 +08:00
Treehugger Robot
568034bd25
Merge "Fix mistake in test" into udc-dev am: 6a06cdd1bf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23118776
Change-Id: I65fb0509184b16e43f784e3ad2584f322682982f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 16:43:38 +00:00
Treehugger Robot
6a06cdd1bf
Merge "Fix mistake in test" into udc-dev
2023-05-10 15:59:23 +00:00
Treehugger Robot
c493c1226a
Merge "Refine optimize page log pattern" into udc-dev am: d865ccc2ed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23129577
Change-Id: I83b8b8374a8865ed9847021a7bb55882d8845339
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 12:07:44 +00:00
Treehugger Robot
d865ccc2ed
Merge "Refine optimize page log pattern" into udc-dev
2023-05-10 11:38:38 +00:00
YK Hung
69d781abd4
Merge "Remove the legacy smart battery tip from Settings" into udc-dev am: 2aff060aca
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23129578
Change-Id: Iddd24fef6f73ed0de5377ef0daa109fad8d59272
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 11:25:36 +00:00