Bill Yi
47855826c7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1927131129b72df309406cf5dfe3a37b7d94e71c
2023-07-24 09:20:40 -07:00
Treehugger Robot
b6d9a8bca0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 90d628186c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24153453
Change-Id: I0071372392b92c69b90c94ef022e5770040c4cf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-22 02:48:51 +00:00
Bill Yi
aab0565203
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2819e72250 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24153453
Change-Id: I64c7e86fbab7e5f70c882f31d13b9c80b0dedd6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-22 02:48:49 +00:00
Treehugger Robot
2987136500
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 22e1df0c7e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24153452
Change-Id: Ic881ab86df2bc62398af7be3ef2b5480f5189e1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-22 02:48:45 +00:00
Bill Yi
6eb9b90a08
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9caafcc39 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24153452
Change-Id: I644e1687944d9d21392a350815a77da99043f11e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-22 02:48:41 +00:00
Treehugger Robot
64faf68d0b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: d52951de52 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24153451
Change-Id: Iaf7aa6ea9b9f6567a86fbe2ff8363c1f70da217f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-22 02:48:30 +00:00
Bill Yi
f7ef6eb13d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 60714bfa6f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24153451
Change-Id: Ie1de4c9dd549fe7cb161fc4598acf6aa1f3cdf9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-22 02:48:16 +00:00
Treehugger Robot
90d628186c
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-07-22 01:35:20 +00:00
Treehugger Robot
22e1df0c7e
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-07-22 01:35:20 +00:00
Treehugger Robot
d52951de52
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-07-22 01:35:20 +00:00
Wenhui Yang
eb94624bcd
Update learn more string for udfps fp settings am: c6c9d74f06
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24156551
Change-Id: I92bc5389ab6346cbedcce6e76135067ec3a201a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-22 00:51:46 +00:00
Hideki Ishii
8bce735fa0
Match APN types with ignoring the case
...
Currently APN types which are set on ApnEditor are compared with the
types which are configured with read_only_apn_types_string_array in a
case-sensitive manner. So upper case types such as "DUN" or "IMS" can be
set if read_only_apn_types_string_array is configured as "dun" or "ims."
Then the APN with types such as "DUN" or "IMS" can be added and may be
used for the network connection unintentionally.
This patch compares APN types with ignoring the case on ApnEditor to
prevent the problem above.
Bug: 200194310
Test: Manual test passed
Change-Id: I0f68bf470699df388855ec7277c0cfc24a2c30ba
2023-07-21 15:49:02 +09:00
Wenhui Yang
c6c9d74f06
Update learn more string for udfps fp settings
...
Update the learn more message for udfps fingerprint unlock to make it
consistent with sdfps.
Fixes: 289167628
Test: manual (see bug)
Change-Id: Iac6edb1c176dab462c91e1bf6236dfe4d0988693
2023-07-21 02:36:24 +00:00
Bill Yi
2819e72250
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I24da05f824c241f76981357b5468d082899e1de7
2023-07-20 15:00:17 -07:00
Bill Yi
f9caafcc39
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I91e1b33c246709f423cb28de5c3924b66eafb843
2023-07-20 14:58:39 -07:00
Bill Yi
60714bfa6f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I55987bdb3e12aebb2cca8e928454c4411e92cc1d
2023-07-20 14:56:49 -07:00
Ken Lin
face5b6c2a
Merge "Settings crashed when changing the Screen Resolution" into udc-d1-dev am: a6f2464e8c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24109923
Change-Id: I5554e3263baf46c64ba2286a80e5cb83da5d4098
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-19 05:08:37 +00:00
Ken Lin
a6f2464e8c
Merge "Settings crashed when changing the Screen Resolution" into udc-d1-dev
2023-07-19 03:58:47 +00:00
Bill Yi
6da21a6726
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1832da3618 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24120725
Change-Id: I2f38d70ec0287b0a965b897b7eb471d037e7aadd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-19 02:34:21 +00:00
Bill Yi
1832da3618
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic74eb981990ec4d4855818cf41b6ce2da99311dc
2023-07-18 14:41:23 -07:00
Ken Lin
c655c82ada
Settings crashed when changing the Screen Resolution
...
Check if index is out of bound
Bug: 288256336
Test: Change to Full resolution, set Smallest width to 426 dp, then
switch to High resolution
Test: atest ScreenResolutionFragmentTest
Change-Id: Ida4128e76e097050b01deae91c9d669e58ab9e8f
2023-07-18 02:30:09 +00:00
Bill Yi
72295da2e5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d999ce533 -s ours am: 9785c80168 -s ours am: 1e86da303c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24068200
Change-Id: Ic7140c802963ae5cb7f8382303c5d702200c20ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 20:32:40 +00:00
Automerger Merge Worker
b273d4ce5e
Merge changes from topic "am-6f9e4022de18455493ebda8b0cfe7548" into udc-d1-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 80172630a42764a59fac
2023-07-14 20:25:12 +00:00
Bill Yi
4249011ef2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 80172630a4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24069343
Change-Id: If23cd1ab963a5d74cab71d68cca7651a4c23e90d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 20:23:00 +00:00
Bill Yi
25fabc93a5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d999ce533 -s ours am: 9785c80168 -s ours am: 208c74fa3c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24068200
Change-Id: I787ce23bfb1ed4a90590dbbc2c49d898dea16080
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 20:22:49 +00:00
Bill Yi
c92c6e34c1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2764a59fac -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24069343
Change-Id: Ifc82f6a2eec8f46c13fc78c1437ac43d1e9bacfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 20:22:39 +00:00
Bill Yi
c69e38797c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eec083c169 -s ours am: 1ff28d9c1a -s ours am: f74197dd3c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24069363
Change-Id: I16f112e03059f2b5baeac6193dd0df51260e4827
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 20:17:24 +00:00
Bill Yi
208c74fa3c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d999ce533 -s ours am: 9785c80168 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24068200
Change-Id: Ia0076063f02d3590ccfb5f3ee2f6cc605d60b6bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 19:58:36 +00:00
Bill Yi
1e86da303c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d999ce533 -s ours am: 9785c80168 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24068200
Change-Id: I0890d4e15c37c5f22cfe1a5c72bfa46d1e6512d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 19:57:10 +00:00
Bill Yi
80172630a4
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-07-14 19:56:04 +00:00
Bill Yi
a5dc181d3c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eec083c169 -s ours am: 1ff28d9c1a -s ours am: 0cc5a16f95 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24069363
Change-Id: I256036c7c7001598553dbfc71110de9316ef4437
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 19:53:14 +00:00
Bill Yi
f74197dd3c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eec083c169 -s ours am: 1ff28d9c1a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24069363
Change-Id: I76ada29d9bf6a54fb64e16c35fba28c1200c8461
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 19:32:45 +00:00
Bill Yi
0cc5a16f95
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eec083c169 -s ours am: 1ff28d9c1a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24069363
Change-Id: Icaf934d95d7072cbd9e4163c592f62efe523a3b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 19:32:22 +00:00
Bill Yi
9785c80168
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d999ce533 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24068200
Change-Id: I61ee6c3d5277ec175c863db02356fdad27ce0afc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 18:48:32 +00:00
Bill Yi
1ff28d9c1a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eec083c169 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24069363
Change-Id: I2de227d48fb0409fb88f5b4dac8eb2c42482edbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 18:45:03 +00:00
Bill Yi
eec083c169
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ifa6d29ecf5518b91b6439055fa684e371c0dcc5f
2023-07-13 17:14:07 -07:00
Bill Yi
2764a59fac
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I77ce443619168d050a0da92c30f51199b412566d
2023-07-13 17:12:30 -07:00
Bill Yi
3d999ce533
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I731e98ceaf81340bfa91fa5d63a09e5f95a7cc56
2023-07-13 17:06:52 -07:00
Treehugger Robot
d47f3a29ed
Merge "Extend resource OWNERS exemption to other res folders (res-product). " into main am: 24db817a65 am: 70b29d5f28 am: ec8e7816f3 am: 28ac723a78
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2597316
Change-Id: Id22ac8a944c8b1c166f003b6b15ff964aff6f934
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-13 00:55:29 +00:00
Treehugger Robot
28ac723a78
Merge "Extend resource OWNERS exemption to other res folders (res-product). " into main am: 24db817a65 am: 70b29d5f28 am: ec8e7816f3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2597316
Change-Id: Id4d95b64251fb2a1c7f63c24d670befeb737a4dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-13 00:09:29 +00:00
Treehugger Robot
ec8e7816f3
Merge "Extend resource OWNERS exemption to other res folders (res-product). " into main am: 24db817a65 am: 70b29d5f28
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2597316
Change-Id: Ie0040ddf4b2acfa4769da3bf3d49178ae4ac3873
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 23:26:36 +00:00
Treehugger Robot
70b29d5f28
Merge "Extend resource OWNERS exemption to other res folders (res-product). " into main am: 24db817a65
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2597316
Change-Id: If8911bebafd144d8870dd7c2b8afc7e5820eca31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 22:40:10 +00:00
Treehugger Robot
24db817a65
Merge "Extend resource OWNERS exemption to other res folders (res-product). " into main
2023-07-12 22:03:16 +00:00
Bill Yi
5a6cd5cd20
[automerger skipped] Merge "Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE" into main am: d4c0315d66 -s ours am: e70f33f687 -s ours am: 5775318d2a -s ours am: 39051efb1a -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2654586
Change-Id: I34f36acb735d8113f8c4a090762e85aaea21afba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 17:43:28 +00:00
Bill Yi
5fc5560df0
[automerger skipped] Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE am: 05c15f8e73 -s ours am: 3e01c01021 -s ours am: e3c746ddf6 -s ours am: 44f02c0e0d -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2654586
Change-Id: Iec90f8c9bad69d47d720373bc687fc10f7f4cfa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 17:43:06 +00:00
Bill Yi
39051efb1a
[automerger skipped] Merge "Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE" into main am: d4c0315d66 -s ours am: e70f33f687 -s ours am: 5775318d2a -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2654586
Change-Id: Ib9e65be40690b44601a26774cff27e0b451d4140
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 17:21:41 +00:00
Bill Yi
44f02c0e0d
[automerger skipped] Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE am: 05c15f8e73 -s ours am: 3e01c01021 -s ours am: e3c746ddf6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2654586
Change-Id: I585c4dc6f77fb8fa7155f6e2c67457382c8dff4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 17:21:20 +00:00
Bill Yi
5775318d2a
[automerger skipped] Merge "Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE" into main am: d4c0315d66 -s ours am: e70f33f687 -s ours
...
am skip reason: Merged-In I2d14107a37340b8b34ae71c67f7f705a272324b9 with SHA-1 c61819e807https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2654586
Change-Id: I6b15c3c2777a61dd408c3b6a360be5c9a4c54d22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 14:51:57 +00:00
Bill Yi
e3c746ddf6
[automerger skipped] Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE am: 05c15f8e73 -s ours am: 3e01c01021 -s ours
...
am skip reason: Merged-In I2d14107a37340b8b34ae71c67f7f705a272324b9 with SHA-1 c61819e807https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2654586
Change-Id: I83b68f5f60d2bbc6b650637be81a80208cc71508
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 14:51:36 +00:00
Bill Yi
e70f33f687
[automerger skipped] Merge "Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE" into main am: d4c0315d66 -s ours
...
am skip reason: Merged-In I2d14107a37340b8b34ae71c67f7f705a272324b9 with SHA-1 c61819e807https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2654586
Change-Id: Ib15065dff3e0f03f45cfc124711808f32e6d2096
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 14:10:45 +00:00
