Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
127,819 Commits 1 Branch 0 Tags
092f6573abca98a871b7cd6dbd8d25dccbfb115d
Commit Graph

9225 Commits

Author SHA1 Message Date
Vania Januar
d9562be0d3 Merge "Disambiguate default notes app user from stylus settings" into udc-qpr-dev am: 2e8e1339a2 am: 0277f1676e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22990296

Change-Id: I9663363fdb87ecef957efd813a658759304dc681
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-17 17:05:35 +00:00
Julia Tuttle
77c21d9e45 Merge "Add FSI toggle to per-app notification settings" into udc-dev am: 28edfb8df9 am: a31916bd8f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22899254

Change-Id: I624e2cc82b796788869bef6a60efb441005bdc1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-17 16:33:28 +00:00
Vania Januar
2e8e1339a2 Merge "Disambiguate default notes app user from stylus settings" into udc-qpr-dev 2023-05-17 16:03:20 +00:00
Julia Tuttle
28edfb8df9 Merge "Add FSI toggle to per-app notification settings" into udc-dev 2023-05-17 14:48:50 +00:00
Julia Tuttle
6630c852d9 Add FSI toggle to per-app notification settings 
Bug: 277938609
Test: atest FullScreenIntentPermissionPreferenceControllerTest
Test: # manual, verifying against "Special app access" screen
Change-Id: I9cb0d9bc99ce59a7b0ff6bcd2cab7a3c2d63f45f
 2023-05-17 14:30:49 +00:00
Yanli Wan
e58159ced1 Merge "Start activity from Device Lock APEX if device is provisioned by Device Lock" into udc-dev am: f5ce620937 am: 5e8afefdf9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23087508

Change-Id: I25bc060b0ba38b5ac1f7ef4e0c9424188ab91419
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-17 00:37:28 +00:00
Yanli Wan
f5ce620937 Merge "Start activity from Device Lock APEX if device is provisioned by Device Lock" into udc-dev 2023-05-16 23:47:46 +00:00
Yanli Wan
ad151bf1e7 Start activity from Device Lock APEX if device is provisioned by Device 
Lock

Bug: 279616148
Test: atest DeviceLockPreferenceControllerTest
Test: Build & test locally
Change-Id: Ieb2ea691136749d034bceb9412744af874d6abb9
 2023-05-16 17:03:45 +00:00
Vania Januar
64d64fdd36 Disambiguate default notes app user from stylus settings 
Users can now select between work or personal notes app to be the app
that opens when the stylus tail button is pressed via a dialog.

Bug: 278555728
Test: StylusDevicesControllerTest
Change-Id: I9c63de6f11deb357b0497c7b972d4ac19b876e1f
 2023-05-16 15:57:09 +01:00
Treehugger Robot
bdbcd7329b Merge "Update char limit for i18n" into udc-dev am: 8545c1fab3 am: e35c115ee2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23258701

Change-Id: Iaf038c3afa896d74c2173fa12c4debd602d10122
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-16 14:08:34 +00:00
Treehugger Robot
8545c1fab3 Merge "Update char limit for i18n" into udc-dev 2023-05-16 13:09:04 +00:00
Edgar Wang
a7f03c5cec Update char limit for i18n 
Bug: 279609273
Test: rebuild
Change-Id: I9701898f178fbe704af82fdb070aed2e680f2285
 2023-05-16 20:02:04 +08:00
Allen Su
ae4ab15258 Merge "Implement LocaleNotification in Settings" 2023-05-16 03:28:30 +00:00
Allen Su
b77c13948d Implement LocaleNotification in Settings 
Bug: 248514263
Test: atest LocaleListEditorTest
Change-Id: I8c5764997d1622f0885d5d32124a49759e585e42
 2023-05-14 19:55:37 +00:00
Jason Hsu
4ecbb9c13c Merge "Move 'Audio Output' to Accessibility hearing device page" into udc-dev am: 181cfa3aa5 am: 3f6e93beea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157344

Change-Id: Ic1ce1c748c2ee749b4a73256a8d850df1232bb6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 15:06:05 +00:00
Jason Hsu
181cfa3aa5 Merge "Move 'Audio Output' to Accessibility hearing device page" into udc-dev 2023-05-12 14:20:23 +00:00
TreeHugger Robot
64bd7a0635 Merge "Update string for touch sounds" into udc-dev am: fd9ca0eae7 am: a102821490 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157337

Change-Id: I9c36ae60f55856c752ffad66898f4c59e034638f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 13:21:27 +00:00
Oli Thompson
d134502801 Merge "Update Work profile settings" into udc-dev am: 787a054c93 am: 6ea5106ae6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252125

Change-Id: Ia40eb7110721165bf4fdd25705ba68c22d48b32a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 12:17:54 +00:00
TreeHugger Robot
fd9ca0eae7 Merge "Update string for touch sounds" into udc-dev 2023-05-12 12:08:32 +00:00
Oli Thompson
787a054c93 Merge "Update Work profile settings" into udc-dev 2023-05-12 11:05:57 +00:00
jasonwshsu
212470d0a6 Move 'Audio Output' to Accessibility hearing device page 
* Extract the common part into HearingAidHelper.
* Remove abstract getHearingDevice(). Change to get the hearing device when needed.
* Move several classes from Bluetooth into Accessibility

Bug: 281783079
Test: make RunSettingsRoboTests ROBOTEST_FILTER="(HearingDeviceAudioRoutingBasePreferenceControllerTest|AccessibilityHearingAidPreferenceControllerTest|HearingAidHelperTest|HearingAidAudioRoutingPreferenceControllerTest|HearingDeviceCallRoutingPreferenceControllerTest)"
Change-Id: I79049107409b7086c6dcc8d48a6323e171ed1535
 2023-05-12 13:46:53 +08:00
Treehugger Robot
297fd154a2 Merge "Fix string" into udc-dev am: 81ac516705 am: 6dd1415360 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23175199

Change-Id: Ia5b0a4d82084445bc93f952358df36e98147235e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:17:15 +00:00
Treehugger Robot
81ac516705 Merge "Fix string" into udc-dev 2023-05-11 19:21:54 +00:00
Becca Hughes
f7c4d9c903 Fix string 
Test: make
Bug: 281047738
Change-Id: I7f65749cbdee95ab9447dc0b055d66fd962547dc
 2023-05-11 17:45:30 +00:00
Hao Dong
c753221adf Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." into udc-dev 2023-05-11 17:17:06 +00:00
Oli Thompson
08b4973f8e Update Work profile settings 
Change work apps toggle to a primary toggle
make Xprofile contact search toggle disable/enable when work profile is turned off
Add footer and change strings
Add tests

Test: atest ContactSearchPreferenceControllerTest, atest WorkModePreferenceControllerTest

Bug: 253009702 275538029
Change-Id: I3b2044a5fe3f2aff0748d66e701a3f0d7667ab7a
 2023-05-11 14:02:27 +00:00
Jason Hsu
763f430eba Merge "Update hearing aids to hearing devices" into udc-dev am: f7f38b2d66 am: 08b309dd75 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123003

Change-Id: I33cdfb6cfa411354110f4ca9a0d4635d212652d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 13:39:07 +00:00
Jason Hsu
f7f38b2d66 Merge "Update hearing aids to hearing devices" into udc-dev 2023-05-11 12:15:02 +00:00
Mill Chen
f321799f43 Update string for touch sounds 
Bug: 274081150
Test: visual verify
Change-Id: I953f108884cafc91e2a3a76bd1292ea30386d862
 2023-05-11 17:24:32 +08:00
jasonwshsu
7eeed19d28 Update hearing aids to hearing devices 
* We change the string 'hearing aids' to 'hearing devices', here are
  some left strings need to be updated.

Bug: 281782174
Test: flash rom and check UI
Change-Id: I0e3395c91d42b037158d135d1cbe519acac50aa0
 2023-05-11 16:41:54 +08:00
SongFerng Wang
b421dfeeac Merge "Update the wording for LE Audio" into udc-dev am: c487d5a10c am: 376ca216ad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23156659

Change-Id: I56e8b9e3330c1a933ed39f426b598791a560bb45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 08:21:03 +00:00
SongFerng Wang
c487d5a10c Merge "Update the wording for LE Audio" into udc-dev 2023-05-11 07:11:11 +00:00
SongFerngWang
f4c5c8ef5e Update the wording for LE Audio 
Add the summary for LE Audio toggle
Bug: 280000165
Test: build pass

Change-Id: Ic1eee71d6ff70d01e9a37ab0ec06cfaf639fe963
 2023-05-11 12:30:59 +08:00
Becca Hughes
8e9119f5ab Show disable dialog box when none is selected 
Also remove from CMPP since that will be
hidden.

Test: ondevice
Bug: 281147573
Merged-In: Ic2b59c42ed4ddbc83a770b8bb99c641d2f1a383d
Change-Id: Ic2b59c42ed4ddbc83a770b8bb99c641d2f1a383d
 2023-05-11 02:28:54 +00:00
Becca Hughes
9272c0e3c8 Show disable dialog box when none is selected 
Also remove from CMPP since that will be
hidden.

Test: ondevice
Bug: 281147573
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:16d3b54aaf802c66be439bf65c877cba60c4390d)
Merged-In: Ic2b59c42ed4ddbc83a770b8bb99c641d2f1a383d
Change-Id: Ic2b59c42ed4ddbc83a770b8bb99c641d2f1a383d
 2023-05-10 23:41:56 +00:00
Hao Dong
755a67a931 Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen. 
Bug: 279823572
Test: atest FingerprintSettingsFragmentTest
Test: atest ChooseLockGenericTest
Change-Id: Ie4bc18bf245eb7a755862401c710d85381063ff9
Merged-In: Ie4bc18bf245eb7a755862401c710d85381063ff9
 2023-05-10 23:26:02 +00:00
TreeHugger Robot
80190179ba Merge "Fix title of no-screen-lock notification" into udc-dev am: c0c0edd078 am: 1e7990341c am: ed35b5e376 am: 672ef42ab8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061496

Change-Id: I4934e755229741218d3b8979fc8318a2b412f168
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 21:28:05 +00:00
Jigar Thakkar
b6e12d7ff1 Merge "Modify clone profile accounts info section" into udc-dev am: 002f06e120 am: 854a93c2d3 am: 28449684ca am: 33f1f4c479 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22761582

Change-Id: I196a12897085e7dd54caf5dcc3110c9b4a8a922e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 20:46:31 +00:00
Marcello Galhardo
6255d37ad9 Merge "Move Note Shortcut from Settings to SystemUI" into udc-dev am: f5a3485300 am: d608996d1f am: d478fe535e am: af658f1ab4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048850

Change-Id: Iab8c01d073f10dbbb55ebead9b8a883f5a93065a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 18:57:21 +00:00
Bill Lin
4caa3ece94 [conflict] Merge "Refine SkipDialog title and desc by device configs" into udc-dev am: 4d5063ffdc am: f6d23468b1 am: e5dfcc0270 am: 547f6d63a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779802

Change-Id: I61fed7e932c8dc476b689ca61bbf8ee919924bed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 16:29:52 +00:00
TreeHugger Robot
c0c0edd078 Merge "Fix title of no-screen-lock notification" into udc-dev 2023-05-10 14:33:36 +00:00
Jigar Thakkar
002f06e120 Merge "Modify clone profile accounts info section" into udc-dev 2023-05-10 13:38:58 +00:00
Marcello Galhardo
f5a3485300 Merge "Move Note Shortcut from Settings to SystemUI" into udc-dev 2023-05-10 09:23:52 +00:00
Hao Dong
bb03fc355e Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." 2023-05-10 00:48:15 +00:00
Hao Dong
968c5fb6f0 Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen. 
Bug: 279823572
Test: atest FingerprintSettingsFragmentTest
Test: atest ChooseLockGenericTest
Change-Id: Ie4bc18bf245eb7a755862401c710d85381063ff9
 2023-05-09 21:32:44 +00:00
lbill
67d6dff7cc Refine SkipDialog title and desc by device configs 
1. Wrap isFaceSupportedInSUW() in Settings Utils
2. Wrap getCombinedScreenLockOptions in Settings Utils
3. Add EXTRA_KEY_FOR_SUW to judge if in SUW flow
4. Refactor SetupSkipDialog by hasFace, hasFingerprint,
   isSuw, isFaceSupported conditions
5. Clean up the mapping logic of SetupSkipDialog
6. Replace bools with @LockPatternUtils.CredentialType
7. Refine the logic for isFaceSupported
   ---------------------------------------
   Config |SuwSupportFace|!SuwSupportFace|
    isSuw |    true      |      false    |
   !isSuw |   hasFace    |     hasFace   |

Bug: 263070591
Bug: 279389803
Bug: 279195215
Test: adb shell am start -a android.settings.BIOMETRIC_ENROLL
Test: SUW(workprofile), post-SUW
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.password
Test: m RunSettingsRoboTests ROBOTEST_FILTER=SetupSkipDialogTest
Change-Id: Ie7af4299695dc3983b4190929b4dd659c301c082
 2023-05-09 09:55:52 +00:00
Derek Jedral
b3524b4223 Merge "Change preference title if Active Unlock enabled" into udc-dev am: 42deb763e0 am: 60419e72bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997141

Change-Id: I8201e20c39ef02beebb117731b7ed9dcc105bae9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 20:27:38 +00:00
Derek Jedral
42deb763e0 Merge "Change preference title if Active Unlock enabled" into udc-dev 2023-05-08 17:56:32 +00:00
Treehugger Robot
6da502033a Merge "Fix the battery string incorrect spelling" into udc-dev am: 23d3eda967 am: 2b6cf42130 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080181

Change-Id: I6d2fb3b56242c3f2e089093cbe3081e2ef0ac30a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 11:38:37 +00:00
ykhung
f31c8a477f Fix the battery string incorrect spelling 
Fix: 281473201
Test: presubmit
Change-Id: I9e4eb7f6c18918620a5e12680a30a5ba8bc7aa42
 2023-05-08 16:10:27 +08:00