Bill Yi
6e8a58a104
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-09-25 20:05:26 +00:00
Bill Yi
7523dceebf
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-09-25 20:05:26 +00:00
Bill Yi
571594906c
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
2023-09-25 20:02:48 +00:00
Bill Yi
04ff893a89
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 13ad34ab89
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836388
Change-Id: If0a030a93483e20a0a16c3284cb9fc58667d9221
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 20:02:33 +00:00
Bill Yi
8e8495e66e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 13ad34ab89
-s ours am: 5af26b3cf8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836388
Change-Id: I150fd06afbc746316b2e99502d37f0f715394cb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 20:02:30 +00:00
Bill Yi
6ef507f47d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0ed3dc7dc1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836388
Change-Id: I1fb33b5f48a41638ab4580ea1d369e88fe54099a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 20:02:29 +00:00
Bill Yi
e2f6578457
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0ed3dc7dc1
-s ours am: af4c0f59a1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836388
Change-Id: I4ee3c1299cebdf120215f5bda863cf6fb1a44ffc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 20:02:26 +00:00
Bill Yi
2f5f8f5d5b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 87cc1f5df5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836237
Change-Id: I310345ed2d7a77c9e263c4701a70a8d909325194
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 20:02:24 +00:00
Bill Yi
abe4bb1276
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 87cc1f5df5
-s ours am: a34308c71c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836237
Change-Id: Idb4f3ab71be396acdb287a886ec25ce5a811b425
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 20:02:20 +00:00
Bill Yi
b06fb3195f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28e8170350
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836237
Change-Id: I9319b47824ab59fcac068e79db9f4b426a1885d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 20:02:12 +00:00
Bill Yi
f0b67b2822
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28e8170350
-s ours am: fa381cd6f5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836237
Change-Id: I03f6b6c366bfedd14b830867479e0df007848489
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 20:02:03 +00:00
Bill Yi
a64af27c0d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cf0c35fcdc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836235
Change-Id: I0d8f3e7aa8ccd862cd0ec43cb6fc9c05afe3e96d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 20:01:43 +00:00
Bill Yi
07bd64c773
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cf0c35fcdc
-s ours am: 6feb1a51e1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836235
Change-Id: I005bce5ddc6a4e96b7619c85b2b6b53679ad47bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 20:01:40 +00:00
Bill Yi
af11e3764c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 60912a78ed
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836238
Change-Id: I43e86dd1dec0319db87497e9f09c73648e659064
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 20:00:57 +00:00
Bill Yi
6895651354
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a2e5d21c36
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836238
Change-Id: I3640b0fc3d2a51f65a96e1f30a8c855a3c88c653
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 20:00:54 +00:00
Bill Yi
8eab869e52
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 4bd597bddf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836236
Change-Id: Iadafa0042bd7ddab8ec298711ca6a49d037d9f97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 20:00:51 +00:00
Bill Yi
a7dd9c871f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c8c067128
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836236
Change-Id: I117efa5dceadaac9119a00ba48cc0193610b83dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 20:00:33 +00:00
Bill Yi
fd25a4eb77
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: c49656808b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836234
Change-Id: Ia5b356fc19662ec0215a83b854af653009909194
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 20:00:15 +00:00
Bill Yi
c53bca224f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 792e7ec3e7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836234
Change-Id: I53aa0fab30662335feccdc84039d3ceb80ce9529
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 19:59:52 +00:00
Bill Yi
5af26b3cf8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 13ad34ab89
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836388
Change-Id: I10c3baedc45cf692aa993af9c57e0ff9a957ca03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 19:54:46 +00:00
Bill Yi
af4c0f59a1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0ed3dc7dc1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836388
Change-Id: Ibe91d1969a6bf16c677c4bd8819873e6990dc861
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 19:54:42 +00:00
Bill Yi
a34308c71c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 87cc1f5df5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836237
Change-Id: Ie33147b54befc9a52038171c43832bf45a7e2af9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 19:54:33 +00:00
Bill Yi
fa381cd6f5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28e8170350
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836237
Change-Id: Id076e5b5a0b9a1b4be6decdf7307deb20210f0a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 19:54:13 +00:00
Bill Yi
6feb1a51e1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cf0c35fcdc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836235
Change-Id: Ie83549a731072149991a71edc44998b3683553f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 19:53:47 +00:00
Bill Yi
60912a78ed
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-09-25 19:45:33 +00:00
Bill Yi
4bd597bddf
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-09-25 19:45:33 +00:00
Bill Yi
c49656808b
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-09-25 19:45:33 +00:00
Bill Yi
13ad34ab89
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-09-25 19:24:34 +00:00
Bill Yi
87cc1f5df5
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-09-25 19:24:34 +00:00
Bill Yi
15c585c00a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cd2639f4b3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836175
Change-Id: I1fd7e0577b7465f2b559079e78df70bf1e7a8af7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 19:12:18 +00:00
Joshua McCloskey
ab14463e04
Added SearchIndexable to FP pref controller
...
Test: atest
Fixes: 289967461
Change-Id: I34cac8f467326bf84ed45b3e5accc7d8817a1a2f
2023-09-25 19:00:13 +00:00
Tom Hsu
f357f32284
Merge "When device has a call, avoid user inactive/active SIM." into main
2023-09-25 06:59:44 +00:00
tom hsu
e7d98dea9d
When device has a call, avoid user inactive/active SIM.
...
Bug: 296314216
Test: atest passed
Change-Id: I1a717d24a87316ccf065a2c02c49dc7e29825905
2023-09-25 13:32:52 +08:00
Treehugger Robot
646ae689fe
Merge "Fix IllegalArgumentException" into main
2023-09-25 04:03:52 +00:00
Chelsea Hao
03fb0a8c28
Merge "Add "Previously connected devices" activity in settings for system ui QS bluetooth dialog." into main
2023-09-25 03:18:33 +00:00
Chaohui Wang
8c72d371a8
Merge "Clean up unused EXTRA_NETWORK_TYPE" into main
2023-09-25 02:42:28 +00:00
Treehugger Robot
2d7ef101b9
Merge "Clean up Backup Calling" into main
2023-09-25 02:35:46 +00:00
chelseahao
4e19ccd08d
Add "Previously connected devices" activity in settings for system ui QS bluetooth dialog.
...
Test: adb shell "am start -n 'com.android.settings/.Settings\$PreviouslyConnectedDeviceActivity'"
Bug: 298124674
Change-Id: I388aab93d4952ebc8fbd515be624f336cb083a91
2023-09-25 02:28:54 +00:00
Chaohui Wang
de83cdcdd3
Clean up unused EXTRA_NETWORK_TYPE
...
Bug: 290856342
Test: manual - on DataUsageList
Change-Id: Ibb0a50a18a581e5cd89246ed581b69e06f588f66
2023-09-25 09:42:16 +08:00
Treehugger Robot
f696c8d1ac
Merge "Avoid settingslib.widget.preference.radio" into main
2023-09-25 01:39:23 +00:00
Chaohui Wang
5ed30f4672
New DataUsageListHeaderController
...
Move spinner and config button to DataUsageListHeaderController.
Bug: 290856342
Test: manual - on DataUsageList and AppDataUsage
Test: unit test
Change-Id: I655bd3441b2305708c0052f1203538bb07eef2af
2023-09-25 00:28:31 +08:00
Chaohui Wang
84dfb76f4a
Avoid settingslib.widget.preference.radio
...
Which is deprecated and will be cleaned up.
Bug: 289155281
Test: m Settings
Change-Id: Ie91835fa98ed71b5b9c73d1bc4d953a1e3ef3d02
2023-09-24 00:41:19 +08:00
Chaohui Wang
30b81d637e
Clean up Backup Calling
...
Fix: 289967466
Test: m Settings
Change-Id: Ic487c06383f1dba04b59a54301f083c265717d9b
2023-09-23 22:35:55 +08:00
SongFerngWang
e4b08837d1
Fix IllegalArgumentException
...
Add the try-catch to avoid crash.
Fix: 301362148
Test: build pass
Change-Id: Ia1f5a4299d5f0eeffc7b25b0f3b89d56f1647062
2023-09-23 06:43:17 +00:00
Treehugger Robot
41fab98b6a
Merge "Fix tint of battery icon" into udc-qpr-dev am: 8a9074278a
am: d74ddbd6ef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24842149
Change-Id: I1577c463bfd8ed4b43bc83c8a23664aa4d8c5e8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-23 05:54:33 +00:00
Treehugger Robot
d74ddbd6ef
Merge "Fix tint of battery icon" into udc-qpr-dev am: 8a9074278a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24842149
Change-Id: I854f3002c282c6909bd79eeecb839045ee8119ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-23 04:57:40 +00:00
Treehugger Robot
8a9074278a
Merge "Fix tint of battery icon" into udc-qpr-dev
2023-09-23 04:21:23 +00:00
Massimo Carli
ea28ebdc1b
Merge "Use experimental string in user aspect ratio settings" into udc-qpr-dev am: 10050559cc
am: f6bafc836e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24828451
Change-Id: I768fd7baef049d3243ca01f0b0bd2eb6aa19d8e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-23 00:35:43 +00:00
Massimo Carli
f6bafc836e
Merge "Use experimental string in user aspect ratio settings" into udc-qpr-dev am: 10050559cc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24828451
Change-Id: I50a45b2215e701be23cfd67f3ff1a7869a220f0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-22 23:39:24 +00:00
Massimo Carli
10050559cc
Merge "Use experimental string in user aspect ratio settings" into udc-qpr-dev
2023-09-22 22:52:57 +00:00