Bill Yi
c01f48c623
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1033a2abc6
-s ours am: 84ed68cd4d
-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: I8d89f060276f9dd3cedb55e826e847cd4cb172f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 00:09:23 +00:00
Bill Yi
651aaef998
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: fea268d325
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979892
Change-Id: I7521add4b3e9244f740aabdcc9e8f3522a241ae0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 00:03:40 +00:00
Bill Yi
84970745cc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71aaccb248
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979892
Change-Id: I681f21aaaaa01319e1db9c24d8b7ac3b09f32695
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 00:03:29 +00:00
Bill Yi
fc51d3d77a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b73f33a9e8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979106
Change-Id: I592ac71ca5536f9d7e1a736326af4871deb26413
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 00:03:13 +00:00
Bill Yi
eb51dfd4e9
[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: Ib51cd595a7b5286b9dc1643ee606baeec5d6a0fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 00:01:37 +00:00
Bill Yi
84ed68cd4d
[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: I6595f8966ef1394544032078b8af6c1b981c1cfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 00:01:25 +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
Eric Biggers
faaee7a843
Merge "ChooseLockPassword: convert to use PasswordMetrics#validateCredential()" into main am: 00f5d9e7a6
am: 335752ed98
am: be262063a7
am: a6448e9389
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776714
Change-Id: Ifade3ffd8878fc8c738ffa1eb927d2f3507fc643
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-09 23:26:11 +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
fea268d325
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-10-09 23:13:53 +00:00
Bill Yi
acf52df7a6
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-10-09 23:12:56 +00:00
Eric Biggers
a6448e9389
Merge "ChooseLockPassword: convert to use PasswordMetrics#validateCredential()" into main am: 00f5d9e7a6
am: 335752ed98
am: be262063a7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776714
Change-Id: Ie1cba1fa73d9cfbf12aca28027854bf9afcfcd7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-09 22:21:50 +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
Hao Dong
619e36272c
Fix recreate crash on Enroll v2.
...
Replay sensorType once to avoid |contentLayoutId| to be null when
Education is recreated.
Bug: 295206773
Test: manual test - proceed Enroll page and rotate, no crash happens
Change-Id: I0ec49d138ebe74044ba3554b38722984e78ed5d7
2023-10-09 21:55:31 +00:00
Eric Biggers
be262063a7
Merge "ChooseLockPassword: convert to use PasswordMetrics#validateCredential()" into main am: 00f5d9e7a6
am: 335752ed98
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776714
Change-Id: I7aa857ea6fd3bb5f36e8d6fda1fa27ce6df27f2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-09 21:47:02 +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
Eric Biggers
335752ed98
Merge "ChooseLockPassword: convert to use PasswordMetrics#validateCredential()" into main am: 00f5d9e7a6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776714
Change-Id: I86824875e218614c30e5150e21f4b63107438ebd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-09 20:50:35 +00:00
Eric Biggers
00f5d9e7a6
Merge "ChooseLockPassword: convert to use PasswordMetrics#validateCredential()" into main
2023-10-09 19:10:53 +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
71aaccb248
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic29f41f5c8c45d6ff631021a554fd3dbdf1d3be1
2023-10-06 19:47:40 -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
b73f33a9e8
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic63ce3d473e11921e249b4e28fcdfe6c31b5561a
2023-10-06 19:43:59 -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
2568ef188d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2c859bf1bc7257b1b38c6386e76c58e4ad70fe0b
2023-10-06 19:41:40 -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
Bill Yi
1e9ceef6b3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I23f457c626c1bac9026182e2f831408a50aed399
2023-10-06 15:42:54 -07:00
Bill Yi
bd421a22c0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I56ba33264413f9d3db1711ff3a3adb7eff950484
2023-10-06 15:30:27 -07:00
Bill Yi
fd570f63e5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4d73bf6ef88b9591dd13bee6603f3ab9847bab26
2023-10-06 15:24:48 -07:00