Charlotte Lu
2faf4cdd57
Use Flags to switch apn insert.
...
Fix: 304184645
Test: Visual Test
Change-Id: Iedba1343e9987a87b1adf6c1f7a8150e647e73d5
2023-10-10 13:00:58 +08:00
Charlotte Lu
2d029133f2
Telephony.Carriers.MVNO_TYPE is Deprecated.
...
Fix: 304180380
Test: Visual Test
Change-Id: Ibd1574e2f5004c27a4aafb94a679db5a60113c62
2023-10-10 10:33:15 +08:00
Chaohui Wang
0bcf5b79f8
Merge "Create AppDataUsageAppSettingsController" into main
2023-10-08 11:46:37 +00:00
Charlotte Lu
93fb316f01
Add ApnDataInit.
...
Fix: 298906796
Test: Unit Test
Change-Id: Ibf9e12e4f9c4ee033ad6dc2ca1f2267bf1f21912
2023-10-08 17:54:40 +08:00
Chaohui Wang
08e24272e4
Create AppDataUsageAppSettingsController
...
For better organization and testings.
Bug: 240931350
Test: manual - on AppDataUsage
Test: unit test
Change-Id: Ie3d35f5d112cf06cca585c9859624d705fbe2655
2023-10-08 17:03:48 +08:00
Chaohui Wang
4188a571aa
Use network type enum for APN
...
Instead of hardcoded names and values.
Bug: 303971237
Test: unit test
Change-Id: I099a408df7ee35abc886ed5c1d2d09fd31fda7d3
2023-10-08 14:23:37 +08:00
Treehugger Robot
9f49e038a0
Merge "Telephony.Carriers.BEARER is deprecated." into main
2023-10-08 03:33:27 +00:00
Chaohui Wang
c2691b247c
Merge "Not repeat zxing-core dependency" into main
2023-10-07 10:39:21 +00:00
Charlotte Lu
11737b956e
Telephony.Carriers.BEARER is deprecated.
...
Fix: 303971237
Test: Unit Test
Change-Id: Id3257b279421eb9f3544430667dc8ae536476e5c
2023-10-07 17:52:16 +08:00
Chaohui Wang
218ef2f087
Merge "Create AppDataUsageListController" into main
2023-10-07 08:42:42 +00:00
Chaohui Wang
b19eb9a4c2
Create AppDataUsageListController
...
For better organization and testings.
Bug: 240931350
Test: manual - on AppDataUsage
Test: unit test
Change-Id: I77ceeccc7055fcd948fe40d5dfb9cc4a9b9ad2ee
2023-10-07 15:03:27 +08:00
Charlotte Lu
1735474987
Merge "Add SettingsTextFieldPassword enable." into main
2023-10-07 05:04:50 +00:00
Xin Li
ec39446b76
[automerger skipped] Merge "Merge Android 14" into main am: dc85f402d5
-s ours am: 1773ab5b6f
-s ours am: dcd4caead2
-s ours am: fdc85fa1cf
-s ours am: 6dd6ff5b88
-s ours
...
am skip reason: Merged-In I8798f723bc821241d70fc8e5cb2c6ae59d7115af with SHA-1 5d8fea06b1
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2777108
Change-Id: I297094f91a5dd73653f120b373c6095e61437345
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-07 00:25:49 +00:00
Xin Li
a79e1d31eb
[automerger skipped] Merge Android 14 am: 25d4f12096
-s ours am: 1a19621d28
-s ours am: 453a7cada6
-s ours am: ca02f840e2
-s ours am: be4f23f242
-s ours
...
am skip reason: Merged-In I8798f723bc821241d70fc8e5cb2c6ae59d7115af with SHA-1 5d8fea06b1
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2777108
Change-Id: Ifc3c1727dccd8d364ad6b697bc4a06fc589ad0d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-07 00:20:17 +00:00
Xin Li
6dd6ff5b88
[automerger skipped] Merge "Merge Android 14" into main am: dc85f402d5
-s ours am: 1773ab5b6f
-s ours am: dcd4caead2
-s ours am: fdc85fa1cf
-s ours
...
am skip reason: Merged-In I8798f723bc821241d70fc8e5cb2c6ae59d7115af with SHA-1 5d8fea06b1
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2777108
Change-Id: Ief7a0ae2988258d584c86d0af467e54c487bfcaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-06 11:06:20 +00:00
Xin Li
be4f23f242
[automerger skipped] Merge Android 14 am: 25d4f12096
-s ours am: 1a19621d28
-s ours am: 453a7cada6
-s ours am: ca02f840e2
-s ours
...
am skip reason: Merged-In I8798f723bc821241d70fc8e5cb2c6ae59d7115af with SHA-1 5d8fea06b1
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2777108
Change-Id: I1ae471f8975c6efab4839dcc4ee3d8126f724ac6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-06 11:00:46 +00:00
Xin Li
fdc85fa1cf
[automerger skipped] Merge "Merge Android 14" into main am: dc85f402d5
-s ours am: 1773ab5b6f
-s ours am: dcd4caead2
-s ours
...
am skip reason: Merged-In I8798f723bc821241d70fc8e5cb2c6ae59d7115af with SHA-1 5d8fea06b1
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2777108
Change-Id: I4bf13a408a4d17260564a623962ded44012f6a05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-06 09:56:27 +00:00
Xin Li
ca02f840e2
[automerger skipped] Merge Android 14 am: 25d4f12096
-s ours am: 1a19621d28
-s ours am: 453a7cada6
-s ours
...
am skip reason: Merged-In I8798f723bc821241d70fc8e5cb2c6ae59d7115af with SHA-1 5d8fea06b1
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2777108
Change-Id: I42faeb97ff6358cbdcf7e486ad6dcac68e9a9438
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-06 09:50:56 +00:00
Xin Li
dcd4caead2
[automerger skipped] Merge "Merge Android 14" into main am: dc85f402d5
-s ours am: 1773ab5b6f
-s ours
...
am skip reason: Merged-In I8798f723bc821241d70fc8e5cb2c6ae59d7115af with SHA-1 5d8fea06b1
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2777108
Change-Id: Iec9ab42a8a7b6f0d4c98332b87dd9aa982f762c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-06 09:05:00 +00:00
Xin Li
453a7cada6
[automerger skipped] Merge Android 14 am: 25d4f12096
-s ours am: 1a19621d28
-s ours
...
am skip reason: Merged-In I8798f723bc821241d70fc8e5cb2c6ae59d7115af with SHA-1 5d8fea06b1
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2777108
Change-Id: I2b9d48897e2249c58bdd611b530d7092c7b4c3ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-06 08:59:21 +00:00
Xin Li
1773ab5b6f
[automerger skipped] Merge "Merge Android 14" into main am: dc85f402d5
-s ours
...
am skip reason: Merged-In I8798f723bc821241d70fc8e5cb2c6ae59d7115af with SHA-1 5d8fea06b1
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2777108
Change-Id: I318da99fd71bf1b74558f52ca14187e0a2a26f74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-06 07:57:45 +00:00
Xin Li
1a19621d28
[automerger skipped] Merge Android 14 am: 25d4f12096
-s ours
...
am skip reason: Merged-In I8798f723bc821241d70fc8e5cb2c6ae59d7115af with SHA-1 5d8fea06b1
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2777108
Change-Id: I9cb69e26793a7c339bb4e2cf2bc7ade9c7b3ef8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-06 07:52:15 +00:00
Xin Li
dc85f402d5
Merge "Merge Android 14" into main
2023-10-06 05:38:55 +00:00
Bill Yi
903af4b595
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7ed1b0ce85
-s ours am: c1c14b739f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24957165
Change-Id: Iffacc2763e2be2a4e46b06582fda18086fbb83f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-06 00:14:13 +00:00
Bill Yi
c1c14b739f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7ed1b0ce85
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24957165
Change-Id: Ice89f11ec484d2148cf67a7bdd4c7c5038895b39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-06 00:00:08 +00:00
Xin Li
25d4f12096
Merge Android 14
...
Bug: 298295554
Merged-In: I8798f723bc821241d70fc8e5cb2c6ae59d7115af
Change-Id: Ied712061a1cecebbb312b9fe1197560205f6963c
2023-10-05 15:41:49 -07:00
Bill Yi
7ed1b0ce85
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7b243481813f39dda575345466ec96b700047c81
2023-10-05 12:11:54 -07:00
Bill Yi
74953b5703
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: ff577eb181
-s ours am: bff9733180
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24947164
Change-Id: I6472568e9587f54a1459f4d5e64ed341add0de75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-05 14:17:29 +00:00
Bill Yi
b702508730
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c96329e0ea
-s ours am: 3a84da72b6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24947164
Change-Id: Ifad7e44d1f7fa6439b07ec778f7e29ab58e8aa95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-05 14:17:21 +00:00
Bill Yi
6cbee3165b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 074f4414b9
-s ours am: 6b55c4fd10
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24946783
Change-Id: I749108664c22521fefbbe55ce5cc810505058f93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-05 14:17:03 +00:00
Bill Yi
bff9733180
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: ff577eb181
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24947164
Change-Id: Ic8bf0a1d16cf28553df8d56f7cb2192f0dc9c576
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-05 13:32:50 +00:00
Bill Yi
3a84da72b6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c96329e0ea
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24947164
Change-Id: I7bbe29a34381ac1d3df282c062467438eec51d89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-05 13:32:42 +00:00
Bill Yi
6b55c4fd10
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 074f4414b9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24946783
Change-Id: I6465c16b725848f7dbb6e2f79e79626d6e23ed5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-05 13:32:23 +00:00
Bill Yi
ff577eb181
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-10-05 12:57:34 +00:00
Bill Yi
a223c7644e
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2023-10-05 05:07:58 +00:00
Bill Yi
074f4414b9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I28c0c489fdde63242fd894d923e53a2a412216df
2023-10-04 17:51:12 -07:00
Bill Yi
c96329e0ea
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8267aa212eafd5182fc64ab90f314f4b91cfac64
2023-10-04 17:49:43 -07:00
Gil Cukierman
18403f2adc
Merge changes from topic "cukie-300248708-hide2gremoval" into main
...
* changes:
Stop honoring CarrierConfigManager.KEY_HIDE_ENABLE_2G
Add feature flag for removal of KEY_HIDE_ENABLE_2G
2023-10-04 20:12:53 +00:00
Bill Yi
a24b9e3ef2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 96e0207271
-s ours am: dd6debb22f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24934926
Change-Id: Ib539a286744568c8c4f410b8c413e13f3ecfa91e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-04 19:24:01 +00:00
Bill Yi
de13a0a43a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ffa2b27001
-s ours am: c3e24ca42c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24934926
Change-Id: Ica4c897be0a4b703543062ff1982db99240e07ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-04 19:23:55 +00:00
Bill Yi
a2cb242ee2
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7ca5a82a184eabd298e8caa7ba4a22c8fb595795
2023-10-04 12:09:38 -07:00
Bill Yi
dd6debb22f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 96e0207271
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24934926
Change-Id: I8c2343a538b7b1b306a903ee6fb7af687645b134
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-04 19:09:37 +00:00
Bill Yi
c3e24ca42c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ffa2b27001
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24934926
Change-Id: I156313ba2806839cf54b910464c1a45a8a00086d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-04 19:09:21 +00:00
Graciela Putri
23d3a3ca92
Merge "Add controller to Advanced category in Apps page" into udc-qpr-dev am: 963869ecda
am: 641b310890
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24937325
Change-Id: I0ccca7ab6beed64a51efa56e7a7dd4a26adbce94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-04 18:48:33 +00:00
Bill Yi
96e0207271
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-10-04 18:44:46 +00:00
Graciela Putri
641b310890
Merge "Add controller to Advanced category in Apps page" into udc-qpr-dev am: 963869ecda
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24937325
Change-Id: I39d4b0e6ffa0f071d97e4dd9b2c36c1ed22c3a2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-04 18:16:08 +00:00
Joy Babafemi
45c932f9a6
Merge "Set ACTION_REQUEST_SET_AUTOFILL_SERVICE to route to DefaultCombinedActivity" into main
2023-10-04 18:12:21 +00:00
Graciela Putri
963869ecda
Merge "Add controller to Advanced category in Apps page" into udc-qpr-dev
2023-10-04 17:54:24 +00:00
Hakjun Choi
5e8e07ce7c
Merge "Changed API name from 'isNtn()' to 'isOnlyNonTerrestrialNetwork()' and updated related methods and variables according to API Council recommendations." into main
2023-10-04 17:35:54 +00:00
Matt Pietal
9695477373
Merge "Add support to configure double line clock in lockscreen [2/2]" into main am: 3be411d513
am: 705507d68f
am: 8d4d73f152
am: 9e233f3284
am: 84076896f6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2539870
Change-Id: I361b6926ca06f22211048ad5738b58d3bf21c473
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-04 16:57:42 +00:00