Commit Graph

143690 Commits

Author SHA1 Message Date
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
Jaewan Kim
c4d90bf739 Merge "Clear Linux terminal app when disabled" into main am: 005ee9761b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3332054

Change-Id: I4989ce036205f873d5bfb7ef876b7f573fbe0284
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-12 04:12:47 +00:00
Jaewan Kim
005ee9761b Merge "Clear Linux terminal app when disabled" into main 2024-11-12 03:49:41 +00:00
Jaewan Kim
ea0b5d5950 Clear Linux terminal app when disabled
Bug: 374032310
Test: Manual, T/H
Flag: Build.RELEASE_AVF_SUPPORT_CUSTOM_VM_WITH_PARAVIRTUALIZED_DEVICES
Change-Id: Id56f98cf90b0598111baa3096b1b81307ebb99a3
2024-11-12 01:19:17 +00:00
Treehugger Robot
e3fe97469e Merge "Make Linux terminal option profile aware" into main am: 9089bca7d1
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3332053

Change-Id: I4d42ce3bc3f33ff25336805f1209a53dd6adade5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-11 18:38:31 +00:00
Treehugger Robot
9089bca7d1 Merge "Make Linux terminal option profile aware" into main 2024-11-11 17:57:37 +00:00
Treehugger Robot
07323c29b6 Merge "Remove all pending messages when fragment destroyed" into main am: f85bc08954
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3329595

Change-Id: I41cf9371fc4560182def371649bd8cd3e7963406
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-11 12:16:48 +00:00
Treehugger Robot
f85bc08954 Merge "Remove all pending messages when fragment destroyed" into main 2024-11-11 11:50:09 +00:00
Jaewan Kim
ed3abffcfc Make Linux terminal option profile aware
Bug: 374034911
Test: atest, plus following manual test \
  - Test tabbed UI with/without work profile \
  - Test that disabled by work profile launches alert dialog \
  - Test whether toggling an app only toggle the app for the user.
Flag: Build.RELEASE_AVF_SUPPORT_CUSTOM_VM_WITH_PARAVIRTUALIZED_DEVICES
Change-Id: I4bf0a2d521cf3e632f6c0320e0b5cc0154d5b68f
2024-11-11 14:31:19 +09:00
Treehugger Robot
9c83e100ab Merge "Update state when disabling and enabing develop option" into main am: 0fad6810fe
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2700555

Change-Id: I83b11771e2aa0ec07c03c3030705fba56da6b2c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-07 19:56:09 +00:00
Treehugger Robot
0fad6810fe Merge "Update state when disabling and enabing develop option" into main 2024-11-07 19:14:23 +00:00
alisa.li
fe199d2656 Update state when disabling and enabing develop option
When not support a2dp offload, the a2dp offload preference is shown in grey, but a2dp offload preference will be set enabled when enabing develop option

Bug:295109808
Test: manual
Change-Id: I7e1d073ff9ef6b68b5f1d9faa1dac459a70d7afc
2024-11-07 10:41:57 +00:00
Treehugger Robot
059f600c5e Merge "fix crash in setting time zone" into main am: 15f88ddc70
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3079352

Change-Id: I010e5c40db4a9eae81df7cb579d5c311c5dd0887
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-05 01:02:33 +00:00
Treehugger Robot
15f88ddc70 Merge "fix crash in setting time zone" into main 2024-11-05 00:31:21 +00:00
dingfeisong
64aaa1440a Remove all pending messages when fragment destroyed
Remove all pending messages when the fragment has destroyed.
Otherwise, after fragment disattachs its context, an exception
will be reported when process the messages.

Bug:377166756

Change-Id: I333cedb45c0fe43b81abbfbe19e37f42f98def91
Signed-off-by: dingfeisong <dingfeisong@xiaomi.corp-partner.google.com>
2024-11-04 13:40:27 +08:00
Android Build Coastguard Worker
f808bfa343 Merge cherrypicks of ['googleplex-android-review.googlesource.com/29867935'] into 24Q4-release.
Change-Id: I92ffc07d2dad090f4e2373c4562ce60d660f898e
2024-10-23 22:51:13 +00:00
Edgar Wang
4d2012ccf9 [Homepage Revamp] hide the scroll bar of homepage
Bug: 364612225
Test: visual
Flag: EXEMPT bugfix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b246d2e8152eda94691a463a70973166e98c39c9)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e3c7913e3c9ffb9e95675d1731e8bf9a58082a18)
Merged-In: I0d4c48ef6debfa82597db48a4320b0500f330b1b
Change-Id: I0d4c48ef6debfa82597db48a4320b0500f330b1b
2024-10-23 22:47:58 +00:00
Treehugger Robot
f5e3b586cb Merge "Avoid flakiness SLO" into main am: aa8b66f3ad
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3310581

Change-Id: I2e906f76248880a2fe2cb1ea36bf6a9783730080
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-23 08:36:25 +00:00
Treehugger Robot
aa8b66f3ad Merge "Avoid flakiness SLO" into main 2024-10-23 08:13:58 +00:00
Treehugger Robot
1dd30843d0 Merge "Remove dependencies on the 1-variant fallback" into main am: e56d23c121
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3317680

Change-Id: I561bf2f17934bcd53afa64048507a35125d8b4f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-23 02:43:14 +00:00
Treehugger Robot
e56d23c121 Merge "Remove dependencies on the 1-variant fallback" into main 2024-10-23 02:06:03 +00:00
Cole Faust
66c5be9fdf Remove dependencies on the 1-variant fallback
When adding a dependencies, if the variants don't match, but the
dependency only has 1 variant anyways, soong will always use that
variant. This makes it hard to add new variants to soong, because the
1-variant fallback stops being used and you start getting missing
variant errors. Make changes to bp files such that all dependencies
correctly specify the variant to use.

Bug: 372091092
Flag: EXEMPT refactor
Test: m nothing
Change-Id: I8487eff4de7349c922901160f55717e7d3296650
2024-10-22 16:30:59 -07:00