Eghosa Ewansiha-Vlachavas
a3108d5b14
Merge "[1/n] Aspect ratio settings app list refinement" into udc-qpr-dev
2023-09-28 10:39:35 +00:00
Bill Yi
6cb7bfd9eb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: c9c1c444f5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24878872
Change-Id: I5e5ae2179aa4d7fd477854e5b17f0e3ed4f1ac3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-28 03:02:40 +00:00
Bill Yi
3d522975ff
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5d14c079bc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24878872
Change-Id: I6b62d2f479bf8dc8ce652e6d92f981c4ca39c674
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-28 03:02:35 +00:00
Bill Yi
124f3a7dc7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9a21ad3bdd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24878495
Change-Id: I733310c189b4f89f483db422762be04b4fcf461f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-28 03:02:07 +00:00
Bill Yi
c9c1c444f5
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-09-28 02:21:30 +00:00
Android Build Coastguard Worker
8b3d607ec1
Snap for 10871594 from 630758f4e0
to udc-qpr1-release
...
Change-Id: Ie7f8dcedac9bf07f83cd27360d1bef48b78d1489
2023-09-27 23:19:23 +00:00
Xin Li
f0ba9c8b60
Merge UP1A.231005.007
...
Bug: 291102124
Merged-In: I74cde8ebf8214b314a89452e73b834eac7ae8b1e
Change-Id: If0cc9b99ea3e0e6d908d8c1ed476232d3056cb5d
2023-09-27 16:05:12 -07:00
Bill Yi
5d14c079bc
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I19e3dc6aac243a714d70f2f13c8fe2f3d92ec507
2023-09-27 13:38:02 -07:00
Bill Yi
9a21ad3bdd
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7d55bf64f4bb60e2e44ca0e645601f44b624912b
2023-09-27 13:36:20 -07:00
Eghosa Ewansiha-Vlachavas
6bd9bff2e2
[1/n] Aspect ratio settings app list refinement
...
All apps list for work profile currently only shows work apps that are
also installed on the normal user. Update filter for list to show all
launcher apps for both users in their respective lists.
Fixes: 301373413
Test: atest SettingsUnitTests:UserAspectRatioManagerTest
Test: atest SettingsSpaUnitTests:UserAspectRatioAppPreferenceTest
Change-Id: Ia0bf15340d1b37dcd926d81598d3e94f448a46fc
2023-09-27 17:30:23 +00:00
Eghosa Ewansiha-Vlachavas
12f9e22438
Merge "Create new user aspect ratio summary strings" into udc-qpr-dev am: 630758f4e0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24853822
Change-Id: I2a4ab9c5c47aa9ac6a57d2f50e433d279c51d586
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-27 07:08:27 +00:00
Eghosa Ewansiha-Vlachavas
630758f4e0
Merge "Create new user aspect ratio summary strings" into udc-qpr-dev
2023-09-27 06:27:07 +00:00
Android Build Coastguard Worker
438a1f3a42
Snap for 10865315 from e456cb72f9
to udc-qpr1-release
...
Change-Id: I7bda74c695aaea8eb5ed15e5e648a1120a33f2eb
2023-09-26 23:19:32 +00:00
Peiyong Lin
759a3fda7b
Merge "Add debug property to safe guard ANGLE developer option UI." into udc-qpr-dev am: e456cb72f9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24842231
Change-Id: Iaae1e5f2747e8e6d62c5426ded572b792642e9b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-26 20:35:23 +00:00
Peiyong Lin
e456cb72f9
Merge "Add debug property to safe guard ANGLE developer option UI." into udc-qpr-dev
2023-09-26 19:19:37 +00:00
Eghosa Ewansiha-Vlachavas
159b8aed3d
Update aspect ratio summary strings
...
Replace usage of `aspect_ratio_summary` and `aspect_ratio_main_summary`
with `aspect_ratio_summary_text` and `aspect_ratio_main_summary_text`
Fixes: 302142203
Test: Manual
Change-Id: Id7570269806e2dd15f45bdc0aad1ed0534e259b6
2023-09-26 17:04:59 +00:00
Eghosa Ewansiha-Vlachavas
734aae86d4
Create new user aspect ratio summary strings
...
Fixes: 301224168
Test: Manual
Change-Id: I91eaa96b30bb37cc46620b763ee2e3217dbc8876
2023-09-26 16:59:34 +00:00
Viesturs Zarins
68fede37a0
Merge "Add searchable metadata attribute for injected tiles." into udc-qpr-dev am: 5bc1e9b38f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24792152
Change-Id: Ib3583d5f3a5b7f1086936d848ca41d7921fbded7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-26 09:32:45 +00:00
Viesturs Zarins
5bc1e9b38f
Merge "Add searchable metadata attribute for injected tiles." into udc-qpr-dev
2023-09-26 08:41:52 +00:00
Android Build Coastguard Worker
af1f864d1e
[coastguard skipped] Merge sparse cherrypicks from sparse-10849031-L79100000963192060 into udc-qpr1-release.
...
COASTGUARD_SKIP: I75060fc3d1989522f58cae593b1c1f4063dbd6e5
COASTGUARD_SKIP: I38afc57eac334153d3b033870cfd1cdc5e6afde8
Change-Id: Ic7db34d9681cfa1d61b5a622e8b93216c8b02bc6
2023-09-26 01:34:43 +00:00
Android Build Coastguard Worker
1013a9756b
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24820838'] into sparse-10849031-L79100000963192060.
...
SPARSE_CHANGE: I75060fc3d1989522f58cae593b1c1f4063dbd6e5
Change-Id: I38afc57eac334153d3b033870cfd1cdc5e6afde8
2023-09-26 01:25:13 +00:00
Zaiyue Xue
0eef0fd2b1
Fix JAVA_CRASH NullPointerException in BatteryUsageDataLoader.
...
Bug: 301362376
Fix: 301362376
Test: manual
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:764337bd809a38c215800b30d84b843ad414537b )
Merged-In: I75060fc3d1989522f58cae593b1c1f4063dbd6e5
Change-Id: I75060fc3d1989522f58cae593b1c1f4063dbd6e5
2023-09-26 01:24:15 +00:00
Android Build Coastguard Worker
5f8a124977
Snap for 10859301 from 60912a78ed
to udc-qpr1-release
...
Change-Id: Iab694c1e364e0f714c878797172fd250b7a2bc48
2023-09-25 23:19:37 +00:00
Bill Yi
b3150920dc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7523dceebf
-s ours am: 6a0894dfa4
-s ours am: fd3370a39e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836391
Change-Id: I45b46be968718d7b174d65b497bee300340bf581
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 22:43:13 +00:00
Bill Yi
8e09a4c49d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5ebd68a6e8
-s ours am: 3689fa7934
-s ours am: 610b8f02f0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836391
Change-Id: I11f71c711a0091fa41ccc6b10bc939f77a167322
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 22:43:09 +00:00
Bill Yi
076f75870c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 6e8a58a104
-s ours am: 8ef2296804
-s ours am: cd8bf64aea
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836390
Change-Id: I2915bd868eebc94be86221f11736cfaa37c7b91d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 22:43:04 +00:00
Bill Yi
a7e9db2aca
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d4d6867b69
-s ours am: 11dc30fe97
-s ours am: b88042caf5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836390
Change-Id: If9385535dad70796fd08208e18cde0ba17b0cc1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 22:42:50 +00:00
Bill Yi
ea1d27d507
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0d5904fbbb
-s ours am: bd6cfa0e67
-s ours am: 015e594ddc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24830586
Change-Id: I0087fc10646174d8cfc23b775d64573dff7424f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 22:42:24 +00:00
Bill Yi
70cfa99725
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7523dceebf
-s ours am: 6a0894dfa4
-s ours am: 916199a1eb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836391
Change-Id: I39ad6bcf4d747ef6f0c2018366cb98d0cb6f63d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 22:35:02 +00:00
Bill Yi
6ffdc686f0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5ebd68a6e8
-s ours am: 3689fa7934
-s ours am: 75bc257034
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836391
Change-Id: I33608bd40fd5a5f468998ed55424d6f1dd8adad6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 22:34:58 +00:00
Bill Yi
4626a2f3a2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 6e8a58a104
-s ours am: 8ef2296804
-s ours am: e019289aaf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836390
Change-Id: Id5c4626ff20ee49cc3a9efdec0634cbe18800544
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 22:34:56 +00:00
Bill Yi
ae249c2acd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d4d6867b69
-s ours am: 11dc30fe97
-s ours am: 98bf49f591
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836390
Change-Id: I5ab1b6c413616f6774b059db0d06695e5583e27d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 22:34:45 +00:00
Bill Yi
02e16c5069
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0d5904fbbb
-s ours am: bd6cfa0e67
-s ours am: 704017e746
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24830586
Change-Id: I4566cf2c161b4c47cf93a4d309f6ef7990cd9d75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 22:34:14 +00:00
Bill Yi
916199a1eb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7523dceebf
-s ours am: 6a0894dfa4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836391
Change-Id: I957169657205bf64b845649f0f9a4a0d86f5d164
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 21:52:28 +00:00
Bill Yi
75bc257034
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5ebd68a6e8
-s ours am: 3689fa7934
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836391
Change-Id: I6ac522b75f8f7a1ad751f047e211553551fd7f93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 21:52:17 +00:00
Bill Yi
e019289aaf
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 6e8a58a104
-s ours am: 8ef2296804
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836390
Change-Id: I1edd93ca85efa0c7be4ebcd9a6c815b17a6ad980
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 21:52:09 +00:00
Bill Yi
98bf49f591
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d4d6867b69
-s ours am: 11dc30fe97
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836390
Change-Id: Ia88b203599b154ec29ca532824bd8417af942392
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 21:51:54 +00:00
Bill Yi
704017e746
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0d5904fbbb
-s ours am: bd6cfa0e67
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24830586
Change-Id: I337a825de6e761c36364ebe279593417d302c207
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 21:51:32 +00:00
Bill Yi
fd3370a39e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7523dceebf
-s ours am: 6a0894dfa4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836391
Change-Id: Ie68c818d1741c5708a8ebeaf8c43960bd8c4e403
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 21:44:18 +00:00
Bill Yi
610b8f02f0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5ebd68a6e8
-s ours am: 3689fa7934
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836391
Change-Id: I051f9785295d07b6c8459fc1712428fa3af54fe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 21:44:14 +00:00
Bill Yi
cd8bf64aea
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 6e8a58a104
-s ours am: 8ef2296804
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836390
Change-Id: I58f4b0a4f9b132718714aa3f61b3d394f93b16aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 21:44:08 +00:00
Bill Yi
b88042caf5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d4d6867b69
-s ours am: 11dc30fe97
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836390
Change-Id: I368949ca10b722046fccb0e757fd8bda8806d824
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 21:43:53 +00:00
Bill Yi
015e594ddc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0d5904fbbb
-s ours am: bd6cfa0e67
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24830586
Change-Id: Idc23058a41dab4f5186932e823e8d2a7dac0f37e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 21:43:30 +00:00
Bill Yi
13e76af10f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7523dceebf
-s ours am: aaab0d5237
-s ours am: 5ab4ece54f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836391
Change-Id: Ib34dff579ae8a464c400b114ab2f20f154a33be1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 21:43:12 +00:00
Bill Yi
29b0bcd97f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5ebd68a6e8
-s ours am: 082f9d2430
-s ours am: b967d1818a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836391
Change-Id: I831fc6cb28af5f0bd557cdafb712a3aa21463ecb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 21:43:09 +00:00
Bill Yi
8e3775b78a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 6e8a58a104
-s ours am: ae5ef06af9
-s ours am: fc053d2e32
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836390
Change-Id: I06c5b31c219ae3f5c41d436cec498f762bf95972
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 21:43:00 +00:00
Bill Yi
3d04d0731c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d4d6867b69
-s ours am: e9d30b8c9a
-s ours am: 4e484b62c3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836390
Change-Id: I0978efead45d8a285f16439f2a6a40fcc534f4c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 21:42:45 +00:00
Bill Yi
2067f15c30
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0d5904fbbb
-s ours am: 66d77811de
-s ours am: a79f4c9cee
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24830586
Change-Id: I4f499bda80e928ae4db3dcc43a78e09a93410280
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 21:42:25 +00:00
Bill Yi
5ab4ece54f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7523dceebf
-s ours am: aaab0d5237
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836391
Change-Id: I9c7895ded871706c400610143789472457066a94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 20:59:25 +00:00
Bill Yi
b967d1818a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5ebd68a6e8
-s ours am: 082f9d2430
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836391
Change-Id: I561189f28b9709c048d00bdc1878f0fa79702e8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 20:59:20 +00:00