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
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
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
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
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
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
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
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
Eric Biggers
3a11c3b0de
ShadowLockPatternUtils: remove patternEverChosen methods
...
These methods are being removed from LockPatternUtils because they are
no longer used, so remove them from ShadowLockPatternUtils too.
Bug: 270013005
Change-Id: If196bbef4755c644b3188043ed47e99817bf1856
Merged-In: If196bbef4755c644b3188043ed47e99817bf1856
(cherry picked from commit 795a02c92a
)
2023-10-06 17:16:55 +00:00
Eric Biggers
b2ea672670
ChooseLockPassword: convert to use PasswordMetrics#validateCredential()
...
Fix the check for invalid characters in new passwords by switching from
PasswordMetrics#validatePassword() to
PasswordMetrics#validateCredential(). For more information, see
frameworks/base change I5c3c55367c3a294578cd0f97ac0e315a11ed517e.
Bug: 219511761
Bug: 232900169
Bug: 243881358
Test: Verified no regressions in 'atest ChooseLockPasswordTest'. Note,
this test is currently @Ignored and has 2 failures. I didn't
attempt to address that.
Test: Set a password containing non-ASCII characters on a device running
an older build. Upgraded and verified unlocking still works.
Tested that setting a new non-ASCII password is not allowed.
Change-Id: I5f1822a34688473cb103eb64dca56e4c19d4dd08
Merged-In: I5f1822a34688473cb103eb64dca56e4c19d4dd08
(cherry picked from commit b547094366
)
2023-10-06 17:16:55 +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
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
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
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
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
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
Graciela Putri
963869ecda
Merge "Add controller to Advanced category in Apps page" into udc-qpr-dev
2023-10-04 17:54:24 +00:00
Matt Pietal
84076896f6
Merge "Add support to configure double line clock in lockscreen [2/2]" into main am: 3be411d513
am: 705507d68f
am: 8d4d73f152
am: 9e233f3284
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2539870
Change-Id: I91198eb53fda60d1f5801e5fa8512be2800304e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-04 16:26:27 +00:00
Matt Pietal
9e233f3284
Merge "Add support to configure double line clock in lockscreen [2/2]" into main am: 3be411d513
am: 705507d68f
am: 8d4d73f152
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2539870
Change-Id: I9a436c40d689ad4db65a9ff9def5ea04c8115894
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-04 15:55:50 +00:00
Matt Pietal
8d4d73f152
Merge "Add support to configure double line clock in lockscreen [2/2]" into main am: 3be411d513
am: 705507d68f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2539870
Change-Id: Icf1ee16bfff74c784b67417dec19f56caf2fd6a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-04 15:23:35 +00:00
Matt Pietal
705507d68f
Merge "Add support to configure double line clock in lockscreen [2/2]" into main am: 3be411d513
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2539870
Change-Id: Ia1bfae20044369b8a8e463e21a2393cf9b6e9250
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-04 14:54:22 +00:00
Matt Pietal
3be411d513
Merge "Add support to configure double line clock in lockscreen [2/2]" into main
2023-10-04 14:25:38 +00:00
Graciela Wissen Putri
7bc951d205
Add controller to Advanced category in Apps page
...
Settings > Apps > Advanced (category)
Fix: 303309762
Test: Manually by disabling aspect ratio settings
Change-Id: I262fc954ad8d5ad65b24cc0966b8e5392cea65e5
2023-10-04 14:12:03 +00:00
Graciela Putri
fafb4bf5ba
Merge "Update aspect ratio summary strings" into udc-qpr-dev am: 242bde10c8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24867213
Change-Id: I4e6ef486029a3f70cf7c267320c200c19384787a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-04 13:32:50 +00:00
Graciela Putri
112b5765e0
Merge "Add warning text to Aspect ratio app info header" into udc-qpr-dev am: b5b8bd54a0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24904381
Change-Id: I6ad5d7d6d9972dca2e42462440648e90f09b28e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-04 13:32:33 +00:00
Graciela Putri
242bde10c8
Merge "Update aspect ratio summary strings" into udc-qpr-dev
2023-10-04 13:04:36 +00:00