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

123380 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Peiyong Lin
a62d014687 [Cherry-pick] Add debug property to safe guard ANGLE developer option UI. am: 3182b0e298 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2794055

Change-Id: Ib6b009eeead559c0299d4f76dd927c5a5fc87d20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-18 20:39:19 +00:00
Peiyong Lin
3c924fd848 [Cherry-pick] Add warning on enabling ANGLE. am: d3c75bd9eb 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2794036

Change-Id: I8a93c58cf80f113277fc269e42c02e52e9d702c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-18 20:39:15 +00:00
Peiyong Lin
3182b0e298 [Cherry-pick] Add debug property to safe guard ANGLE developer option UI. 
Add a debug property to guard ANGLE developer option UI, only when the
debug property is enabled will ANGLE developer option UI be enabled.

Add further clarification in the text to indicate that this is an
experimental feature.

Bug: b/287909344
Test: atest -c GraphicsDriverEnableAngleAsSystemDriverControllerJUnitTest
Test: atest -c GraphicsDriverEnableAngleAsSystemDriverControllerTest
Change-Id: Ife31f4b0426f3ce107f86cfbaf3f1aeca567e250
Merged-In: Ife31f4b0426f3ce107f86cfbaf3f1aeca567e250
 2023-10-17 21:06:05 +00:00
Peiyong Lin
d3c75bd9eb [Cherry-pick] Add warning on enabling ANGLE. 
Enabling ANGLE on incompatible devices may cause some applications to
crash, add a warning.

Bug: b/287909344
Test: atest SettingsRoboTests:GraphicsDriverEnableAngleAsSystemDriverControllerTest
Change-Id: I4f856ee1912a59052a6aaf7dff087ce1b649935e
Merged-In: I4f856ee1912a59052a6aaf7dff087ce1b649935e
 2023-10-17 21:02:47 +00:00
Treehugger Robot
72943317d2 Merge "AirplaneModePreferenceController: Fix NPE when toggle is hidden" into main am: 3eea9e53a1 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2767862

Change-Id: Id9c81a0d31b4a0452d614b68b6850342a94ab3aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-16 02:37:41 +00:00
Treehugger Robot
3eea9e53a1 Merge "AirplaneModePreferenceController: Fix NPE when toggle is hidden" into main 2023-10-16 01:52:44 +00:00
Treehugger Robot
b06310a63f Merge "Clean up obsolete aliases for Truth." into main am: 4b0bf8f98d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776829

Change-Id: Id02586892e1b22d8450098323183c1ad33ca8574
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-12 00:38:18 +00:00
Treehugger Robot
4b0bf8f98d Merge "Clean up obsolete aliases for Truth." into main 2023-10-11 23:59:17 +00:00
Krzysztof Kosiński
665b151f87 Clean up obsolete aliases for Truth. 
Bug: 255714762
Test: presubmit
Change-Id: I8aab463c74d5e869d949a2b712886a9cc4d15709
Merged-In: I8aab463c74d5e869d949a2b712886a9cc4d15709
 2023-10-11 23:10:01 +00:00
Eric Biggers
12c1013250 Merge "ShadowLockPatternUtils: remove patternEverChosen methods" into main am: b862d378bd 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776713

Change-Id: Ib504b453a8caac0789084affcaa70a33e8b554d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-10 20:11:52 +00:00
Eric Biggers
b862d378bd Merge "ShadowLockPatternUtils: remove patternEverChosen methods" into main 2023-10-10 19:43:59 +00:00
Eric Biggers
335752ed98 Merge "ChooseLockPassword: convert to use PasswordMetrics#validateCredential()" into main am: 00f5d9e7a6 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776714

Change-Id: I86824875e218614c30e5150e21f4b63107438ebd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-09 20:50:35 +00:00
Eric Biggers
00f5d9e7a6 Merge "ChooseLockPassword: convert to use PasswordMetrics#validateCredential()" into main 2023-10-09 19:10:53 +00:00
Eric Biggers
3a11c3b0de ShadowLockPatternUtils: remove patternEverChosen methods 
These methods are being removed from LockPatternUtils because they are
no longer used, so remove them from ShadowLockPatternUtils too.

Bug: 270013005
Change-Id: If196bbef4755c644b3188043ed47e99817bf1856
Merged-In: If196bbef4755c644b3188043ed47e99817bf1856
(cherry picked from commit 795a02c92a)
 2023-10-06 17:16:55 +00:00
Eric Biggers
b2ea672670 ChooseLockPassword: convert to use PasswordMetrics#validateCredential() 
Fix the check for invalid characters in new passwords by switching from
PasswordMetrics#validatePassword() to
PasswordMetrics#validateCredential().  For more information, see
frameworks/base change I5c3c55367c3a294578cd0f97ac0e315a11ed517e.

Bug: 219511761
Bug: 232900169
Bug: 243881358
Test: Verified no regressions in 'atest ChooseLockPasswordTest'.  Note,
      this test is currently @Ignored and has 2 failures.  I didn't
      attempt to address that.
Test: Set a password containing non-ASCII characters on a device running
      an older build.  Upgraded and verified unlocking still works.
      Tested that setting a new non-ASCII password is not allowed.
Change-Id: I5f1822a34688473cb103eb64dca56e4c19d4dd08
Merged-In: I5f1822a34688473cb103eb64dca56e4c19d4dd08
(cherry picked from commit b547094366)
 2023-10-06 17:16:55 +00:00
Xin Li
1773ab5b6f [automerger skipped] Merge "Merge Android 14" into main am: dc85f402d5 -s ours 
am skip reason: Merged-In I8798f723bc821241d70fc8e5cb2c6ae59d7115af with SHA-1 5d8fea06b1 is already in history

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

Change-Id: I318da99fd71bf1b74558f52ca14187e0a2a26f74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 07:57:45 +00:00
Xin Li
1a19621d28 [automerger skipped] Merge Android 14 am: 25d4f12096 -s ours 
am skip reason: Merged-In I8798f723bc821241d70fc8e5cb2c6ae59d7115af with SHA-1 5d8fea06b1 is already in history

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

Change-Id: I9cb69e26793a7c339bb4e2cf2bc7ade9c7b3ef8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 07:52:15 +00:00
Xin Li
dc85f402d5 Merge "Merge Android 14" into main 2023-10-06 05:38:55 +00:00
Xin Li
25d4f12096 Merge Android 14 
Bug: 298295554
Merged-In: I8798f723bc821241d70fc8e5cb2c6ae59d7115af
Change-Id: Ied712061a1cecebbb312b9fe1197560205f6963c
 2023-10-05 15:41:49 -07:00
Matt Pietal
705507d68f Merge "Add support to configure double line clock in lockscreen [2/2]" into main am: 3be411d513 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2539870

Change-Id: Ia1bfae20044369b8a8e463e21a2393cf9b6e9250
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 14:54:22 +00:00
Matt Pietal
3be411d513 Merge "Add support to configure double line clock in lockscreen [2/2]" into main 2023-10-04 14:25:38 +00: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
Xin Li
f0ba9c8b60 Merge UP1A.231005.007 
Bug: 291102124
Merged-In: I74cde8ebf8214b314a89452e73b834eac7ae8b1e
Change-Id: If0cc9b99ea3e0e6d908d8c1ed476232d3056cb5d
 2023-09-27 16:05:12 -07:00
Anvesh Renikindi
7bed4aade8 Merge "Remove ExperimentalLifecycleComposeApi" into aosp-main-future 2023-09-13 16:29:32 +00:00
Colin Cross
f87c5f2cfc Merge "Fix kotlin nullable errors in Settings" into aosp-main-future 2023-09-12 18:36:47 +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
458e8cc311 Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future 2023-09-07 23:43:06 +00:00
Bill Yi
3d0a8354b3 Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future 2023-09-07 23:43:06 +00:00
Bill Yi
0aee5a3e64 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I07e5e02d38b78617cbe7f8a23053d0c15aedd692
 2023-09-07 04:18:01 -07:00
Bill Yi
0071351cfc Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I79f55f0afe719e019225ea96a442a066ab33e4f3
 2023-09-07 04:15:45 -07:00
Bill Yi
219f3c68fa Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I18aa01b928c2e48302ed95acf15cdeec11c1c3e5
 2023-09-07 04:13:48 -07:00
Xin Li
770a4e1f11 Merge "Merge UP1A.230905.019" into aosp-main-future 2023-09-05 18:35:36 +00:00
Treehugger Robot
9c21429af4 Merge "Limit bluetooth broadcast password to single byte characters" into main am: abe501085b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2728234

Change-Id: Idca058c3f3d2de4324d51c9bfd0225cd44c2dbf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-04 13:15:08 +00:00
Treehugger Robot
abe501085b Merge "Limit bluetooth broadcast password to single byte characters" into main 2023-09-04 12:18:09 +00:00
Jin Dong
a1ae2b1e93 Limit bluetooth broadcast password to single byte characters 
The bluetooth broadcast password is supposed to be single byte
characters, so crash hanppened when input too many double-byte
characters when connecting to other broadcast.
Limit the password to single byte characters to fix this issue.

Bug: 297840479
Test: Manual
Change-Id: Ifab89ee9a07f20d1f30aba17bed694b5a5da8480
 2023-09-04 08:14:10 +00:00
Xin Li
f8a0c0323f Merge UP1A.230905.019 
Merged-In: Ifc048311746c027e3683cdcf65f1079d04cf7c56
Change-Id: I2a988e3da0958f31323f95588e1ac66482186ecf
 2023-08-31 12:31:10 -07: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
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
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