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
Treehugger Robot
5acc7def5e
Merge "Record app optimization mode backup into BatteryHistoricalLog" into udc-dev am: 1b91f61633
am: cb9d74cea2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23124522
Change-Id: Iaf78029f1f0c37f068c73f74e97c057c34cbe945
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 12:20:21 +00:00
Treehugger Robot
c75b598d0c
Merge "Record app optimization mode backup into BatteryHistoricalLog" into udc-dev am: 1b91f61633
am: 8bf8d0b1eb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23124522
Change-Id: Ie7a2be85d0008d7e8e09eb14468714c93e764963
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 12:16:41 +00:00
Jason Hsu
f7f38b2d66
Merge "Update hearing aids to hearing devices" into udc-dev
2023-05-11 12:15:02 +00:00
Treehugger Robot
8bf8d0b1eb
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: I019a6b64bd482cbdfc15648a1dcdfd3648708519
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 11:37:52 +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
721820de1e
Merge "Fix non-hearing devices show in pair new hearing devices page" into udc-dev am: 59fa9de0cf
am: 4d61561fa3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155081
Change-Id: If0e756eaadbc95e2034640ce094ee438e6e320f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 10:56:46 +00: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
b1f6ae7816
Merge "Fix non-hearing devices show in pair new hearing devices page" into udc-dev am: 59fa9de0cf
am: da48c087e0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155081
Change-Id: I1e1960be47501efef395f413135691eb72f089b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 10:52:09 +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
da48c087e0
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: I51b54455d5c2dd73c380fac22b345bc83570397f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 10:09:51 +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
TreeHugger Robot
199e699214
Merge "Remove search entries from old pages when SC is on." into udc-dev am: d2e8495f4c
am: 402ffdeaf6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23122025
Change-Id: I263cd51d709313f9f4a02c0082a6239df1df031a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 09:27:57 +00:00
TreeHugger Robot
729572c7c4
Merge "Remove search entries from old pages when SC is on." into udc-dev am: d2e8495f4c
am: 520927752a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23122025
Change-Id: I4b88361ee8642874efec24fdd04174ba13363658
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 09:25:10 +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
TreeHugger Robot
520927752a
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: Ibb95d6559eccf81d77ebd9299359d3b93a3c784c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 08:44:17 +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
SongFerng Wang
ac69e243c1
Merge "Update the wording for LE Audio" into udc-dev am: c487d5a10c
am: 343602fd5e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23156659
Change-Id: I77e397cd0cc75fb1c5b6e93c909b4be293bc3b40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 08:21:06 +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
96df087783
Merge "Update the wording for LE Audio" into udc-dev am: c487d5a10c
am: 2319563b00
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23156659
Change-Id: I1d2da49d6dae634f3498943fd42c79e5e2956076
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 08:05:52 +00:00
SongFerng Wang
343602fd5e
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: Ifd85fa0461be871e9bdc52977f1e5b91a8fa1aac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 07:44:20 +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
TreeHugger Robot
cfa6458241
[automerger skipped] Merge "Show disable dialog box when none is selected" into udc-dev am: 1742524dd3
am: 758c01fbb8
-s ours
...
am skip reason: Merged-In Ic2b59c42ed4ddbc83a770b8bb99c641d2f1a383d with SHA-1 8e9119f5ab
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23139605
Change-Id: I4f749c52da2f4370fe6771caa342024a5ced4603
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 05:35:37 +00:00
Tom Hsu
b679aff5a0
Merge "[Settings] Avoid NPE if BT device is changed by framework." into udc-dev am: 5576947555
am: 07db6514d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23141916
Change-Id: I18f2b39a05daa7d95ba41e8d5d1386daa86e9a65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 05:34:34 +00:00
TreeHugger Robot
00cc06ab7a
Merge "Show disable dialog box when none is selected" into udc-dev am: 1742524dd3
am: 728b1b8337
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23139605
Change-Id: Iec6d97042a0fc3b6d68a194ff0eff37f3243c0bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 05:33:47 +00:00
Tom Hsu
32dd2dc83c
Merge "[Settings] Avoid NPE if BT device is changed by framework." into udc-dev am: 5576947555
am: 4d3264553c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23141916
Change-Id: I5fed4eb62ef9d72b24e0909126c3592eab949959
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 05:32:46 +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
728b1b8337
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: I9e96a83571c105b8858dc4bdc4f578dc6720f652
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 05:12:49 +00:00
Tom Hsu
4d3264553c
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: Ibff6a407d7211597f6f8cf97c4ddf7403f11330c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 05:12:12 +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
Bill Yi
fe4f51b4ab
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7a494fc7c5
-s ours am: c8c199020a
-s ours am: 2b214a4e1a
-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: Icda1661a7d64321824675959a8e84ec9d675442f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 04:12:34 +00:00
Bill Yi
c5708ff051
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7a494fc7c5
-s ours am: c8c199020a
-s ours am: 541d74eb4d
-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: I0e3d26fc1779000ee21dbb21f5c3d5d507224a82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 04:08:21 +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
541d74eb4d
[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: Id45461b6303f6d7f3da8e2b6c2c7c0e34447c74b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 03:26:10 +00: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
Angela Wang
378e9f073d
Merge "Disabled state UI of Flash Notifications preview button" into udc-dev am: 22d3116188
am: e9106f35ce
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081916
Change-Id: I8b271bdd8529fc596e5bf30132d0a1886e189fc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 03:00:56 +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
Angela Wang
c4ff1e822f
Merge "Disabled state UI of Flash Notifications preview button" into udc-dev am: 22d3116188
am: 16fc56f72c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081916
Change-Id: I6088b5e1c4e5bb7db783ecca348e490c87b0a1d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 02:44:28 +00:00
TreeHugger Robot
d025a6f35d
Merge changes from topic "tc_change_2305100725_43" into udc-dev-plus-aosp am: d803091a4b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121132
Change-Id: I9af5fc172e4427f80ab9b51d7e6b3aeee1615822
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 02:42:42 +00:00
Bill Yi
2292bd9446
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7a494fc7c5
2p: 40fae6e492
am: 77e2066906
-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: I0b5c2fc3399dc4367f9871cad439da9b0138c3f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 02:42:37 +00:00