Automerger Merge Worker
ad59f779ed
Merge changes from topic "am-714039f3cfd243eb98aff7d30946de12" into udc-d1-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7b38ca4ff1a42171c28d7b563cc2d4cd61c38784e2114617446db59420a9
2023-10-03 04:39:59 +00:00
Bill Yi
bef7ad1471
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7b38ca4ff1 -s ours am: a42171c28d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24918570
Change-Id: I11004b020e71716c742f3fd5e402afe0c48e8f85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-03 04:36:48 +00:00
Bill Yi
ccdb8bd50e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b563cc2d4 -s ours am: cd61c38784 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24918570
Change-Id: I9905a2e5b581a864ab1c9bcf19680ed291211b8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-03 04:36:36 +00:00
Bill Yi
72d054d599
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e211461744 -s ours am: 6db59420a9 -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: I8a849456c65a90a886af2e42522d7e4d94959d1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-03 04:36:23 +00:00
Bill Yi
27c5a172b5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7b38ca4ff1 -s ours am: 3c00fdbe8e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24918570
Change-Id: Id83be08685aff164ffe578384d0127628dc0b984
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-03 04:36:04 +00:00
Bill Yi
11184d6acc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b563cc2d4 -s ours am: fddbd76bd8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24918570
Change-Id: I7ac16244743db5b39d988efcca249fc6a47c4e4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-03 04:35:51 +00:00
Bill Yi
8c0e6c44c0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e211461744 -s ours am: 8f824b54ea -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: I86ab265f33bef673092c1c34df16eee78cee1807
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-03 04:35:37 +00:00
Bill Yi
b3093ad1b7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7b38ca4ff1 -s ours am: a42171c28d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24918570
Change-Id: Icb4d66ae0308d7086de3163d30b68820fcc9b3cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-03 04:35:10 +00:00
Bill Yi
d85a9a5196
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b563cc2d4 -s ours am: cd61c38784 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24918570
Change-Id: Ifd495adf0006d0d3fdbfb446d26f8a70606c0e76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-03 04:35:02 +00:00
Bill Yi
473073e421
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e211461744 -s ours am: 6db59420a9 -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: I19e183bee4cf2d4c9bccd2312200182c1f7d1449
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-03 04:34:44 +00:00
Bill Yi
a42171c28d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7b38ca4ff1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24918570
Change-Id: I554524b0172d26550b6ad1af83a2e697df152a1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-03 03:50:58 +00:00
Bill Yi
cd61c38784
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b563cc2d4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24918570
Change-Id: Iecfb42a1621989212a935e1c954feb3d36f3e15f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-03 03:50:49 +00:00
Bill Yi
6db59420a9
[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: Id768812173c30a24ab6d5f94a5775ebf2180f711
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-03 03:50:32 +00:00
Bill Yi
3c00fdbe8e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7b38ca4ff1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24918570
Change-Id: I803cfed0e98c681d6b42fadb6a3ab5d077ddd531
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-03 03:49:07 +00:00
Bill Yi
fddbd76bd8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b563cc2d4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24918570
Change-Id: Id9ec59a7cac6f4e7cd51108f6d5bee2a5d47d1f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-03 03:49:01 +00:00
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
Android Build Coastguard Worker
004aba25b1
Snap for 10890402 from f336e73db9 to udc-qpr1-release
...
Change-Id: I1988a0e7fec48cc1418d078f3a3f799bc9bdcfe8
2023-10-02 23:19:45 +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
Android Build Coastguard Worker
44719f2020
Snap for 10884398 from b80f7ea863 to udc-qpr1-release
...
Change-Id: Ie7d3b215bf2844fe9d1ae600a19194f4cc0f8a9b
2023-09-30 03:24:10 +00: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 75987a1856https://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 75987a1856https://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 75987a1856https://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
Android Build Coastguard Worker
d570584ef1
Snap for 10877629 from a3108d5b14 to udc-qpr1-release
...
Change-Id: I6bcb3b4a5386e06b4e1351499479be5de139a05e
2023-09-28 23:19:19 +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
