PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
123,322 Commits 1 Branch 0 Tags
d1616c60a3154a78cb71a900b660a5a80ff8542d
Commit Graph

123322 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
d1616c60a3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 5a3df756ce -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I71574c31470b8f5312fe52e693b8934f521f5167
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 20:23:16 +00:00
Bill Yi
eaa92efd07 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cb9037e6fe -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8c1d5fe34bfef41a0daa73f6e47309a6f5059b7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 20:23:12 +00:00
Bill Yi
14442ba7c3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: d3e67b615d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I44f10407d8a56ff717235e968662b746a0c0499d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 20:23:06 +00:00
Bill Yi
9725cfd44b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2a5e445593 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8421ae19dab74712004d41c4c79820e2635ab625
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 20:22:53 +00:00
Bill Yi
34d81dca78 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8f8a434c4d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I22e79e5b39cf9105f8143577980f9f2a4132fb3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 20:22:33 +00:00
Bill Yi
5a3df756ce Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future 2023-08-31 18:57:38 +00:00
Bill Yi
d3e67b615d Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future 2023-08-31 18:57:38 +00:00
Bill Yi
cb9037e6fe Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6b427814df97ec7a9f3d1294408595c511b71e0f
 2023-08-30 19:42:30 -07:00
Bill Yi
2a5e445593 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2f272e914c7b2f0f5e428ceed87c3d66cf4e8fca
 2023-08-30 19:40:08 -07:00
Bill Yi
8f8a434c4d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1df59a39a32f1509838c51a08fd62430231e1f01
 2023-08-30 19:38:08 -07:00
Ram Peri
eb446ca146 Merge "Fix META-INF for settings library to match robolectric" into main am: cd34a5f6d6 am: cc1d59b3b9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2731384

Change-Id: I8a7e3f2a148ec25b5f0b358d5c609e0f551ed5b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-30 16:03:43 +00:00
Ram Peri
cc1d59b3b9 Merge "Fix META-INF for settings library to match robolectric" into main am: cd34a5f6d6 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2731384

Change-Id: Ie747b6771b59f48fbb82c416580e823a117d984b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-30 15:14:08 +00:00
Ram Peri
cd34a5f6d6 Merge "Fix META-INF for settings library to match robolectric" into main 2023-08-30 14:51:08 +00:00
Ram Peri
3c31a95f16 Fix META-INF for settings library to match robolectric 
Test: atest SettingsRoboTests:com.android.settings.biometrics.fingerprint2.fragment.FingerprintEnrollmentIntroFragmentTest
Bug: 294753198
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:88a9d3faa2b04cf508472e10489eb515cef65bdc)
Merged-In: I2711538ff9c2a18f3cad80e384d0281b119cb94a
Change-Id: I2711538ff9c2a18f3cad80e384d0281b119cb94a
 2023-08-30 02:05:44 +00:00
Anvesh Renikindi
89310a6e76 Merge "Remove ExperimentalLifecycleComposeApi" into udc-dev-plus-aosp 2023-08-29 17:33:50 +00:00
Chaohui Wang
f1febf9e9b 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)
 2023-08-29 17:25:34 +00:00
Treehugger Robot
4f9381ef09 Merge "Crash occurs when entering a Bluetooth broadcast password" into main am: 5bc143402c am: 6d9e295c3a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2667275

Change-Id: I2c8595f65e4e3e4c80c4bef1cbc8dad47f6122c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 08:59:21 +00:00
Treehugger Robot
6d9e295c3a Merge "Crash occurs when entering a Bluetooth broadcast password" into main am: 5bc143402c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2667275

Change-Id: I5a2b645fce8800da77ff886f8bc69a20efb34d88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 08:10:45 +00:00
Treehugger Robot
5bc143402c Merge "Crash occurs when entering a Bluetooth broadcast password" into main 2023-08-29 07:32:28 +00:00
Xin Li
f2df053926 [automerger skipped] Merge Android U (ab/10368041) am: 6b3d512b63 -s ours 
am skip reason: Merged-In I17a6c8a571b4a0b7d943dfd710cde0f18d03da39 with SHA-1 1485ceaf97 is already in history

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

Change-Id: I94d5dbd6699e067769156d162fd8bd725fa67cad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 23:59:23 +00:00
Xin Li
6b3d512b63 Merge Android U (ab/10368041) 
Bug: 291102124
Merged-In: I17a6c8a571b4a0b7d943dfd710cde0f18d03da39
Change-Id: I4ed5b2e4c6c59527bb544e8b6dff2b9d4cee9025
 2023-08-25 13:50:56 -07:00
Roshan Pius
8e02a78797 [automerger skipped] Merge "Implement DISALLOW_NFC AE user restriction" into main am: a3f6a70e9b am: e86e47178e -s ours 
am skip reason: Merged-In I8ef4b7a3630535bde9eedb4da78ae3fee8e13234 with SHA-1 f72a53a595 is already in history

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

Change-Id: I923ab7b877922c32b5a67e6318e048899677f6a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 19:49:55 +00:00
Roshan Pius
e86e47178e Merge "Implement DISALLOW_NFC AE user restriction" into main am: a3f6a70e9b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2716375

Change-Id: I0cd0d4bea29c9e82f75b266e6a9daf0b617b3f97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 19:06:15 +00:00
Roshan Pius
a3f6a70e9b Merge "Implement DISALLOW_NFC AE user restriction" into main 2023-08-25 18:06:28 +00:00
Roshan Pius
4e4877916d Implement DISALLOW_NFC AE user restriction 
Bug: 271452372
Test: Compiles
Merged-In: I8ef4b7a3630535bde9eedb4da78ae3fee8e13234
Change-Id: I8ef4b7a3630535bde9eedb4da78ae3fee8e13234
 2023-08-24 20:39:23 +00:00
Roshan Pius
f72a53a595 Implement DISALLOW_NFC AE user restriction 
Bug: 271452372
Test: Compiles
(cherry picked from https://android-review.googlesource.com/q/commit:07c1baaaf6ee683779b5215f91d25a0ad7e4b749)
Merged-In: I8ef4b7a3630535bde9eedb4da78ae3fee8e13234
Change-Id: I8ef4b7a3630535bde9eedb4da78ae3fee8e13234
 2023-08-23 18:36:40 +00:00
Anvesh Renikindi
19688da90e [automerger skipped] Merge "Change nullability of inheriting function of PinPrivacyPreferenceController" into main am: 1937711c8a am: e75ae19e0f -s ours 
am skip reason: Merged-In Idbfa244921957be2bba3cd02e5e873e81e8807d8 with SHA-1 05514d0f4d is already in history

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

Change-Id: I4a111c6475a2a01fe40dedacd0073ed074c455c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-22 16:54:55 +00:00
Anvesh Renikindi
e75ae19e0f Merge "Change nullability of inheriting function of PinPrivacyPreferenceController" into main am: 1937711c8a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2717673

Change-Id: I902d13988333ad9782e9882a6b939b2f195832ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-22 16:16:37 +00:00
Anvesh Renikindi
1937711c8a Merge "Change nullability of inheriting function of PinPrivacyPreferenceController" into main 2023-08-22 15:25:19 +00:00
Treehugger Robot
ced1f0f311 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44e242075a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idfc84ae81d74aa5a5a7358b720d1b7e00740cb12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-21 17:36:15 +00:00
Bill Yi
bb043fa69a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75987a1856 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I403572a913f7a7c5a985bc779a71f816fd47d157
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-21 17:36:10 +00:00
Treehugger Robot
44e242075a Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-08-21 16:43:37 +00:00
Bill Yi
75987a1856 Import translations. DO NOT MERGE ANYWHERE 
BUG:291684185

Auto-generated-cl: translation import
Change-Id: I74cde8ebf8214b314a89452e73b834eac7ae8b1e
 2023-08-18 12:17:43 -07:00
Andreas Miko
887c955a01 Change nullability of inheriting function of PinPrivacyPreferenceController 
Test: None
Bug: b/292569343
(cherry picked from commit a7d7eb9a16)
(cherry picked from commit 4ca80e6013)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:05514d0f4d5b6603da6a79881becb0b768e586a6)
Merged-In: Idbfa244921957be2bba3cd02e5e873e81e8807d8
Change-Id: Idbfa244921957be2bba3cd02e5e873e81e8807d8
 2023-08-18 16:22:17 +00:00
Anvesh Renikindi
942e44c0b8 Merge "Change nullability of inheriting function of PinPrivacyPreferenceController" into udc-dev-plus-aosp 2023-08-17 16:49:52 +00:00
Treehugger Robot
47f8568209 Merge "Use ArrayMap to cache active subscriptions" into main am: 29ee574493 am: 565161fb1a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2704973

Change-Id: Ic7d2922b78791b84fd7caaee33e91a2ea35acc48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 22:11:01 +00:00
Treehugger Robot
565161fb1a Merge "Use ArrayMap to cache active subscriptions" into main am: 29ee574493 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2704973

Change-Id: If3767eedff3437224ea7a3864bd48496f392f50d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 21:27:43 +00:00
Treehugger Robot
29ee574493 Merge "Use ArrayMap to cache active subscriptions" into main 2023-08-16 20:39:14 +00:00
Treehugger Robot
c3cd16d5b8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4585b13c9a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id1c88f7c13af19bc90c820557247edca68f09c9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 17:28:17 +00:00
Bill Yi
08e62ded38 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f67ff302c5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0e48c4206df34b472661b249063f243bf62a98f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 17:28:14 +00:00
Treehugger Robot
1b931db3c4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7de409b834 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I623269600f38f18cb354966ee0780a4e4cd11d1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 17:28:04 +00:00
Bill Yi
7046a1bc58 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 863f3e3a35 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3a207fb250e57fa20cb490003460e2f6984a67ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 17:27:58 +00:00
Bill Yi
dd6b25ed95 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 55c45ed419 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I25f6d8a8a8299b8fc9cf52e3babe1b682c6bc1d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 17:27:36 +00:00
Treehugger Robot
4585b13c9a Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-08-16 16:33:50 +00:00
Treehugger Robot
7de409b834 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-08-16 16:33:50 +00:00
Andreas Miko
05514d0f4d Change nullability of inheriting function of PinPrivacyPreferenceController 
Test: None
Bug: b/292569343
Change-Id: Idbfa244921957be2bba3cd02e5e873e81e8807d8
Merged-In: Idbfa244921957be2bba3cd02e5e873e81e8807d8
(cherry picked from commit a7d7eb9a16)
(cherry picked from commit 4ca80e6013)
 2023-08-16 15:45:00 +00:00
Bill Yi
863f3e3a35 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6a1b6861b7c389c2c52f63226366510a36ac4987
 2023-08-15 11:06:44 -07:00
Bill Yi
55c45ed419 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib12eb53f2344147d55bbd56093f1fa8a945bb1d6
 2023-08-15 11:02:18 -07:00
Bill Yi
f67ff302c5 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia7d1f3378e7ac754e78e12a4d7b71c67f0899fe1
 2023-08-15 10:59:35 -07:00
Colin Cross
753c96133a 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
Change-Id: I6aa0516fa4f6443b6d4dff873baf3b08ff9189f0
Merged-In: I6aa0516fa4f6443b6d4dff873baf3b08ff9189f0
 2023-08-14 12:29:53 -07:00