PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
126,297 Commits 1 Branch 0 Tags
837abf9244aef27d6695d7f7cffb48cd134e9da5
Commit Graph

126297 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
837abf9244 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 61f7c7c880 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24745007

Change-Id: Iab26b453ac39924af98b45108272d6e7954789a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-15 02:16:03 +00:00
Bill Yi
c66c9a3b8e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3cedcebd1e -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24745007

Change-Id: I565e9ffdd96de2239fc863acc204cbf2b8b82dd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-15 02:15:47 +00:00
Bill Yi
1c98d2236a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 6d1533eec9 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744005

Change-Id: I32a2e2fa4e19f682fe4260b5dd26ce39dcb8bf84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-15 02:15:31 +00:00
Bill Yi
1840690d24 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f75591fa73 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744005

Change-Id: I615e552bbb37ead26fd91021e6a25f556355de02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-15 02:15:17 +00:00
Bill Yi
61f7c7c880 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-09-15 01:34:33 +00:00
Bill Yi
6d1533eec9 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-09-15 01:34:33 +00:00
Bill Yi
49e318ce55 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 880a595859 -s ours am: 1f8443d6d2 -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: I71950de434f3e8af54f2d2221a38b3418cae25b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-15 00:23:21 +00:00
Bill Yi
3cf873896e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8d26a94857 -s ours am: 250f3c8c9b -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: Iedddcd51dee7f8cac11241d71385fd90a6cd7196
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-15 00:23:17 +00:00
Bill Yi
465cf9500b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: eaa3838179 -s ours am: 44adc2b02a -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: Ibf5428fdb752b9cdaaebf326a10c7993b8e1b2b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-15 00:23:12 +00:00
Bill Yi
779bd81952 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5753866bb -s ours am: 1605dfab0b -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: Id85817fee917109f8fe6b2b0b839889404347e0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-15 00:22:56 +00:00
Bill Yi
cc92c9228e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 883a2b633e -s ours am: 02cdab0a91 -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: I58024eeab57c1c647b28d81e138be9b0fc9a2b98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-15 00:22:40 +00:00
Bill Yi
2e4673500f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 880a595859 -s ours am: cca1e959ee -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: I23cd04d07b0e762ad09a0120c7d38bbd01e7baa2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-14 23:36:10 +00:00
Bill Yi
df9839f6d9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8d26a94857 -s ours am: 4e2f191fe5 -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: I2ca8072521f3d6d4a2d63d7291fd34834f6ea80e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-14 23:36:07 +00:00
Bill Yi
8f1383cba3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: eaa3838179 -s ours am: 64677e15d9 -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: I4bdd0d4530076ede0c28e4677a19bb0ee037f230
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-14 23:36:04 +00:00
Bill Yi
28743336b7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5753866bb -s ours am: ebedb167fc -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: I713e7bf989f8d69d7c30b525cb646a51c54d3976
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-14 23:35:54 +00:00
Bill Yi
8c3f41b3f7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 883a2b633e -s ours am: b1e0ae99ce -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: I0a17d2096360a573d9a044e4ee73e2985bf0f163
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-14 23:35:40 +00:00
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
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