Treehugger Robot
0decf6e746
Merge "Update OWNERS for Android Settings" into main am: 01af7b14de
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3381149
Change-Id: I6ad17f8ae918a5e16ee3e7107aceb203640d9cd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-05 03:21:36 +00:00
Treehugger Robot
01af7b14de
Merge "Update OWNERS for Android Settings" into main
2024-12-05 02:41:39 +00:00
Treehugger Robot
b6683ea552
Merge "Customize the availability of Testing Settings Menu" into main am: d25fdc50d8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2927822
Change-Id: I3d6a579d6a5b999b783610e1a2b80031aa1b1ec3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-04 11:51:51 +00:00
Treehugger Robot
d25fdc50d8
Merge "Customize the availability of Testing Settings Menu" into main
2024-12-04 11:24:50 +00:00
David Magno
8839335d58
Customize the availability of Testing Settings Menu
...
Add the possibility to disable the Testing Settings Menu
(secret code *#*#4636#*#*) on user builds.
Bug: 306338055
Test: atest TestingSettingsBroadcastReceiverTest
Flag: NA
No-Typo-Check: trivial
Change-Id: I451f094864bd9a0ad8086e9646e2d666ab2388dc
2024-12-04 11:23:25 +00:00
Xin Li
fe5a8d38f3
Merge "Merge ab/AP4A.241205.013 into aosp-main-future" into aosp-main-future
2024-12-03 16:50:21 +00:00
hoffc
e2c1316682
Settings: Fix face enroll stack overflow
...
Stack overflow occurs when enrolling face.
Buganizer: 381974811
Change-Id: I9c5ae8f07f5ce9174b270abfef313bcf12fd2c57
2024-12-03 15:33:41 +08:00
Edward Savage-Jones
844dd0e097
Partial revert to restore lottie_bubbles.json
...
The tablet version of this animation exists in AOSP, under:
./raw-sw600dp/lottie_bubbles.json
this CL restores the phone version that was accidentally (?)
removed in an earlier commit (73a61a8
). Restored using:
git checkout 73a61a8
res/raw/lottie_bubbles.json
Bug: 379667765
Test: robotest and see the UI
Change-Id: Ibf404c9402a808f09ac751b5f34c029a570eb3f4
2024-12-02 10:54:27 +01:00
Jason Chiu
a25868453c
Update OWNERS for Android Settings
...
Fix: 381373363
Test: N/A
Change-Id: I97f7667dd104b9d8b0f6db72f05444e77458975a
2024-11-28 09:15:16 +00:00
Treehugger Robot
deec945b4d
Merge "Revert "Turn off voice access in 16KB mode"" into main am: 262b9d9b41
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3320718
Change-Id: I806211fb1462e737206e0f2aef762809eaf907f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-28 02:17:10 +00:00
Treehugger Robot
262b9d9b41
Merge "Revert "Turn off voice access in 16KB mode"" into main
2024-11-28 01:35:31 +00:00
Pawan Wagh
5da1293494
Revert "Turn off voice access in 16KB mode"
...
This reverts commit 6de4093876
.
Test: m Settigns
Bug: 335443194
Bug: 340231742
Change-Id: I6b3ab5ba9626dd17c1e6383d8b390fb7c91c9efc
Merged-In: Id2c4584835766e9620234233b6594c0dd59b68e9
2024-11-27 22:32:48 +00:00
Xin Li
b6cfdb21a8
Merge ab/AP4A.241205.013 into aosp-main-future
...
Bug: 370570306
Merged-In: I0d4c48ef6debfa82597db48a4320b0500f330b1b
Change-Id: Ia46be767cd3e134c3f1b37411a72c4e0be28ecee
2024-11-27 12:53:11 -08:00
Treehugger Robot
ed4e2b8fc0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into main am: 7fb8f02f4e
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3378198
Change-Id: I5595a4c81cb5fe774cf988e3f93a314f9dcfac7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-27 10:56:49 +00:00
Bill Yi
509dca3230
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cf48d5b7e5
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3378198
Change-Id: I0b7996dbdc864d14de0394caeb2db72db91f5ea4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-27 10:56:44 +00:00
Treehugger Robot
df0f56a8ba
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into main am: 6ab2e734bd
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3378197
Change-Id: I7b613e588c8f201b477b9f432ffecd45a0803cca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-27 10:56:40 +00:00
Bill Yi
707f62a539
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5892f6b9cf
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3378197
Change-Id: Ie7782d76d64a5328885623a27758673efaebe683
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-27 10:56:37 +00:00
Treehugger Robot
8c5e7cf31b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into main am: 9bb494666f
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3377798
Change-Id: I0addb62b8b0203f7dd9a15fc45ef5d7c37435d79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-27 10:56:31 +00:00
Bill Yi
1e3c0162cb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f76efce0bf
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3377798
Change-Id: Id56e72a5be3a8140c3a333acf3af83175b690349
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-27 10:56:09 +00:00
Treehugger Robot
7fb8f02f4e
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-11-26 22:41:29 +00:00
Treehugger Robot
6ab2e734bd
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-11-26 22:41:29 +00:00
Treehugger Robot
9bb494666f
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-11-26 22:41:29 +00:00
Treehugger Robot
0a89a72054
Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future
2024-11-26 20:37:07 +00:00
Treehugger Robot
f33c479f74
Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future
2024-11-26 20:37:07 +00:00
Bill Yi
cf48d5b7e5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6c78d3f28c0335fa9d6d077568abd795623d8fd7
2024-11-26 07:03:26 -08:00
Bill Yi
f76efce0bf
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic1f83a21167e2ca81b94545b84bdb2420f013758
2024-11-26 07:01:41 -08:00
Bill Yi
5892f6b9cf
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8f4b944635888cfc4597b3a9269eb5462cb01c3b
2024-11-26 07:00:24 -08:00
Bill Yi
c47df6271a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2c1246a4b34c6b09a42c05153c0e3f015d475df1
2024-11-26 05:54:19 -08:00
Bill Yi
8ff0ee9c20
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7537a8c074c8da6de687d2b80e3f8ed7c9505ec2
2024-11-26 05:52:36 -08:00
Bill Yi
7230cbcb61
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9af8e5aeb3c8ab91dbc5695cfe84437bc8bd0904
2024-11-26 05:51:12 -08:00
Treehugger Robot
60f7c04dac
Merge "Update comments to point to the new location of event.logtags." into main am: fa6413ed0b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3375731
Change-Id: I6a6912059c1f4c688c60deacd9382e0fa6355491
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-26 10:45:28 +00:00
Treehugger Robot
fa6413ed0b
Merge "Update comments to point to the new location of event.logtags." into main
2024-11-26 10:19:51 +00:00
Eric Lin
d6f139b389
Update comments to point to the new location of event.logtags.
...
event.logtags was moved from system/core/logcat to system/logging/logcat in Android 12 by aosp/1454058.
Change-Id: I8a6d046bf31e1e0d28862664f5cc0e2e941ab60c
BUG: 168791309
Flag: DOCS_ONLY
Test: Local build
2024-11-26 07:13:23 +00:00
Xin Li
207c4c5c5e
Merge "Merge ab/AP4A.240925.013 into aosp-main-future" into aosp-main-future
2024-11-25 17:28:24 +00:00
Treehugger Robot
eb833001aa
[automerger skipped] Merge "Fix whenNoInstaller_notDisplayed" into main am: c10f2c69f5
-s ours
...
am skip reason: Merged-In If21215b81008c03a6b6ad2a77a90073a6d708390 with SHA-1 512141619d
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3373611
Change-Id: I68deb2755958c21e15b0df1921b2bcb43eba281e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-25 09:24:00 +00:00
Chaohui Wang
a1647633b2
[automerger skipped] Fix whenNoInstaller_notDisplayed am: a233ca783a
-s ours
...
am skip reason: Merged-In If21215b81008c03a6b6ad2a77a90073a6d708390 with SHA-1 512141619d
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3373611
Change-Id: I19d10f8b66ff4a6d4347431573af58c82451dfde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-25 09:23:57 +00:00
Treehugger Robot
c10f2c69f5
Merge "Fix whenNoInstaller_notDisplayed" into main
2024-11-25 08:39:57 +00:00
Chaohui Wang
a233ca783a
Fix whenNoInstaller_notDisplayed
...
Which is forgot to update in Icd5559bce06c059844269d70926b3c0b39589edb
Bug: 355270127
Flag: EXEMPT test only
Test: atest AppInstallerInfoPreferenceTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:512141619d041cc01e38f3c9b07a84b83a6a1354 )
Merged-In: If21215b81008c03a6b6ad2a77a90073a6d708390
Change-Id: If21215b81008c03a6b6ad2a77a90073a6d708390
2024-11-25 08:08:08 +00:00
Xin Li
521a712349
Merge ab/AP4A.240925.013 into aosp-main-future
...
Bug: 370570306
Merged-In: I4e2a72a80f68579d60466e859370b6fd93a8cd23
Change-Id: Ifc87474ccff4172524295035e70916216b41a715
2024-11-21 15:10:02 -08:00
Jeongik Cha
c15d15953b
Merge "Fix storage requirement for Linux terminal" into main am: cc7e4e5821
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3364326
Change-Id: Icee4ae8bc9e67b485caebc1e67e95e9643104d23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-19 23:19:12 +00:00
Jeongik Cha
cc7e4e5821
Merge "Fix storage requirement for Linux terminal" into main
2024-11-19 22:56:04 +00:00
Jeongik Cha
294b41a883
Fix storage requirement for Linux terminal
...
getPrimaryStorageSize rounds up size by GB, not GiB
Bug: 366374130
Change-Id: Idf43c5cee41172d763b6c271042317d151d41a38
Test: build and run
2024-11-19 07:43:31 +00:00
Jaewan Kim
ea27253a31
Merge "Hide Linux terminal if device doesn't meet minimum requirement" into main am: 5965a10f60
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3350252
Change-Id: I2387ed8be5c63cd75c29a506d170fb916399cff2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-19 01:34:26 +00:00
Jaewan Kim
5965a10f60
Merge "Hide Linux terminal if device doesn't meet minimum requirement" into main
2024-11-19 01:09:07 +00:00
alisa.li
2eb14f53bb
Update the cache of a2dp config before writing config.
...
The created config based on mBluetoothA2dpConfigStore is invalid, so we need to update the cache before writing config.
Bug: 3177357791
Test: manual
Change-Id: I47774f035509f0cb533209e4e31e7477d5b8e516
2024-11-15 07:26:45 +00:00
Jaewan Kim
a6334bc0a3
Hide Linux terminal if device doesn't meet minimum requirement
...
Bug: 366374130
Test: Manually, atest
Change-Id: Id0ef47099b3fab41175bfae3d0eaf61037ba82ff
2024-11-15 11:10:25 +09:00
Treehugger Robot
a320592887
Merge "Add android:key to device info PreferenceCategories" into main am: fb6902d872
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3330454
Change-Id: I2ff9911ca626b0144ad18721122cb5cbeb26f84c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-14 04:19:25 +00:00
Treehugger Robot
fb6902d872
Merge "Add android:key to device info PreferenceCategories" into main
2024-11-14 03:50:28 +00:00
Lars Svensson
3eb06a9077
Add android:key to device info PreferenceCategories
...
Add group key to PreferenceCategory "Legal & regulatory",
and "Device identifiers" making injection of preferences in
this section possible.
Change-Id: Ic178f402fb993cbd4be7c3f0713496acf2a6938a
2024-11-13 13:20:38 +01:00
Xin Li
cfa19e11a6
Merge 24Q4 (ab/12406339) into aosp-main-future
...
Bug: 370570306
Merged-In: Ie90e7495dd4a134538bae6e3e08eea0d02134b14
Change-Id: I20517e9ee410e95f2cbeb1247c0c0288ed9f006f
2024-11-11 21:38:40 -08:00