Bill Yi
3728554a6b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2819e72250 -s ours am: dbc0def786 -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: Ia9fa25321488edbf6de5d6428c2381dbb5b80462
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-22 03:15:02 +00:00
Treehugger Robot
7998f579f3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 22e1df0c7e -s ours am: ebcadf93c6 -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: Iea65b07ebcd4c8beb9826d5ba231981f306e1022
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-22 03:14:57 +00:00
Bill Yi
5f92c814ef
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9caafcc39 -s ours am: 2e3d3c1669 -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: I983feae55ce382d52d47ba80c37b97287ac2f117
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-22 03:14:54 +00:00
Treehugger Robot
3d5b922b47
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: d52951de52 -s ours am: 53394f7084 -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: I223894d349b5638fdad06d8fdc6212223f42ec55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-22 03:14:39 +00:00
Bill Yi
48bea25cfd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 60714bfa6f -s ours am: 05f5af2a34 -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: I2d79e6a608ba01b8ab8280d7f23a75a6171bdcfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-22 03:14:28 +00: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
Treehugger Robot
72d72142f0
[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: I1ce95f4d114becbd161b1c90d8610de685500c73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-22 02:48:18 +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
Bill Yi
dbc0def786
[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: I2c98c9b57bff4d218950296ecdaf5a4b2cd964cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-22 02:48:15 +00:00
Treehugger Robot
ebcadf93c6
[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: Ibe034c62bee84cd98a7f1f62cf2aa1e04e0f5c55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-22 02:48:10 +00:00
Bill Yi
2e3d3c1669
[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: If28c118fa0bf83c1de3872d66a15a78358cd62de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-22 02:48:04 +00:00
Treehugger Robot
53394f7084
[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: I9c2c958e3bf8e85430b7d8f3a755ba90e0c10785
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-22 02:47:51 +00:00
Bill Yi
05f5af2a34
[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: I2fa0cf8548532e276772a9edbb7e1056e471eeb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-22 02:47:40 +00:00
Wenhui Yang
bd44c8efd4
Update learn more string for udfps fp settings am: c6c9d74f06 am: 8b29400717 am: 462d171b12
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24156551
Change-Id: I71f082e01a457b880c22f9c55df4d5b4dfb9a21f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-22 02:20:32 +00:00
Wenhui Yang
8dc0353e2e
Update learn more string for udfps fp settings am: c6c9d74f06 am: eb94624bcd am: b43ac30381
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24156551
Change-Id: I56361c4b37674c2f6fe8cf9bdbd5a3f90b87f121
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-22 02:20:18 +00:00
Wenhui Yang
462d171b12
Update learn more string for udfps fp settings am: c6c9d74f06 am: 8b29400717
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24156551
Change-Id: I2f3ccccc411aeec71699c982a8217061850bd298
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-22 01:38:15 +00:00
Wenhui Yang
b43ac30381
Update learn more string for udfps fp settings am: c6c9d74f06 am: eb94624bcd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24156551
Change-Id: Ibbdff74d2be55f961a9f91bcdc1f1278dc2bbaa7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-22 01:37:57 +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
8b29400717
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: Ia0c854ca05bd17b4cd25d100010d831cc3052afa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-22 00:53:10 +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
Brandon Liu
da401305b0
Merge "Developer option for Grammatical Gender" into main
2023-07-21 23:39:26 +00:00
Graciela Putri
8dffd59e3d
Merge "[2/n] Add aspect ratio app list page under apps" into udc-qpr-dev am: 4e86d0d6b3 am: dc86dbe24b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23819684
Change-Id: If7c6f4fa26ea014e40e737f07daae8b72481e2c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-21 22:58:58 +00:00
Graciela Putri
dc86dbe24b
Merge "[2/n] Add aspect ratio app list page under apps" into udc-qpr-dev am: 4e86d0d6b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23819684
Change-Id: Iac8fc9b4d80e287a84e4a7d2917e76954ae64a9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-21 22:13:34 +00:00
Graciela Putri
4e86d0d6b3
Merge "[2/n] Add aspect ratio app list page under apps" into udc-qpr-dev
2023-07-21 21:28:44 +00:00
Graciela Wissen Putri
b4c4f6cbe6
[2/n] Add aspect ratio app list page under apps
...
Apps > General > Screen Size
To enable feature:
adb shell device_config put window_manager enable_app_compat_user_aspect_ratio_settings true
adb shell am force-stop com.android.settings
Fix: 287448088
Test: Manual
atest AspectRatioAppsPageProviderTest
atest AspectRatioUtilsTest
All CUJs passed in go/settings-cujs
Change-Id: I4de6c3cbdbdfbc79ed839ec149fb633344dcd3a7
2023-07-21 08:02:09 +00:00
Vincent Wang
cd4b4f10cb
Merge "Fix enroll introduction page was not closed in background" into udc-qpr-dev am: 11b9933fea am: 2b255a1f3a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24074845
Change-Id: I1da62994914c93695cf34feabdb527b8644b327f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-21 04:06:50 +00:00
Angela Wang
42f8ee32e5
[automerger skipped] Merge "Show connecting hearing devices in A11y hearing devices page" into udc-qpr-dev am: 8a373a5b14 am: 2768bbd241 -s ours
...
am skip reason: Merged-In Id3b29c12b80c282736a3e6ca73bcf317e0652b89 with SHA-1 940e02b807 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23659918
Change-Id: I27da47290ef3ff6cc65be4a0249dc78ce1cabb75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-21 04:06:22 +00:00
Angela Wang
345dd6ca46
Merge "Scan LE audio hearing aids in HearingDevicePairingDetail" into udc-qpr-dev am: b598284c68 am: 2ca0e6cb40
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726371
Change-Id: I8fba670669b04bf25fa1281c6daa1d3ec1ac9caf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-21 04:03:16 +00:00
Vincent Wang
2b255a1f3a
Merge "Fix enroll introduction page was not closed in background" into udc-qpr-dev am: 11b9933fea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24074845
Change-Id: I8bf87b0e453cfb9c7fbed3da1fa51902adc2f32a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-21 03:43:49 +00:00
Vincent Wang
11b9933fea
Merge "Fix enroll introduction page was not closed in background" into udc-qpr-dev
2023-07-21 03:32:32 +00:00
Angela Wang
2768bbd241
Merge "Show connecting hearing devices in A11y hearing devices page" into udc-qpr-dev am: 8a373a5b14
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23659918
Change-Id: I705310a82badd1b9a389fe78402db607b669ffff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-21 03:25:14 +00:00
Angela Wang
2ca0e6cb40
Merge "Scan LE audio hearing aids in HearingDevicePairingDetail" into udc-qpr-dev am: b598284c68
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726371
Change-Id: I4c4fcf33c3b64497ea5bc741ec4b8c839e9466cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-21 03:22:21 +00:00
Angela Wang
8a373a5b14
Merge "Show connecting hearing devices in A11y hearing devices page" into udc-qpr-dev
2023-07-21 02:39:10 +00:00
Angela Wang
b598284c68
Merge "Scan LE audio hearing aids in HearingDevicePairingDetail" into udc-qpr-dev
2023-07-21 02:38:24 +00: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
Treehugger Robot
4476db7365
Merge "Fix the Protocol buffer best practice warnings problem" into main
2023-07-20 17:29:33 +00:00
Michael Mikhail
1ff1626fd5
Merge "Override the state description of volume seekbar." into udc-qpr-dev am: 4b77d876b9 am: 31f420ce9b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23985544
Change-Id: I74b6b1e03877780f28779b563ea8ad088aa1233d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-20 16:55:25 +00:00
Vania Januar
e916f96b53
[automerger skipped] Merge "USB firmware update for stylus in Stylus USI Device Details" into udc-qpr-dev am: bbf2dc4991 am: 3a67c3e17f -s ours
...
am skip reason: Merged-In Ic7cb35799ff00f9998ca569eb4ae091f8010780a with SHA-1 f04363547a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23221022
Change-Id: I7b073a5f662bb942f9fa368e9616c8d64fdc4628
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-20 16:53:09 +00:00
SongFerng Wang
d54fe6729a
Merge "Avoid the exception when UI shows the fragment" into udc-qpr-dev am: a94cfc7b76 am: a4cac90c1d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24098950
Change-Id: I8e970d59c04041f980d52861d229d2b0261d0ed3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-20 16:52:27 +00:00
Michael Mikhail
31f420ce9b
Merge "Override the state description of volume seekbar." into udc-qpr-dev am: 4b77d876b9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23985544
Change-Id: I4e0cceb56a32df85b18179fe9fb08e1bc49f2884
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-20 16:27:17 +00:00
Vania Januar
3a67c3e17f
Merge "USB firmware update for stylus in Stylus USI Device Details" into udc-qpr-dev am: bbf2dc4991
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23221022
Change-Id: Ied0222e7235e2643553e7401ac9b4c0ece442cee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-20 16:22:47 +00:00