Commit Graph

135988 Commits

Author SHA1 Message Date
Treehugger Robot
f062d1cd6e Merge "Telephony.Carriers.MVNO_TYPE is Deprecated." into main 2023-10-10 03:28:29 +00:00
Chaohui Wang
ceb23d4407 Merge "Unify the default template and title" into main 2023-10-10 03:27:50 +00: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
Bill Yi
fe96df972e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: acf52df7a6 -s ours am: 8b1c1daa2c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979968

Change-Id: Ib4a837b192401ca8a7d35348b0ba4f07cae0d426
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 01:26:29 +00:00
Bill Yi
4635c20976 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b3e4d7886f -s ours am: 8ab6607212 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979968

Change-Id: I1baddb104b760a23861d3d4c0d69265fde52f51b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 01:26:22 +00:00
Bill Yi
6d60af849e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1033a2abc6 -s ours am: 1339a18c72 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979105

Change-Id: Ia2685a2492f898b211a427eec667c4c0a07693d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 01:26:02 +00:00
Bill Yi
8b1c1daa2c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: acf52df7a6 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979968

Change-Id: I04b5745e3328aef37834d7f0b918ca7ec9f67c41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 00:01:18 +00:00
Bill Yi
8ab6607212 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b3e4d7886f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979968

Change-Id: If5dbbcd84d41012900279173b8d9c35778e05ea3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 00:01:08 +00:00
Bill Yi
1339a18c72 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1033a2abc6 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979105

Change-Id: I103e7e3d4562ecd7dd5e6972dd286b795ac06fd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 00:00:51 +00:00
Jacky Wang
65cc68ef9f Merge "Add nullaway errorprone plugin for nullness check" into main 2023-10-09 23:20:03 +00:00
Bill Yi
acf52df7a6 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-10-09 23:12:56 +00:00
Bill Yi
df703b920b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72eabac183 -s ours am: e461f358c7 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979971

Change-Id: I056a08c4782c1ba50031404b4c2a5c7a895887c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-09 22:18:25 +00:00
Bill Yi
62cdc36799 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 50bc3c3456 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979889

Change-Id: I18032d134ce8100e4f1c2a53c305df50b1ec021a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-09 21:45:50 +00:00
Bill Yi
e461f358c7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72eabac183 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979971

Change-Id: I50c9f998d24d83fb5dbe8e9f77cdcf259e9fba1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-09 21:41:05 +00:00
Treehugger Robot
ffe8ee8048 Merge "Don't show lottie if font is too big." into main 2023-10-09 17:48:43 +00:00
Joshua McCloskey
8bdd8d31d4 Don't show lottie if font is too big.
Test: Manually verified lottie isn't shown when font size is increased.
Fixes: 293068457
Change-Id: I00ee2a130ce64b5457b2ca5ae88210ff815993c4
2023-10-09 16:45:54 +00:00
Chaohui Wang
6395cf8d30 Unify the default template and title
On AppDataUsage page, using single source of truth to calculate the
default template, and set title base on the current template.

Fix: 213266028
Fix: 234104784
Test: visual - on AppDataUsage
Test: unit test
Change-Id: I80facca0b000964e901905af51a344a4bc9f498b
2023-10-09 18:40:03 +08:00
Chaohui Wang
b7f8c15ff0 Merge "Status header not clickable in DataUsageSummary" into main 2023-10-09 10:37:37 +00:00
Chaohui Wang
51e1576c34 Status header not clickable in DataUsageSummary
Status header (DataUsageSummaryPreference) is not clickable in the
DataUsageSummary.

So remove the legacy logics, to unblock unified default template.

Bug: 234104784
Test: m RunSettingsRoboTests
Change-Id: I3dddf4ec3f84d53fd07afbb62d171942a6acce5d
2023-10-09 16:51:18 +08:00
Chaohui Wang
741979bc02 Create AppDataUsageCycleController
To improve performance and better organization and testings.

Fix: 240931350
Test: manual - on AppDataUsage
Test: unit test
Change-Id: I277133b55378a3445aceb826d771b14c0fc91e4a
2023-10-09 16:19:08 +08:00
Jacky Wang
d84c11f22c Add nullaway errorprone plugin for nullness check
Bug: 304077181
Test: manual - make Settings RUN_ERROR_PRONE=true
Change-Id: Ic523b966271d8f16bf8b3df5b961c5ffbc17d76c
2023-10-09 12:20:32 +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
Bill Yi
72eabac183 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: If9da2309b45158c64d96649e6cf2ddf7e8e069bb
2023-10-06 19:49:10 -07:00
Bill Yi
b3e4d7886f Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I785620415ba0ffad64f59ab8c32d37cc4e1957dc
2023-10-06 19:46:10 -07:00
Bill Yi
1033a2abc6 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ifbf87c30492d9cf0e06afc59c7d5d97078fd336a
2023-10-06 19:43:08 -07:00
Bill Yi
50bc3c3456 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I3d8b7214bd328965623ec33fe7bff5f258d284d4
2023-10-06 19:40:08 -07: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