Bill Yi
211c0a6bb2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b73f33a9e8
-s ours am: fc51d3d77a
-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: Iace4128a50e6ad86077c7779eaf7e658eb6186b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 01:26:16 +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
1f9a5c2e17
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: fea268d325
-s ours am: 9a58b15803
-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: If1e45e4ed269879aa39630ceb08d0f0966a33d26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 01:25:57 +00:00
Bill Yi
456d4cb9f9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71aaccb248
-s ours am: 0b8fb9bf01
-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: Ie784f8e9d0fff6326ea107ed4085093d422f478b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 01:25:49 +00:00
Bill Yi
ea17648df4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: acf52df7a6
-s ours am: eaeb26adb0
-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: Ie7c189d95598eed503e96a109f03e79123406799
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 01:25:34 +00:00
Bill Yi
9df69f1f12
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b73f33a9e8
-s ours am: 6c8252e6fa
-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: Icde5bee08f5ffce8283aace7b67f53ee0e327ede
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 01:25:30 +00:00
Bill Yi
5faf8d80c9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b3e4d7886f
-s ours am: 109fbe94d7
-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: I6d0bdf241b4819096f50dfe571b52932c86a7b5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 01:25:24 +00:00
Bill Yi
26f905aea0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1033a2abc6
-s ours am: 2df55e14e4
-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: Ia44f3b174d7343bf423c08469cb8eca8582953e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 01:25:07 +00:00
Bill Yi
f7b330feac
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: acf52df7a6
-s ours am: 1e702e6f83
-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: I5a7a5153250df9443076617ce3932d2a59773cad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 00:16:00 +00:00
Bill Yi
a4e1dd587c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b3e4d7886f
-s ours am: eb51dfd4e9
-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: I4cc49415609542c0a0ba8aed4c323fcf5cb0c3c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 00:15:49 +00:00
Bill Yi
f67e1b0f26
[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: I170ade0484ffaedee08fbb8032ea4f21a98c079f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 00:15:34 +00:00
Bill Yi
9a58b15803
[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: Ibdc00cfc887bb008f0656f5846f66aa8a5bd6d81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 00:11:55 +00:00
Bill Yi
0b8fb9bf01
[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: Ibe4fc099db631e426de1434e21a64d699c9b3677
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 00:11:45 +00:00
Bill Yi
6c8252e6fa
[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: Ifc0ee1cf6df0f789bb642e600cf907282b801a88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 00:11:29 +00:00
Bill Yi
292fb5da73
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: acf52df7a6
-s ours am: 1e702e6f83
-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: Ic38d4f4db764b5823f8d03e12b591fee292f0ef6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 00:09:50 +00:00
Bill Yi
fa9aef9061
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b3e4d7886f
-s ours am: eb51dfd4e9
-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: Ic5a6a16d80ecab22ed4a71e48a80127b3fad671b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 00:09:39 +00:00
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
1e702e6f83
[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: I5c69f07f7543d7ddae95397cf382e520282cdb23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 00:01:52 +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
eaeb26adb0
[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: I6e63e108831ddddb6617486a291e4964587c0326
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 00:01:26 +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
109fbe94d7
[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: I74a6e4a995aeac3050118524f2c6b8d5d0473543
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 00:01:19 +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
2df55e14e4
[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: I805a3a6dcb7969a4b9169f21d5fb8e2b10b1805a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 00:00:59 +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
Graciela Wissen Putri
fcba73e30e
Add aspect ratio settings to advanced category children
...
Fix: 303823822
Test: Manual && atest AppDashboardFragmentTest
Change-Id: I5778efa6a1a790d76d9d35d1597d82fdc3707b3b
2023-10-09 17:35:07 +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