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

126385 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
f3fa8b1d38 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-08-25 17:44:41 +00:00
Bill Yi
f2e8fd2543 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 77dc4de4b1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4deb1054cc3223739cb61bb45186de8798424731
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 14:42:01 +00:00
Bill Yi
f9b7cb0384 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b2ef719b18 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3896e8fd1c3c300c090366cf543f5057c55dc49c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 14:41:47 +00:00
Bill Yi
77dc4de4b1 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-08-25 13:37:23 +00:00
Roshan Pius
d6a7a97493 Implement DISALLOW_NFC AE user restriction am: f72a53a595 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24525697

Change-Id: Id14e0be72914fb8effc08cb17856d6efa0a750ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-24 20:51:58 +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
Joe Bolinger
cadc70a0db Merge "Fix talkback not announcing requirement in ChooseLock" into udc-d1-dev am: d27e383edf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24498831

Change-Id: Ie403cfa86823a7d53fab020cd1019cb9d83a2698
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-24 04:23:18 +00:00
Joe Bolinger
d27e383edf Merge "Fix talkback not announcing requirement in ChooseLock" into udc-d1-dev 2023-08-24 03:31:11 +00:00
Android Build Coastguard Worker
9bbd0af705 Merge cherrypicks of ['googleplex-android-review.googlesource.com/24309430', 'googleplex-android-review.googlesource.com/24529648'] into udc-release. 
Change-Id: I5ca1ee84007b029f80eb90fedbea7917b9d8bfb5
 2023-08-23 21:39:56 +00:00
Bill Yi
3926192b45 Import translations. DO NOT MERGE ANYWHERE 
BUG:291684185

Auto-generated-cl: translation import
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:75987a1856344623922cbcfefe6e314d7ca8d0f7)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:16f891cd2ac3fc444b5939fc5df406b149e0c418)
Merged-In: I74cde8ebf8214b314a89452e73b834eac7ae8b1e
Change-Id: I74cde8ebf8214b314a89452e73b834eac7ae8b1e
 2023-08-23 21:39:48 +00:00
Bill Yi
bf389dcc0e Import translations. DO NOT MERGE ANYWHERE 
BUG:291684185

Auto-generated-cl: translation import
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c52abcd3fa262f5a08797d4e411bb5d88b303246)
Merged-In: Ia444bb69cc499bd8d4a5ffc8c72babdda213c385
Change-Id: Ia444bb69cc499bd8d4a5ffc8c72babdda213c385
 2023-08-23 21:39:40 +00:00
Bill Yi
c30a22f6f3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I32f3283e81becc0c40560f0fc5010e8e7dcad4fe
 2023-08-23 12:18:29 -07:00
Bill Yi
f6aee0c18c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie4d4193588e9511880a77f93b7b2d2dce2ff2aef
 2023-08-23 12:15:10 -07:00
Bill Yi
b2ef719b18 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id04bc7656fbc7ed4c2e3fac691c05f910617247e
 2023-08-23 12:11:44 -07: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
9517e0e202 [automerger skipped] Merge "Change nullability of inheriting function of PinPrivacyPreferenceController" into main am: 1937711c8a am: e75ae19e0f -s ours am: 19688da90e -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: I3602f95128bce1e01ab19e4b47e01687d7c8ac71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-22 17:31:22 +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
Android Build Coastguard Worker
5736662311 Merge cherrypicks of ['googleplex-android-review.googlesource.com/23982512', 'googleplex-android-review.googlesource.com/24299128'] into udc-release. 
Change-Id: I3c6aafd715a5d10760166537ca5235c925008589
 2023-08-22 02:19:50 +00:00
Eric Biggers
fc5e4e4576 RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() 
When LockPatternUtils#setLockCredential() fails, it can either return
false or throw an exception.  Catch the exception and treat it the same
way as a false return value, to prevent crashing com.android.settings.

Bug: 253043065
Test: Tried setting lockscreen credential while in secure FRP mode using
      smartlock setup activity launched by intent via adb.  Verified
      that com.android.settings no longer crashes due to the exception
      from LockPatternUtils#setLockCredential().
(cherry picked from commit 05f1eff1c9)
(moved change into ChooseLockPassword.java and ChooseLockPattern.java,
 which are merged into SaveAndFinishWorker.java on udc-qpr-dev and main)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8f3ca8daeb583b8d46ad0d1045c2b953b83f5903)
Merged-In: I48b9119c19fb6378b1f88d36433ee4f4c8501d76
Change-Id: I48b9119c19fb6378b1f88d36433ee4f4c8501d76
 2023-08-22 02:15:27 +00:00
Weng Su
b4e4facff4 Restrict ApnEditor settings 
- Finish ApnEditor settings if user is not an admin

- Finish ApnEditor settings if user has DISALLOW_CONFIG_MOBILE_NETWORKS restriction

Bug: 279902472
Test: manual test
atest -c ApnEditorTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4e18e7414c674a1c5bc69961c03499849b4aefd2)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5a17d39db7af7cea46763bfcdb50380bf0da92e3)
Merged-In: Iecdbbff7e21dfb11e3ba385858747a220cfd3e04
Change-Id: Iecdbbff7e21dfb11e3ba385858747a220cfd3e04
 2023-08-22 02:15:17 +00:00
Austin Delgado
a73cee24d4 Fix talkback not announcing requirement in ChooseLock 
Fix: 281955512
Test: Manual, verify talkback reads out password requirement on 17th digit
Change-Id: Ia274af9cc515d3ac9d344bd41d008ab5b4dbcabd
Merged-In: Ia274af9cc515d3ac9d344bd41d008ab5b4dbcabd
 2023-08-21 20:35:39 +00:00
Treehugger Robot
c1a9f3b899 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44e242075a -s ours am: 113ac8d105 -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: Icec8d0e0f417da0f480689e328c5ea89718217c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-21 18:50:09 +00:00
Bill Yi
9627696277 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75987a1856 -s ours am: 99073e56cc -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: Iec3486257c3b84741f2260925d86e6dfd338e4b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-21 18:50:05 +00:00
Treehugger Robot
4b343ece13 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44e242075a -s ours am: ced1f0f311 -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: Ic3d6b7af6a753a5c1317fb06fe13ca91987be35f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-21 18:18:54 +00:00
Bill Yi
c259f9189b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75987a1856 -s ours am: bb043fa69a -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: I28caee0961f5593b64b79ac68572c3ba7e8b16ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-21 18:18:52 +00:00
Treehugger Robot
113ac8d105 [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: I5180ce7f5bd3564f9e80ce4ef51259526e7f94a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-21 17:38:29 +00:00
Bill Yi
99073e56cc [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: Iaff959abd8c1eadac9f5a570202fb5eee0895ebc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-21 17:38:26 +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
Bharath
7fe45b31db Add support to configure double line clock in lockscreen [2/2] 
This keeps the Settings entry under Lockscreen Settings for
Double line clock to be configurable.

As a result, this is now consistent with previous Android versions.

Co-authored-by: Luca Weiss <luca.weiss@fairphone.com>
Bug: 277244307
Test: atest SettingsRoboTests:com.android.settings.display.LockscreenClockPreferenceControllerTest
Change-Id: I08121a1a658cb4045aa30d0bd93e18ca22c3db6d
 2023-08-18 09:57:44 +05:30
Anvesh Renikindi
5a6d7745d0 Merge "Change nullability of inheriting function of PinPrivacyPreferenceController" into udc-dev-plus-aosp am: 942e44c0b8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24446787

Change-Id: If307c1d7545d2528aa271a98fc8f236b0d5570bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 17:14:29 +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
fc02a337f8 Merge "Use ArrayMap to cache active subscriptions" into main am: 29ee574493 am: 565161fb1a am: 47f8568209 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2704973

Change-Id: I32983b0b8ef21c1630b475ec02bd65c8166699b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 22:56:33 +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
bc55c69e9c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4585b13c9a -s ours am: 62c6c859fb -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: I80e30780102be03e22ba2057551f6799b6811d1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 18:38:08 +00:00
Bill Yi
3f1da62e96 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f67ff302c5 -s ours am: 1b8cdb3c54 -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: I76d858a43a4ee8bb6c6d1cdedb35a5fdf7ce9818
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 18:38:04 +00:00
Treehugger Robot
cd8a489f80 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7de409b834 -s ours am: b04d88f081 -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: I9c99032187d7b58cc41508ac156e65a9a3ab2fc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 18:37:56 +00:00
Bill Yi
34a88d2b41 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 863f3e3a35 -s ours am: f7a1f6301c -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: Ic61fc2fa352df457d634a7eacc97bd0f1f93dc6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 18:37:46 +00:00
Bill Yi
f249e4a70a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 55c45ed419 -s ours am: 0d737ffce4 -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: I8fc4ebd8190d209e35ff4d8550299abbe44970f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 18:37:29 +00:00
Treehugger Robot
f53e0c2d9a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 42e15a0ff5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idd0c5b55e179638071765298ba9a01def42c1438
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 18:34:46 +00:00
Bill Yi
cc1b89c2a8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 33cf2a3dd6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8ea46a8291def07a7767726cb48b17336f7dda1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 18:34:42 +00:00
Treehugger Robot
0ed7579d93 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: eb5aef41ff -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifd50b7d797bd76170b82df0c2bd5e71341123539
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 18:34:35 +00:00
Bill Yi
adec329708 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c382e6941 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I847dff977039ec6c5da2b8cf47f5eeef3eccbf55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 18:34:17 +00:00