Bonian Chen
8a439d0a02
[Settings] Code refactor for SIM change detection
...
Code refactor for maintainance:
Move subscription change monitor out of ResetnetworkConfirm
Bug: 259611847
Test: local test, auto testing
Change-Id: I97a251ced4435d0cc390b40028edef07fd71e24f
2022-12-05 05:42:11 +00:00
PETER LIANG
2af12acaed
Merge "Add the extra style of the reset button to align SuW style."
2022-12-05 05:12:11 +00:00
Bill Yi
87b80e3242
Merge changes from topic "tc_change_22120406_22"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 00fadffa56
Import translations. DO NOT MERGE ANYWHERE
2022-12-05 05:08:31 +00:00
Edgar Wang
22a858b2bb
Merge "Avoid media transcode can be bypass guard of developer options" into tm-qpr-dev am: cb27771fd5
am: f39285a722
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20608287
Change-Id: Ie45d3b1c87177a885ab42cb401e364a62c215ec1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-05 04:20:27 +00:00
Edgar Wang
f39285a722
Merge "Avoid media transcode can be bypass guard of developer options" into tm-qpr-dev am: cb27771fd5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20608287
Change-Id: I541d2fd5f50812fbd675e7ba9466a15558bb6ef0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-05 03:47:35 +00:00
Betty Chang
32591bfb96
Merge "[LE Audio] To remove the broadcast source item that created by receive state"
2022-12-05 03:42:06 +00:00
YK Hung
d666c1bf6d
Merge "Move fuelgauge_usage_state.proto into fuelgauge folder."
2022-12-05 03:36:35 +00:00
TreeHugger Robot
cbe52e6b1c
Merge "Add minimum TLS version for Wi-Fi EAP network"
2022-12-05 03:33:42 +00:00
Peter Liang
734e5291bb
Add the extra style of the reset button to align SuW style.
...
Bug: 222419452
Test: manual test
Change-Id: I3b020129b04b3036a2de8230c759c69e7342e027
2022-12-05 11:10:59 +08:00
Edgar Wang
cb27771fd5
Merge "Avoid media transcode can be bypass guard of developer options" into tm-qpr-dev
2022-12-05 03:02:59 +00:00
Treehugger Robot
4e21df7fb1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 939f6eed12
-s ours am: 8667f5efee
-s ours am: 82dd9c34cd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326123
Change-Id: I5f31ba843368482e0ac7fae5cb4fe5672017970d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-04 20:41:02 +00:00
Bill Yi
88b65eb954
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1eee9788bd
-s ours am: 3a9e2e401d
-s ours am: 54e98aa86e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326123
Change-Id: I5b73b222f3368bf0642e8cdbc4efac6ed5ead4a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-04 20:40:47 +00:00
Treehugger Robot
878dd9c8be
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: db2fea9847
-s ours am: 41f417f87b
-s ours am: e92ac63e41
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326122
Change-Id: I6d21e4c77d06e6ac91aaceb0263262d083365ade
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-04 20:40:30 +00:00
Bill Yi
014ac990db
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 77827ac6f9
-s ours am: fa8111eca1
-s ours am: 976ce75e87
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326122
Change-Id: I325c769e7e83204b7959ca273a376b9de84bd27d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-04 20:40:08 +00:00
Treehugger Robot
98ae913b64
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e1c63ece9a
-s ours am: 891c3ab05a
-s ours am: 1539b81ad4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326121
Change-Id: I042308af9beba927ec6beb388485a9e69e906b21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-04 20:04:42 +00:00
Bill Yi
7b80a39262
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a702ea7b1
-s ours am: 14e15aaaa1
-s ours am: deec7d5a91
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326121
Change-Id: I7900fdf036a750a0bb3ddb1c16a54d2a115da26a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-04 20:04:27 +00:00
Treehugger Robot
82dd9c34cd
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 939f6eed12
-s ours am: 8667f5efee
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326123
Change-Id: I72150161019572481547375a88fd73d9e1e70e5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-04 19:35:15 +00:00
Bill Yi
54e98aa86e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1eee9788bd
-s ours am: 3a9e2e401d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326123
Change-Id: I61f1583cdf06f489a89b110324f4d932238daa3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-04 19:34:58 +00:00
Treehugger Robot
e92ac63e41
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: db2fea9847
-s ours am: 41f417f87b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326122
Change-Id: I9c8f91fd8dd93cb1aeeb43d9728e55500da6e477
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-04 19:34:41 +00:00
Bill Yi
976ce75e87
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 77827ac6f9
-s ours am: fa8111eca1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326122
Change-Id: Iecd6456a5d1ffb4233abd2e53951bd4ee129c695
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-04 19:34:28 +00:00
Treehugger Robot
1539b81ad4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e1c63ece9a
-s ours am: 891c3ab05a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326121
Change-Id: Ibab1bf0a44759ae952722c2e95ade28d4d5ec93e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-04 19:20:39 +00:00
Bill Yi
deec7d5a91
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a702ea7b1
-s ours am: 14e15aaaa1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326121
Change-Id: Ia8737c4f76c3ee0cdcf19b27e5f47e9f444c6916
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-04 19:20:34 +00:00
Treehugger Robot
8667f5efee
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 939f6eed12
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326123
Change-Id: I07e5c3448aec9e82e9742aa2b94de373dd46556e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-04 18:49:12 +00:00
Bill Yi
3a9e2e401d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1eee9788bd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326123
Change-Id: Idd2dd91b94e3dd1e59030db9bdc5f176097c8f34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-04 18:49:01 +00:00
Treehugger Robot
41f417f87b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: db2fea9847
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326122
Change-Id: Ie0a7bfc3f350cb049e821416ec1f80ace595c8e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-04 18:48:46 +00:00
Bill Yi
fa8111eca1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 77827ac6f9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326122
Change-Id: Ie432f5295ba262e7caf41fcc33da65d77e9a7395
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-04 18:48:12 +00:00
Treehugger Robot
891c3ab05a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e1c63ece9a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326121
Change-Id: I81ea24c30ed1c174c965e8fde4b3da633eb802e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-04 18:24:56 +00:00
Bill Yi
14e15aaaa1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a702ea7b1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326121
Change-Id: I93b034a8d56b908a412475771db25f4bf81dd2c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-04 18:24:40 +00:00
Treehugger Robot
939f6eed12
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-12-04 17:53:51 +00:00
Treehugger Robot
db2fea9847
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-12-04 17:53:51 +00:00
Treehugger Robot
e1c63ece9a
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-12-04 17:51:55 +00:00
Bill Yi
7192d32538
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 00fadffa56
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20631317
Change-Id: I8eb5c89f0a0ea9d03ae6ec51cdb2ec7ce0cccfd4
2022-12-04 14:20:53 +00:00
changbetty
a6d532cdba
[LE Audio] To remove the broadcast source item that created by receive
...
state
- When the user clicks another broadcast source and wants to join,
we will remove the previous item that created by getAllSource().
And trigger the search again.
Bug: 242267719
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothBroadcastSourcePreferenceTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothFindBroadcastsFragmentTest
Change-Id: I416f0a39e31276876e63360664555f99dd7297c9
2022-12-04 13:52:10 +00:00
Bill Yi
00fadffa56
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I92dca6b2cc72ae627619370955215ffdf8f3b3d1
2022-12-04 00:34:03 -08:00
Bill Yi
38cec4fba6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ifd07a3fec3a401205811b8c013590b519469b78b
2022-12-03 12:00:12 -08:00
Bill Yi
0aeba23203
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I18da1a6fe2a305975c3960be278c69466fbd1e4a
2022-12-03 11:58:48 -08:00
Bill Yi
4076fea0ca
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id9d4b1127d0ce707f97a0ee55bfb736f6f3ad979
2022-12-03 11:55:52 -08:00
Bill Yi
1eee9788bd
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I956252050d37d066f5b03c78321b60b4582e8307
2022-12-03 11:42:11 -08:00
Bill Yi
77827ac6f9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id8d5d5c19dd13d77dc849aaba050134b5fe4415a
2022-12-03 11:40:56 -08:00
Bill Yi
8a702ea7b1
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0775c4d7fba47cd1cf4259bf7b1dcb58b79a1eb9
2022-12-03 11:38:04 -08:00
Chaohui Wang
fb2b9f78dd
Merge "Clean up some UnusedResources detected by lint 8"
2022-12-03 07:11:43 +00:00
Grace Cheng
1db259c72e
[automerger skipped] Merge "Removes duplicate SFPS string and updates references" into tm-qpr-dev am: af2896195e
am: b7eef9c024
-s ours
...
am skip reason: Merged-In I259669a09f5535f3a776793659e5bc6bdb90a44c with SHA-1 9d6a869ebe
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20521647
Change-Id: I6a19e890e397e7665c1c446c5b4cd7eb0995eb81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-03 06:46:36 +00:00
Grace Cheng
bfa95b98c9
[automerger skipped] Removes duplicate SFPS string and updates references am: 0d74f4b755
am: ebda524556
-s ours
...
am skip reason: Merged-In I259669a09f5535f3a776793659e5bc6bdb90a44c with SHA-1 9d6a869ebe
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20521647
Change-Id: I03d217f3497a26cfe2d14ba5de4bace0a964ef32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-03 06:46:33 +00:00
Grace Cheng
b7eef9c024
Merge "Removes duplicate SFPS string and updates references" into tm-qpr-dev am: af2896195e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20521647
Change-Id: I97b0ec97c73a85e28f3bb4eaa05d59441188a404
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-03 06:10:58 +00:00
Grace Cheng
ebda524556
Removes duplicate SFPS string and updates references am: 0d74f4b755
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20521647
Change-Id: Ifb08c7bdaf0871228620d731c72943ea91272430
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-03 06:10:47 +00:00
Grace Cheng
af2896195e
Merge "Removes duplicate SFPS string and updates references" into tm-qpr-dev
2022-12-03 05:37:34 +00:00
Florian Mayer
cd68fe78a0
[MTE] support force_on for device_control override
...
driveby: remove period for force_off message.
Test: make RunSettingsRoboTests ROBOTEST_FILTER=MemtagHelperTest
Bug: 245624194
Change-Id: I1c56af377925fd58c90bb346d9d003249c5e547c
2022-12-03 02:27:29 +00:00
Bill Yi
af6c532d9a
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-12-03 01:34:02 +00:00
Bill Yi
ba52774bcb
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-12-03 01:34:02 +00:00
Bill Yi
8ece0258d9
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-12-03 01:34:02 +00:00