Bill Yi
14d89bfce8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0aee5a3e64
-s ours am: 8128682775
-s ours am: 97f0fa1142
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24691692
Change-Id: I308d3e8482d0b85e70640096411826001f2a9e23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 01:13:12 +00:00
Colin Cross
c2c4d0855b
[automerger skipped] Fix kotlin nullable errors in Settings am: 8f7a1e6f53
-s ours
...
am skip reason: Merged-In I6aa0516fa4f6443b6d4dff873baf3b08ff9189f0 with SHA-1 753c96133a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24693315
Change-Id: I6b882af2fa940af95a2d9a23a9dc6926ab9b1d1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 01:11:39 +00:00
Bill Yi
97f0fa1142
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0aee5a3e64
-s ours am: 8128682775
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24691692
Change-Id: I0476264a7ec431fecb1a7dc47cdb3de4691bd068
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 00:35:59 +00:00
Bill Yi
8128682775
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0aee5a3e64
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24691692
Change-Id: I37b04d6ebb72c2c2634892fb02908f81f115b95d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-07 23:52:07 +00:00
Colin Cross
8f7a1e6f53
Fix kotlin nullable errors in Settings
...
Fix kotlin nullable errors that were exposed by setting the retention
of android.annotation.NonNull and android.annotation.Nullable to
class retention.
Bug: 294110802
Test: builds
Change-Id: I6aa0516fa4f6443b6d4dff873baf3b08ff9189f0
Merged-In: I6aa0516fa4f6443b6d4dff873baf3b08ff9189f0
(cherry picked from commit 84f8961e67
)
2023-09-07 17:11:11 +00:00
Bill Yi
0aee5a3e64
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I07e5e02d38b78617cbe7f8a23053d0c15aedd692
2023-09-07 04:18:01 -07:00
Graciela Putri
c8bd304d95
Merge "Enable User Aspect Ratio Settings by default" into udc-qpr-dev am: f7a443b419
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24620828
Change-Id: I336e6a719d50ab5bdc841d7e9bb68c6f60e040f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-06 03:19:38 +00:00
Graciela Putri
f7a443b419
Merge "Enable User Aspect Ratio Settings by default" into udc-qpr-dev
2023-09-06 02:22:01 +00:00
Xin Li
4a46f2bc9b
Merge "Merge UP1A.230905.019" into aosp-main-future am: 770a4e1f11
am: bc31bffab0
am: 21a77533a7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24623146
Change-Id: I5e98258d795c64a3878d52c38e426f38a684d3fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-05 21:07:25 +00:00
Xin Li
21a77533a7
Merge "Merge UP1A.230905.019" into aosp-main-future am: 770a4e1f11
am: bc31bffab0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24623146
Change-Id: I9c3a850fbceb22d7e34601288d470eb4fd037723
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-05 20:34:32 +00:00
Xin Li
bc31bffab0
Merge "Merge UP1A.230905.019" into aosp-main-future am: 770a4e1f11
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24623146
Change-Id: If887691054dcfe9746687f7d50986dd2c252633e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-05 19:45:17 +00:00
Xin Li
770a4e1f11
Merge "Merge UP1A.230905.019" into aosp-main-future
2023-09-05 18:35:36 +00:00
SongFerng Wang
33b6032bb2
Merge "Skip Data usage in Settings Widgets" into udc-qpr-dev am: 60afc1259f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24575008
Change-Id: I2214f91f8f27ab937b2d9b96f62a1fdcdae47072
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-05 02:49:28 +00:00
SongFerng Wang
60afc1259f
Merge "Skip Data usage in Settings Widgets" into udc-qpr-dev
2023-09-05 01:55:45 +00:00
Treehugger Robot
e4d9d80f15
Merge "Limit bluetooth broadcast password to single byte characters" into main am: abe501085b
am: 9c21429af4
am: ed9bbf31c9
am: c9e0efd5ba
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2728234
Change-Id: Ib944ab2e79ea349791e83a2dc7639920ac76245e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-04 15:38:17 +00:00
Treehugger Robot
c9e0efd5ba
Merge "Limit bluetooth broadcast password to single byte characters" into main am: abe501085b
am: 9c21429af4
am: ed9bbf31c9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2728234
Change-Id: I6861bf65677a4d451b53b81993d262230739e482
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-04 15:00:12 +00:00
Treehugger Robot
ed9bbf31c9
Merge "Limit bluetooth broadcast password to single byte characters" into main am: abe501085b
am: 9c21429af4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2728234
Change-Id: Ia9c6634870b4c1591804153d9da63b6c13e1cf80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-04 14:10:40 +00:00
Treehugger Robot
9c21429af4
Merge "Limit bluetooth broadcast password to single byte characters" into main am: abe501085b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2728234
Change-Id: Idca058c3f3d2de4324d51c9bfd0225cd44c2dbf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-04 13:15:08 +00:00
Treehugger Robot
abe501085b
Merge "Limit bluetooth broadcast password to single byte characters" into main
2023-09-04 12:18:09 +00:00
Jin Dong
a1ae2b1e93
Limit bluetooth broadcast password to single byte characters
...
The bluetooth broadcast password is supposed to be single byte
characters, so crash hanppened when input too many double-byte
characters when connecting to other broadcast.
Limit the password to single byte characters to fix this issue.
Bug: 297840479
Test: Manual
Change-Id: Ifab89ee9a07f20d1f30aba17bed694b5a5da8480
2023-09-04 08:14:10 +00:00
Holly Jiuyu Sun
b64f278e48
Merge "Add feature flag as a device_config flag for LPH to search." into udc-qpr-dev am: a5027a20ff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24544150
Change-Id: I96427f5c65e502207e384b2eb9edf9649b32f885
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-01 16:30:10 +00:00
Holly Jiuyu Sun
a5027a20ff
Merge "Add feature flag as a device_config flag for LPH to search." into udc-qpr-dev
2023-09-01 15:32:40 +00:00
Xinyi Mao
428b124bea
Merge "Impl app anomlay preference" into udc-qpr-dev am: c51a3da148
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24404174
Change-Id: I7068d880ab644f01dba523132dbccd2cc6ceff60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-01 08:59:18 +00:00
Xinyi Mao
c51a3da148
Merge "Impl app anomlay preference" into udc-qpr-dev
2023-09-01 07:53:09 +00:00
mxyyiyi
c4fb17d740
Impl app anomlay preference
...
[ScreenShot]: https://screenshot.googleplex.com/BBrHTQbwbFHxZE9
Bug: 291689623
Bug: 291689643
Test: manual
Change-Id: Ia257f3ace4a2d71b2221f861be3e1238de6d791e
2023-09-01 06:40:36 +00:00
Treehugger Robot
f92766e74a
Merge "[Regional preference] Add Regional Preference into the summary" into udc-qpr-dev am: c7ea783c78
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613092
Change-Id: Ide98533ea70e94fad2a679d68936076dc85e1e96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-01 03:13:03 +00:00
Aleksandr Lukin
5e99db152b
Merge "Update the API usage to get total size of devices" into udc-d1-dev am: d1373d4a1a
am: 7aa48f70f1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24603347
Change-Id: I4ae2ebe6541d606d164b66d3bac748c85eba5024
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-01 03:11:25 +00:00
Aleksandr Lukin
1d94371c6c
Merge "Update the API usage to get total size of devices" into udc-d1-dev am: d1373d4a1a
am: 7888dfd518
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24603347
Change-Id: Ia83e8da0b6f425d92d7eca8d565819ade3c6fe21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-01 03:04:53 +00:00
Treehugger Robot
c7ea783c78
Merge "[Regional preference] Add Regional Preference into the summary" into udc-qpr-dev
2023-09-01 02:29:00 +00:00
Aleksandr Lukin
7888dfd518
Merge "Update the API usage to get total size of devices" into udc-d1-dev am: d1373d4a1a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24603347
Change-Id: I92f3ad3e76029f5f0f2caff4e5016a2475decaf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-01 02:27:28 +00:00
Aleksandr Lukin
7aa48f70f1
Merge "Update the API usage to get total size of devices" into udc-d1-dev am: d1373d4a1a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24603347
Change-Id: I816aff6dab9ac5f3ef72f0f110087650125797bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-01 02:18:08 +00:00
Aleksandr Lukin
d1373d4a1a
Merge "Update the API usage to get total size of devices" into udc-d1-dev
2023-09-01 01:41:27 +00:00
Vlad Popa
4ee43c40e9
Merge "Disable the spatializer options for device categories" into udc-qpr-dev am: 4010b222f8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24531690
Change-Id: I134714c9a5cb03c06d6dbee2256d7630554c37c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-01 00:44:41 +00:00
Vlad Popa
4010b222f8
Merge "Disable the spatializer options for device categories" into udc-qpr-dev
2023-09-01 00:33:47 +00:00
Automerger Merge Worker
675d84de56
Merge changes from topic "am-119eb3c6021b40a4899c09f8bfb8bf1c" into udc-d1-dev-plus-aosp am: 7ca1b2fec0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613441
Change-Id: I523255e92ee3739ea6ec8f942a8dd2b9bbaf678e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 22:21:49 +00:00
Bill Yi
4f80e2f41b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44ba06430a
-s ours am: 14b51e0e37
-s ours am: 8dd6eb5801
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613441
Change-Id: I9e7dc7ce9e0ce46cf80ad356bc42954adb37b6cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 22:21:36 +00:00
Automerger Merge Worker
c809a3a9f4
Merge changes from topic "am-ade9939dcc86447b9557decc69f1b2a9" into udc-d1-dev-plus-aosp am: 80cc76eda4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613441
Change-Id: Ic55574efe6bf14e3c66a782c2371e8409c690fb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 22:09:22 +00:00
Bill Yi
6c43cdc8fe
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44ba06430a
-s ours am: f3392e54a5
-s ours am: 56d5a70aa0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613441
Change-Id: I76e6e683c0e0728c2538daba228e96a96a08dc91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 22:09:09 +00:00
Bill Yi
af119807cf
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 5a3df756ce
-s ours am: d1616c60a3
-s ours am: a63c9b0a73
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613430
Change-Id: If025e0ab4b426dc312ab9108be4a49d319097062
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 22:07:37 +00:00
Bill Yi
410d0c42d2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cb9037e6fe
-s ours am: eaa92efd07
-s ours am: 0cc3b9a425
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613430
Change-Id: I02fe4128dabbc495a7524352ee3c3c78f9859572
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 22:07:33 +00:00
Bill Yi
699d23a505
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: d3e67b615d
-s ours am: 14442ba7c3
-s ours am: ef8d4e5e6b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613429
Change-Id: I9bd4907a68b19420f12f137460523e744e5d2de9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 22:07:28 +00:00
Bill Yi
60a51495f5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2a5e445593
-s ours am: 9725cfd44b
-s ours am: 42d9975494
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613429
Change-Id: I309cf8b2f70fee23ec208cbe288daf58f67fc0b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 22:07:18 +00:00
Bill Yi
edaf97d7bf
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8f8a434c4d
-s ours am: 34d81dca78
-s ours am: 0b92155672
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613427
Change-Id: Ib9f0a4427444c150748d4b3b64d6fe93867cb306
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 22:06:55 +00:00
Automerger Merge Worker
7ca1b2fec0
Merge changes from topic "am-119eb3c6021b40a4899c09f8bfb8bf1c" into udc-d1-dev-plus-aosp
...
* changes:
Merge changes from topic "am-1f6b5056a27a4b83b4ea47a0e8055cce" into udc-dev-plus-aosp am: 6f807ebf11
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44ba06430a
-s ours am: 14b51e0e37
-s ours
2023-08-31 21:33:31 +00:00
Automerger Merge Worker
3a3f389903
Merge changes from topic "am-1f6b5056a27a4b83b4ea47a0e8055cce" into udc-dev-plus-aosp am: 6f807ebf11
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613441
Change-Id: I5e825c033beff24dfbc3f2927a0bbf51cc8e52bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 21:31:28 +00:00
Automerger Merge Worker
80cc76eda4
Merge changes from topic "am-ade9939dcc86447b9557decc69f1b2a9" into udc-d1-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44ba06430a
-s ours am: f3392e54a5
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b0a6787bd1
-s ours am: 27207b8ba2
-s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 21335a6957
-s ours am: 055f0b6e04
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ecd0754441
-s ours am: 108e964377
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4fb8f731c8
-s ours am: 9638eb7317
-s ours
2023-08-31 21:31:17 +00:00
Bill Yi
8dd6eb5801
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44ba06430a
-s ours am: 14b51e0e37
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613441
Change-Id: Iec7a0341be26f883a8abae2e8c3f44828ee08325
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 21:31:14 +00:00
Bill Yi
a63c9b0a73
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 5a3df756ce
-s ours am: d1616c60a3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613430
Change-Id: Ibfeadb7c29852872008f7954ee90ef2a34d84adc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 21:28:47 +00:00
Bill Yi
0cc3b9a425
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cb9037e6fe
-s ours am: eaa92efd07
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613430
Change-Id: Ie22e8090f7e5ecc55918cfe95105620015f7eb0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 21:28:44 +00:00
Bill Yi
ef8d4e5e6b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: d3e67b615d
-s ours am: 14442ba7c3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613429
Change-Id: I241174454651a7fb0cfabb36d392074c4ac2c5f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 21:28:39 +00:00