Bill Yi
1f8443d6d2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 880a595859
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744951
Change-Id: I2525b6d2474a436572a0b2d135707a5669856661
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 23:31:18 +00:00
Bill Yi
250f3c8c9b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8d26a94857
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744951
Change-Id: Ie1471a20c8d9ff3eda6469b71364059a2933b38d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 23:31:13 +00:00
Bill Yi
44adc2b02a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: eaa3838179
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744950
Change-Id: I73375276dd12e0b36f5cd7a26f958463d0893f3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 23:31:09 +00:00
Bill Yi
1605dfab0b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5753866bb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744950
Change-Id: Id3cece510886a8139e78f9c3b61247922bd59ca0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 23:30:57 +00:00
Bill Yi
02cdab0a91
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 883a2b633e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744004
Change-Id: I26b465cbee66b582976f57f7374d4c953d409648
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 23:30:44 +00:00
Bill Yi
cca1e959ee
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 880a595859
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744951
Change-Id: If995c1c1d9eb8d5023e42ea8996fa6fdc324f8ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 23:22:23 +00:00
Bill Yi
4e2f191fe5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8d26a94857
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744951
Change-Id: I24d9904d6fef76ba1efe2360858b05f2e3d8dfd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 23:22:19 +00:00
Bill Yi
64677e15d9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: eaa3838179
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744950
Change-Id: Ic39f291d6dd9e58de865f710a5d7cf3a61cbb7c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 23:22:15 +00:00
Bill Yi
ebedb167fc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5753866bb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744950
Change-Id: I348161b5db4874cb2e47bdc560351db4d73ea36d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 23:22:03 +00:00
Bill Yi
b1e0ae99ce
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 883a2b633e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744004
Change-Id: I896f371b555159556a070588bbdc504a10976fc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 23:21:49 +00:00
Bill Yi
880a595859
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-09-14 22:44:17 +00:00
Bill Yi
eaa3838179
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-09-14 22:44:17 +00:00
Anvesh Renikindi
a5a031f98b
[automerger skipped] Merge "Remove ExperimentalLifecycleComposeApi" into aosp-main-future am: 7bed4aade8
-s ours am: d783537f9f
-s ours
...
am skip reason: Merged-In I8798f723bc821241d70fc8e5cb2c6ae59d7115af with SHA-1 f1febf9e9b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24732669
Change-Id: I12e36af194476868389e84fa9a07333652eb7d16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-13 18:04:37 +00:00
Chaohui Wang
bc7f3e566d
[automerger skipped] Remove ExperimentalLifecycleComposeApi am: 5d8fea06b1
-s ours am: 55a2fe7bd2
-s ours
...
am skip reason: Merged-In I8798f723bc821241d70fc8e5cb2c6ae59d7115af with SHA-1 f1febf9e9b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24732669
Change-Id: I52060122d94ed44a42d52ee4ed04eea1204acc1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-13 18:04:30 +00:00
Anvesh Renikindi
d783537f9f
[automerger skipped] Merge "Remove ExperimentalLifecycleComposeApi" into aosp-main-future am: 7bed4aade8
-s ours
...
am skip reason: Merged-In I8798f723bc821241d70fc8e5cb2c6ae59d7115af with SHA-1 f1febf9e9b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24732669
Change-Id: Ie235b1f2607bed1091844eec8dbff696b2b38807
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-13 17:16:30 +00:00
Chaohui Wang
55a2fe7bd2
[automerger skipped] Remove ExperimentalLifecycleComposeApi am: 5d8fea06b1
-s ours
...
am skip reason: Merged-In I8798f723bc821241d70fc8e5cb2c6ae59d7115af with SHA-1 f1febf9e9b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24732669
Change-Id: I9fd1502569bbd84665220325471551b9661a6a43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-13 17:16:23 +00:00
Anvesh Renikindi
7bed4aade8
Merge "Remove ExperimentalLifecycleComposeApi" into aosp-main-future
2023-09-13 16:29:32 +00:00
Bill Yi
3a0fbff331
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic599e0023783587dfd9156db04d6dfc356b8a383
2023-09-13 03:59:01 -07:00
Bill Yi
8d26a94857
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8636c4e0eea8d1117e619c89be47fd1a4d306ed1
2023-09-13 03:58:12 -07:00
Bill Yi
3cedcebd1e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I038a4b2bbe0865323f92a6dd6f3403931c19f387
2023-09-13 03:53:57 -07:00
Bill Yi
f5753866bb
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2329e79de417f12e41ce0038bdddf2b2146b53cf
2023-09-13 03:52:22 -07:00
Bill Yi
f75591fa73
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I49d3e0cd1a1823b7dc4f0030622c3a9e4482983c
2023-09-13 03:50:11 -07:00
Bill Yi
883a2b633e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I40cee892bda141e4c3da8f593418408a9c94445e
2023-09-13 03:49:23 -07:00
Colin Cross
b66a576c96
[automerger skipped] Merge "Fix kotlin nullable errors in Settings" into aosp-main-future am: f87c5f2cfc
-s ours am: 7076317476
-s ours
...
am skip reason: Merged-In I6aa0516fa4f6443b6d4dff873baf3b08ff9189f0 with SHA-1 753c96133a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24724914
Change-Id: If4e4528144c582186b92ad5c75a71175f7d6edd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-12 20:27:08 +00:00
Colin Cross
3f8c8ba9d8
[automerger skipped] Fix kotlin nullable errors in Settings am: ee87a406cd
-s ours am: b50a062c94
-s ours
...
am skip reason: Merged-In I6aa0516fa4f6443b6d4dff873baf3b08ff9189f0 with SHA-1 753c96133a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24724914
Change-Id: I4bc4adb35e15b172dd7e27b74eabb9c27006f23c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-12 20:26:53 +00:00
Colin Cross
7076317476
[automerger skipped] Merge "Fix kotlin nullable errors in Settings" into aosp-main-future am: f87c5f2cfc
-s ours
...
am skip reason: Merged-In I6aa0516fa4f6443b6d4dff873baf3b08ff9189f0 with SHA-1 753c96133a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24724914
Change-Id: I9591d9d58c2a862c21c6f2dff6cb3ced1c3a7fc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-12 19:41:29 +00:00
Colin Cross
b50a062c94
[automerger skipped] Fix kotlin nullable errors in Settings am: ee87a406cd
-s ours
...
am skip reason: Merged-In I6aa0516fa4f6443b6d4dff873baf3b08ff9189f0 with SHA-1 753c96133a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24724914
Change-Id: I60ccd1753ff043480a12c9e876a4241a73729c70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-12 19:41:14 +00:00
Colin Cross
f87c5f2cfc
Merge "Fix kotlin nullable errors in Settings" into aosp-main-future
2023-09-12 18:36:47 +00:00
Yuanru Qian
22a947a156
Merge "Update owner list for packages/apps/Settings/src/com/android/settings/bluetooth/OWNERS and packages/apps/Settings/src/com/android/settings/connecteddevice/OWNERS" into main am: 9ace1904c3
am: 81343f23fc
am: 945b20c70d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2745297
Change-Id: I0710a54b97a9b230c8802326687d76be7d7a51f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-12 17:04:28 +00:00
Yuanru Qian
945b20c70d
Merge "Update owner list for packages/apps/Settings/src/com/android/settings/bluetooth/OWNERS and packages/apps/Settings/src/com/android/settings/connecteddevice/OWNERS" into main am: 9ace1904c3
am: 81343f23fc
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2745297
Change-Id: If6e8d7182b4c6feaca4da62052442f46f930b227
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-12 16:14:39 +00:00
Chaohui Wang
5d8fea06b1
Remove ExperimentalLifecycleComposeApi
...
Fix: 276310170
Bug: 271609607
Test: m Settings
Change-Id: I8798f723bc821241d70fc8e5cb2c6ae59d7115af
Merged-In: I8798f723bc821241d70fc8e5cb2c6ae59d7115af
(cherry picked from commit 8d220f0641
)
(cherry picked from commit 2910d68343
)
(cherry picked from commit f1febf9e9b
)
2023-09-12 15:30:57 +00:00
Yuanru Qian
81343f23fc
Merge "Update owner list for packages/apps/Settings/src/com/android/settings/bluetooth/OWNERS and packages/apps/Settings/src/com/android/settings/connecteddevice/OWNERS" into main am: 9ace1904c3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2745297
Change-Id: I366f3dddb68df63b2ae251e71610c4d1e33ceefe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-12 15:21:52 +00:00
Yuanru Qian
9ace1904c3
Merge "Update owner list for packages/apps/Settings/src/com/android/settings/bluetooth/OWNERS and packages/apps/Settings/src/com/android/settings/connecteddevice/OWNERS" into main
2023-09-12 14:37:23 +00:00
Yuanru Qian
8ffc3c728d
Update owner list for packages/apps/Settings/src/com/android/settings/bluetooth/OWNERS and packages/apps/Settings/src/com/android/settings/connecteddevice/OWNERS
...
Change-Id: I29c44aec3a9065dd9e0c207faaea55da6ad21471
2023-09-12 07:39:43 +00:00
Colin Cross
ee87a406cd
Fix kotlin nullable errors in Settings
...
Fix kotlin nullable errors that were exposed by setting the retention
of android.annotation.NonNull and android.annotation.Nullable to
class retention.
Bug: 294110802
Test: builds
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:753c96133a1aa9e7b6dd63fa36816d171fec0f22 )
Merged-In: I6aa0516fa4f6443b6d4dff873baf3b08ff9189f0
Change-Id: I6aa0516fa4f6443b6d4dff873baf3b08ff9189f0
2023-09-11 22:30:58 +00:00
Bill Yi
aff2aa2b9b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 9d8a174cfb
-s ours am: 0e9f6de1c9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24686864
Change-Id: Iab3f82e8d46af061a634905e0588cc8941142b28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 19:03:03 +00:00
Bill Yi
12772adb2f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 218dd7dcbd
-s ours am: cd4f7108da
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24686864
Change-Id: Ic0a1b3f7c8e40d0fef29b6d987450cbcb1948126
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 19:02:47 +00:00
Bill Yi
d0bbda68e2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bea9c6fffa
-s ours am: 3d3c8da953
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24686020
Change-Id: I14c22ed25d20942c7bad7b17698382897a9be8a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 19:02:31 +00:00
Bill Yi
0e9f6de1c9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 9d8a174cfb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24686864
Change-Id: I175aa78e54ac3ae4158935874e045599924cf177
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 18:08:15 +00:00
Bill Yi
cd4f7108da
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 218dd7dcbd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24686864
Change-Id: Id6b1546c56013193d4a2d5e6bb8de360515a2c15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 18:07:59 +00:00
Bill Yi
3d3c8da953
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bea9c6fffa
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24686020
Change-Id: I79f6fb27a5e08c465a25e66bb3e8ee4fd71608b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 18:07:45 +00:00
Bill Yi
7ef30234c5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 9d8a174cfb
-s ours am: 74efc70012
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24686864
Change-Id: I6af7c56deabc1a38f50b14f034ce4d796b151e37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 17:44:37 +00:00
Bill Yi
4a3e643a4e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 218dd7dcbd
-s ours am: 26761dda7f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24686864
Change-Id: I3ec14be8fba98b124610824dcf791999a9f68b31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 17:44:24 +00:00
Bill Yi
d7897a49f4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bea9c6fffa
-s ours am: a60c6f5165
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24686020
Change-Id: I2a2731e45a1b509ff02239ac9fb2c7b25dc4ad3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 17:44:09 +00:00
Bill Yi
70a9891a63
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: fc870f9cfd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24686019
Change-Id: I469aa5e2d8ce1e52b9cb6794116c503d41bf470b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 17:37:54 +00:00
Bill Yi
3144cb8a81
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1246d3046b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24686019
Change-Id: I4c3e13dc09286a5be67a6b556cb7edc98335df29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 17:37:37 +00:00
Bill Yi
a00e73b28f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3152898c4a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24684077
Change-Id: Idaf3f389ee6e746e2bb195bbd3166bf9c6909ae5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 17:37:20 +00:00
Bill Yi
74efc70012
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 9d8a174cfb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24686864
Change-Id: Ia2b0e4dbd0496521a96f53c8fae1fe7a2c1042cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 17:24:53 +00:00
Bill Yi
26761dda7f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 218dd7dcbd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24686864
Change-Id: Ia6e4a225e38fcb3dbc783e16731268eefe2ed074
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 17:24:35 +00:00
Bill Yi
a60c6f5165
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bea9c6fffa
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24686020
Change-Id: I794caf0136c807622ed7e644a3d70338e6b84074
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-08 17:24:19 +00:00