Bill Yi
8f824b54ea
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e211461744
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24918568
Change-Id: I4fcb7e808a391d3aadda7a376ecdaa6e99dfd86b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-03 03:48:41 +00:00
Bill Yi
7b38ca4ff1
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-10-03 03:09:01 +00:00
Bill Yi
a4d991c836
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 16eacc3097
-s ours am: a46afe3b67
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24917917
Change-Id: If140cde3fa73c42d44835b0c0d711a099d5eb4e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-02 21:53:05 +00:00
Bill Yi
f6f7ede780
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 217974d1f4
-s ours am: aab00637cc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24917917
Change-Id: I797be00c50ebf72300920a7dae86416f3787cf82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-02 21:52:56 +00:00
Bill Yi
4a626d4856
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 91787589e3
-s ours am: f0a398ba6b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24917915
Change-Id: Ie8ce4bba986ffe7f981cede371ca4bbb75a7ed06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-02 21:52:38 +00:00
Bill Yi
93e23bf143
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 16eacc3097
-s ours am: ce90d7667c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24917917
Change-Id: Ide6754ce608595849806942f83c50246dc222f05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-02 21:41:07 +00:00
Bill Yi
9ae139073c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 217974d1f4
-s ours am: 96802b6b87
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24917917
Change-Id: I69dd33eb0f7766615058cad7c1014007692c5526
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-02 21:40:56 +00:00
Bill Yi
6aad472dd7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 91787589e3
-s ours am: 7931cdc634
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24917915
Change-Id: Ie245c6293e0a8602139efd93eff2c34f977f2593
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-02 21:40:41 +00:00
Bill Yi
a46afe3b67
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 16eacc3097
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24917917
Change-Id: Ib1ec58f407f5944ced7195c326c5723360a2c105
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-02 21:28:21 +00:00
Bill Yi
aab00637cc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 217974d1f4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24917917
Change-Id: I9c5520137b09186da19a7c125a99fc4271ae3114
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-02 21:28:13 +00:00
Bill Yi
f0a398ba6b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 91787589e3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24917915
Change-Id: I725f3b25cd3d541787998e5dd0cb42392e1da116
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-02 21:27:55 +00:00
Bill Yi
ce90d7667c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 16eacc3097
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24917917
Change-Id: If84ed710468ff2b2cbf16d427a6b82c71180966b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-02 21:27:15 +00:00
Bill Yi
96802b6b87
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 217974d1f4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24917917
Change-Id: Ibe2e81b80090008486ebe9ac88b2acf0bedf4668
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-02 21:27:09 +00:00
Bill Yi
7931cdc634
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 91787589e3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24917915
Change-Id: I2fec3a9a5be1fa658c88dc32da3ccb565022d4ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-02 21:26:48 +00:00
Bill Yi
16eacc3097
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-10-02 20:38:39 +00:00
Bill Yi
fe0c995a5d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f336e73db9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24918569
Change-Id: I563f617b607eca39ef91d6450be0f7fa0903f089
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-02 19:58:35 +00:00
Bill Yi
217974d1f4
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2d0eaf947accd684a1b8d5eed229e46ba3e3bac7
2023-10-02 00:09:28 -07:00
Bill Yi
7b563cc2d4
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If497526471c4d717ea029e839456fee636fb5398
2023-10-02 00:08:36 -07:00
Bill Yi
f336e73db9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I98c3767b717948c0458985d76344f96bd55f6703
2023-10-02 00:05:50 -07:00
Bill Yi
91787589e3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6831d85a6b7a6e4b6aa44b4fa79a01b4633917c7
2023-10-02 00:04:15 -07:00
Bill Yi
e211461744
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3d1ca601e38b4559f4e9cc88ae6fbea27aaf35fc
2023-10-02 00:02:41 -07:00
Bruno Martins
58427f0319
AirplaneModePreferenceController: Fix NPE when toggle is hidden
...
When airplane mode toggle is not available, i.e. the overlay
config_show_toggle_airplane is set to false, the Settings app
will crash when leaving "Network and Internet" menu.
Change-Id: Iaf5bd05d59091ba615a55eedc5243806a627da7b
2023-09-30 23:29:33 +01:00
Bill Yi
714fd9386f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: b80f7ea863
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24904209
Change-Id: I3c59777bcdf3415b97989198e063ac96ff3084b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-29 22:55:24 +00:00
Bill Yi
a0f802846b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 582d855820
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24904209
Change-Id: Ied8e157ce712c44608f110ee5d33890a735da4a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-29 22:54:57 +00:00
Bill Yi
b80f7ea863
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-09-29 22:49:01 +00:00
Eghosa Ewansiha-Vlachavas
933b2431fb
Fix testGetUserMinAspectRatioEntry for both tablets and foldables am: 136bd906da
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24879571
Change-Id: If37a415cc6f53f1f9df7731129dd9fa42341c4d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-29 20:45:20 +00:00
Bill Yi
582d855820
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ieac96bbd522889663356dd647c7724e2c7466fe3
2023-09-29 07:56:46 -07:00
Xin Li
55d8d7f121
[automerger skipped] Merge UP1A.231005.007 am: f0ba9c8b60
-s ours am: 2553e934f6
-s ours am: cd5d2e9321
-s ours
...
am skip reason: Merged-In I74cde8ebf8214b314a89452e73b834eac7ae8b1e with SHA-1 75987a1856
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24878503
Change-Id: If35dfbddb17eef9536a4e50c3e2744adbaa9a707
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-29 09:04:34 +00:00
Xin Li
cd5d2e9321
[automerger skipped] Merge UP1A.231005.007 am: f0ba9c8b60
-s ours am: 2553e934f6
-s ours
...
am skip reason: Merged-In I74cde8ebf8214b314a89452e73b834eac7ae8b1e with SHA-1 75987a1856
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24878503
Change-Id: I33e25c55139500c30fb69c151f2366f944d31caa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-29 08:16:31 +00:00
Xin Li
2553e934f6
[automerger skipped] Merge UP1A.231005.007 am: f0ba9c8b60
-s ours
...
am skip reason: Merged-In I74cde8ebf8214b314a89452e73b834eac7ae8b1e with SHA-1 75987a1856
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24878503
Change-Id: I35c7d1c5129217358b2e3acbb9033a9ce876a18d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-29 07:15:41 +00:00
Eghosa Ewansiha-Vlachavas
136bd906da
Fix testGetUserMinAspectRatioEntry for both tablets and foldables
...
Tabelts and foldables now have different aspect ratio values in their
config, so we need to test the devices separately as we shouldnt test for
values that are not in the config of the device the test is run on.
Fixes: 302155585
Test: atest SettingsUnitTests:UserAspectRatioManagerTest
Change-Id: I78fa3020501a4be992bb90fea16a6fec4f37594b
2023-09-28 13:23:11 +00:00
Eghosa Ewansiha-Vlachavas
2595f32076
Merge "[1/n] Aspect ratio settings app list refinement" into udc-qpr-dev am: a3108d5b14
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24854937
Change-Id: I9ed3cf613ae4b20c1465403be0c989a00be425fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-28 11:08:02 +00:00
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
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
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
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