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
Bill Yi
458e8cc311
Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future
2023-09-07 23:43:06 +00:00
Bill Yi
3d0a8354b3
Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future
2023-09-07 23:43:06 +00:00
Bill Yi
2527e8855f
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-09-07 22:56:10 +00:00
Bill Yi
95ff1dbb5e
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-09-07 22:56:10 +00:00
Bill Yi
bc882dc6a6
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-09-07 22:56:10 +00:00
Holly Jiuyu Sun
54f96175a2
Merge "Change feature flag to device config flag." into udc-qpr-dev
2023-09-07 18:47:54 +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
Bill Yi
0071351cfc
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I79f55f0afe719e019225ea96a442a066ab33e4f3
2023-09-07 04:15:45 -07:00
Bill Yi
219f3c68fa
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I18aa01b928c2e48302ed95acf15cdeec11c1c3e5
2023-09-07 04:13:48 -07:00
Jason Chang
f6fdfb0ddc
Merge "Fix the style of Choose screen lock wasn’t consistent in initial setup and deferred setup" into udc-qpr-dev
2023-09-07 06:20:21 +00:00
Bill Yi
4023686444
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8e3f59a9d566489d8c61d1a3f63cf90574d1940b
2023-09-06 20:58:06 -07:00
Bill Yi
3152898c4a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8be0bcf8a734144099c330c82f335c145ef974f5
2023-09-06 20:57:19 -07:00
Bill Yi
bea9c6fffa
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3673e713822da35a1aa64de4aecb0aad5c1d77d2
2023-09-06 20:56:31 -07:00
Bill Yi
2c4039be6d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1807ea56cbfaa846e77ba40b2c330f931e826715
2023-09-06 20:53:50 -07:00
Bill Yi
1246d3046b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ifb278053057291391b9b2554a487b973470b6713
2023-09-06 20:52:13 -07:00
Bill Yi
218dd7dcbd
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I40cb57285ddab4f4494479eb2da3fc1ac8cfec5c
2023-09-06 20:50:39 -07:00
Bill Yi
35b82f2c87
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1bc80785e0a6c6d9576749bf5d47f607e5b9ed56
2023-09-06 20:49:17 -07:00
Shivangi Dubey
00a78fca41
Merge "Refine fold setting" into udc-qpr-dev am: 26e14e09bf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24314953
Change-Id: Iaf6c0514a406267de5924672b1e879a4dce3ce4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-06 15:06:39 +00:00
Shivangi Dubey
26e14e09bf
Merge "Refine fold setting" into udc-qpr-dev
2023-09-06 14:28:54 +00:00
dshivangi
7435bbc70a
Refine fold setting
...
Current fold setting has a toggle button which can enable the “Stay unlocked on fold” setting.
Create a new page for fold setting which will allow us to choose something from three options.(https://screenshot.googleplex.com/6W65aTYtigGpr3v )
*Always - Front display turns on when you fold your device [Currently available setting]
*Only games, videos, and more - Front display turns on for apps that stop your screen going idle [Default]
*Never - Front display locks when you fold your device [New option for user]
Test: atest FoldLockBehaviorSettingsTest FoldLockBehaviorPreferenceControllerTest
*Manual
Flash the build with these changes
Manually select options one by one
Observe the behavior
Fixes: 294194379
Change-Id: Ie5b4e1d7560ed645ec2ca5f49cc9715b17d21367
Merged-In: Ie5b4e1d7560ed645ec2ca5f49cc9715b17d21367
2023-09-06 10:52:12 +00: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 Sun
584876ff09
Change feature flag to device config flag.
...
Bug: 294858168
Test: manual
Change-Id: I7411c0ef0272b1caf8a775be7216436e9e0f28a7
2023-09-01 17:24:14 +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