Jason Hsu
75b9499364
Merge "Update hearing aids to hearing devices" into udc-dev am: f7f38b2d66
am: 884bc10f9b
am: b9f0489c01
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123003
Change-Id: Icd7fb0e5cdc9599aa92e71b120b91fb6aa55382f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 14:25:51 +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
Treehugger Robot
8b3c2ea963
Merge "Avoid showing "0 minute" in the charge time label" into udc-dev am: 86f145d22a
am: a0c32784ea
am: b86e027c88
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157339
Change-Id: I2325a3abafa665c56a25cdb0acedafadf4ba9956
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 14:20:58 +00:00
Jason Hsu
f6dae369c5
Merge "Update hearing aids to hearing devices" into udc-dev am: f7f38b2d66
am: db3a350e4d
am: d7b99e5b12
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123003
Change-Id: I518895b65b3eb52a010d47b08ff414c3da20adb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 14:20:49 +00:00
Treehugger Robot
a500781d67
Merge "Avoid showing "0 minute" in the charge time label" into udc-dev am: 86f145d22a
am: 921b1f6a6f
am: 52e2ee66ac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157339
Change-Id: If6c5231df1d4e4c8c9b2511d0b612180a6c4f733
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 14:20:38 +00:00
Jason Hsu
4f715ffa7a
Merge "Update hearing aids to hearing devices" into udc-dev am: f7f38b2d66
am: 884bc10f9b
am: 013fc5a1ed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123003
Change-Id: If8e7ba3aa15256770069fe19b37bdd8df24b2b31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 14:20:17 +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
Treehugger Robot
b86e027c88
Merge "Avoid showing "0 minute" in the charge time label" into udc-dev am: 86f145d22a
am: a0c32784ea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157339
Change-Id: I9b16af70557443d118dfbbb05a5b67f31717e1ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 13:43:54 +00:00
Jason Hsu
d7b99e5b12
Merge "Update hearing aids to hearing devices" into udc-dev am: f7f38b2d66
am: db3a350e4d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123003
Change-Id: Ied21dcde49a87a2a7ea13032be9708793f40969e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 13:43:46 +00:00
Treehugger Robot
52414ae87d
Merge "Avoid showing "0 minute" in the charge time label" into udc-dev am: 86f145d22a
am: 921b1f6a6f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157339
Change-Id: I25f361e28b334ab7bc13d6604d92124e513b153e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 13:43:16 +00:00
Jason Hsu
b9f0489c01
Merge "Update hearing aids to hearing devices" into udc-dev am: f7f38b2d66
am: 884bc10f9b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123003
Change-Id: I1e01ac445a7fb2f704d6c210f2783feeeee418e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 13:43:10 +00:00
Treehugger Robot
52e2ee66ac
Merge "Avoid showing "0 minute" in the charge time label" into udc-dev am: 86f145d22a
am: 921b1f6a6f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157339
Change-Id: I7004df1ab07821273a6bf459528cac71450951e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 13:39:24 +00:00
Jason Hsu
013fc5a1ed
Merge "Update hearing aids to hearing devices" into udc-dev am: f7f38b2d66
am: 884bc10f9b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123003
Change-Id: Id7c9ecf428c2cc3bb8e51d940733e9ac65ba2928
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 13:39:16 +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
4833f8e853
Merge "Record app optimization mode backup into BatteryHistoricalLog" into udc-dev am: 1b91f61633
am: 8bf8d0b1eb
am: d22d3ff4eb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23124522
Change-Id: I359c90f5ee4eb0781ec8f8e1c43aa63c036d18bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 13:02:41 +00:00
Treehugger Robot
921b1f6a6f
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: I8157b50b4b0a3a202502bb92f8f6c4818a0f2b58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 13:02:01 +00:00
Jason Hsu
884bc10f9b
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: I717d5d434cef75149c3c110cb9e80835af15be0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 13:01:39 +00:00
Treehugger Robot
f439fe8423
Merge "Record app optimization mode backup into BatteryHistoricalLog" into udc-dev am: 1b91f61633
am: cb9d74cea2
am: 5acc7def5e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23124522
Change-Id: I868f6d60105b74aa817ca1a2d03a5e9e8a3b5c8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 12:58:18 +00: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
Treehugger Robot
de4e33dc52
Merge "Record app optimization mode backup into BatteryHistoricalLog" into udc-dev am: 1b91f61633
am: 8bf8d0b1eb
am: c75b598d0c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23124522
Change-Id: Ifc2df948cf586bc8a98055f8708ded018b04babd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 12:57:59 +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
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
d22d3ff4eb
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: I51551cfb428a607d7f8a6d7ec12b69da663b053c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 12:19:12 +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
53475e1994
Merge "Fix non-hearing devices show in pair new hearing devices page" into udc-dev am: 59fa9de0cf
am: da48c087e0
am: 27dea53939
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155081
Change-Id: Id5d869f9c803f51d96d811c47b9e65e221e9289d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 11:38:58 +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
7035f74645
Merge "Fix non-hearing devices show in pair new hearing devices page" into udc-dev am: 59fa9de0cf
am: 4d61561fa3
am: 721820de1e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155081
Change-Id: I89f8900cf4bf2c962a459d32dac04d5c0ad60eb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 11:34:07 +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
Treehugger Robot
aca653cbcc
Merge "Fix non-hearing devices show in pair new hearing devices page" into udc-dev am: 59fa9de0cf
am: da48c087e0
am: b1f6ae7816
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155081
Change-Id: Iada775acab620bf47d99f428dcd0c6f4627f5be8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 11:33:19 +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
27dea53939
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: I76e43d0d0b0bc31a94628950776f8732008592e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 10:56:03 +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
c8d55217d9
Merge "Remove search entries from old pages when SC is on." into udc-dev am: d2e8495f4c
am: 520927752a
am: 1609640693
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23122025
Change-Id: I053834788cb87b086f4c0d933d84a77dc782c3be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 10:13:43 +00:00
TreeHugger Robot
df4135df6e
Merge "Remove search entries from old pages when SC is on." into udc-dev am: d2e8495f4c
am: 402ffdeaf6
am: 199e699214
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23122025
Change-Id: Ic99fb07b4c7bc3125e2680c0e68b20792ed45f5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 10:12:30 +00:00
TreeHugger Robot
23f1777501
Merge "Remove search entries from old pages when SC is on." into udc-dev am: d2e8495f4c
am: 520927752a
am: 729572c7c4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23122025
Change-Id: I87b8672b99f8a9bfe0d4f03adfa62c24dfc8e257
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 10:12:08 +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
1609640693
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: Ie143435cbe81895834aaa32d53b7cef4e369845c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 09:28:05 +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