Bill Yi
545df22b84
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 6ef73d18e1
-s ours am: 62a4b0a359
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20628219
Change-Id: I6ca826872b4274e4c4711b19f2b750e43a663ff3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-05 20:02:35 +00:00
Bill Yi
3612124556
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0aeba23203
-s ours am: 49fdb5dc4a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20628219
Change-Id: Ic6f269b232137665012041a426a114c89e62c7b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-05 20:02:25 +00:00
Bill Yi
4830925dd9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 3408280369
-s ours am: 3663fc792a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20628218
Change-Id: I21448d7781fc4a6d18453c879188a763ef5032bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-05 20:02:15 +00:00
Bill Yi
c90879f696
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4076fea0ca
-s ours am: ba1266b431
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20628218
Change-Id: I26363a0a3bbfd681eea1012eece8e088f0263753
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-05 20:02:06 +00:00
Ale Nijamkin
092de727b9
Merge "Specifies nav destination when opening shortcuts." into tm-qpr-dev am: 674bb29538
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20623875
Change-Id: Ib2cfda862a53c9093db4b21de3c4ebbf32d33a17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-05 20:00:02 +00:00
Ale Nijamkin
674bb29538
Merge "Specifies nav destination when opening shortcuts." into tm-qpr-dev
2022-12-05 19:38:16 +00:00
Florian Mayer
7173032477
[MTE] remove translatable=false from strings
...
No concerns were raised by Settings UX.
Bug: 258550150
Bug: 245624194
Change-Id: Ie58c97108781c94e5a0cd086acca5b21b6ea105f
2022-12-05 19:36:34 +00:00
Bill Yi
e4cea181d6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 1c80356b98
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20628220
Change-Id: I08a087d268c1267da267161d52962de22ab574d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-05 19:06:00 +00:00
Bill Yi
e5cc812e6d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 38cec4fba6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20628220
Change-Id: I0e7ac80475aed3dffc036592b273e1aaf64b424d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-05 19:05:57 +00:00
Bill Yi
62a4b0a359
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 6ef73d18e1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20628219
Change-Id: I93671bd7a40c2f11b47f6ff1a90d25df6ddf4c2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-05 19:05:55 +00:00
Bill Yi
49fdb5dc4a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0aeba23203
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20628219
Change-Id: I4dcb605d252bfa22203d675d3d11726bc1f1cb67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-05 19:05:43 +00:00
Bill Yi
3663fc792a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 3408280369
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20628218
Change-Id: Ie507c358a3a33f75f9a46f2ffda37a6f22d861c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-05 19:05:31 +00:00
Bill Yi
ba1266b431
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4076fea0ca
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20628218
Change-Id: I41f2f812405ae6d63c1392662689c98f3ba31939
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-05 19:05:17 +00:00
Florian Mayer
3c0a0b82da
Merge "[MTE] support force_on for device_control override"
2022-12-05 18:38:50 +00:00
Bill Yi
1c80356b98
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-12-05 18:22:29 +00:00
Bill Yi
6ef73d18e1
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-12-05 18:22:29 +00:00
Bill Yi
3408280369
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-12-05 18:22:29 +00:00
David Gutierrez
5d79ae08f6
Merge "Updated RecentLocationAccessSeeAllFragment to use a SettingsEnum value rather than a MetricsEvent value."
2022-12-05 15:58:49 +00:00
David Gutierrez
0ee3c4b0bf
Merge "Dead code removal"
2022-12-05 15:58:09 +00:00
Peter Liang
f5c7c52ca1
Fix the preview should keep the same layer after font or display size change.
...
Bug: 259213786
Test: make RunSettingsRoboTests ROBOTEST_FILTER=TextReadingPreviewPreferenceTest
Change-Id: Ifc0047e47806662174712bb8628193bee906b384
2022-12-05 22:51:17 +08:00
Chaohui Wang
07fc7f1044
Add unit test for AllAppList
...
Bug: 260660819
Test: Unit test
Change-Id: I15e294d8b90d385e932adc3bf0d61e6923941542
2022-12-05 21:07:44 +08:00
Chaohui Wang
bda1edbb02
Merge "Clean up forked collectAsStateWithLifecycle"
2022-12-05 13:04:00 +00:00
Zhenwei Chen
7d0a7f14c3
Merge "Fix batteryInfo unit test"
2022-12-05 11:09:49 +00:00
TreeHugger Robot
4131877eec
Merge "[Settings] Add metrics log"
2022-12-05 09:24:06 +00:00
Zhenwei Chen
54615b3bec
Fix batteryInfo unit test
...
Bug:261139453
Test: Unit test passed
Change-Id: I8f94f984dc1bf833653ae49557fdd02f736b365c
Signed-off-by: Zhenwei Chen <zhenwec@google.com >
2022-12-05 09:10:39 +00:00
Bonian Chen
39b4cbbc1a
Merge "[Settings] Code refactor - apply BasePreferenceController"
2022-12-05 08:23:20 +00:00
Bonian Chen
3c9a6e294f
Merge "[Settings] Code refactor for SIM change detection"
2022-12-05 08:22:42 +00:00
changbetty
81ff62f0dd
[LE Audio] Add broadcast icon when device is broadcasting but LE device
...
is disconnected
Bug: 260173555
Test: make RunSettingsRoboTests ROBOTEST_FILTER=MediaVolumePreferenceControllerTest
Change-Id: I9e8117d5c885953ab7931833de81ceab63273d43
2022-12-05 07:24:29 +00:00
Zoey Chen
11c5b96855
[Settings] Add metrics log
...
Test: manual
Bug: 260077175
Change-Id: I7d3ca64468e3fa957e79a6e1c14e49f9ef520d86
2022-12-05 06:53:55 +00:00
Chaohui Wang
2b0d5f0998
Clean up forked collectAsStateWithLifecycle
...
Use the the one from androidx.lifecycle.compose instead.
Bug: 236346018
Test: Unit test
Change-Id: Idb681ad3f2fed10fed5b9f7625511566e5b88877
2022-12-05 13:42:12 +08:00
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
Arc Wang
da847e7f00
Fix SettingsHomepageActivity crash during configuration change
...
Attempt to remove the animator to avoid a RecyclerView crash.
Bug: 260208703
Test: compile
Change-Id: I568cf964107f832fde4d82306fc84772bb208e20
2022-12-05 11:35:15 +08: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