PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
130,260 Commits 1 Branch 0 Tags
aadecbaf34e88405848cab093fdadf018b246f5d
Commit Graph

19665 Commits

Author SHA1 Message Date
Peter Zhang
ddb65e569b Expand SettingsLib ProviderTile to support non-switch type of Preferences 
- Added new metadata allowing to set PendingIntent onto a Tile, which will be executed on click;
- Update the rendering logic to render with SwitchPreference only when Tile.hasSwitch() == true.

Test: robotest, manual
Bug: 281517110
Change-Id: I1253029be1e172792679f80be24bd58e368b9e73
 2023-05-09 19:32:26 +02:00
Derek Jedral
9c67ee1eb1 Merge "Remove feature flag for active unlock" into udc-dev 2023-05-09 17:17:11 +00:00
Angela Wang
53a8cc0326 Disabled state UI of Flash Notifications preview button 
When both the camera flash and screen flash toggles are turned off, tapping on the preview button will have no effect and may confuse users. To avoid this, the appearance of the preview button should be updated to clearly indicated that its current state is disabled. This wil help users better understand the situation and prevent confusion.

Bug: 276494146
Test: checks the UI manually
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FlashNotificationsPreviewPreferenceTest
Change-Id: I55b11188fde6e551921a9b0f7c89daa20a8b766b
 2023-05-09 16:48:35 +00:00
Vincent Wang
7f21ad81f7 Merge "Test Fix SettingRobolectricTest Fail" into udc-dev am: 5801e98d7f am: 81740a7c0c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23074022

Change-Id: I08589651a8ba8924419b17cba205c0cc3408f6c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 11:14:14 +00:00
Chaohui Wang
704b8c2dc8 Merge changes I07d964b9,Ifa5928e1 into udc-dev am: 1cc7d75d91 am: 5d8cbe5b2c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081917

Change-Id: I489c1ca7265de61419e06bf3923381105287a61c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 11:13:04 +00:00
TreeHugger Robot
fa0e390fbe Merge "Fix the UI in the left side & right side inconsistent problem" into udc-dev am: 910530482a am: 914ed31fe3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981572

Change-Id: Ice2f958de203a738a534155e41694a68870e4649
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 11:12:00 +00:00
Vincent Wang
ef5aa5d985 Merge "Test Fix SettingRobolectricTest Fail" into udc-dev am: 5801e98d7f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23074022

Change-Id: Icc90f4d9c3bc8b5094152af16c61398e83cae448
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 10:50:27 +00:00
Chaohui Wang
322234a222 Merge changes I07d964b9,Ifa5928e1 into udc-dev am: 1cc7d75d91 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081917

Change-Id: Idcc55f833a72e852233f687f663addc1d1b036f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 10:50:17 +00:00
TreeHugger Robot
1918f46ed1 Merge "Fix the UI in the left side & right side inconsistent problem" into udc-dev am: 910530482a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981572

Change-Id: I639c3d086404b0f8f05fb9bf48b186181e9f298d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 10:48:43 +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
Vincent Wang
5801e98d7f Merge "Test Fix SettingRobolectricTest Fail" into udc-dev 2023-05-09 09:50:50 +00:00
Chaohui Wang
1cc7d75d91 Merge changes I07d964b9,Ifa5928e1 into udc-dev 
* changes:
  Fix flicker in SIM card page
  Clean up DefaultSubscriptionController.getSummary
 2023-05-09 09:02:19 +00:00
Vincent Wang
818f77cd1f Test Fix SettingRobolectricTest Fail 
Bug: b/275023433
Test: NA
Change-Id: If2dcb8f6c196327129ccc9375b190e394c994efa
 2023-05-09 06:26:39 +00:00
TreeHugger Robot
6d6a90062b Merge "[BiometricsV2] Remove "Try again" button from errorDialog" 2023-05-09 02:12:28 +00:00
Sunny Shao
aeb42d1438 Fix the UI in the left side & right side inconsistent problem 
- Let the homepage show "Network & Internet" item in demo mode on large screen device.

Fixes: 276157240
Test: atest TopLevelNetworkEntryPreferenceControllerTest
Change-Id: Ife8bce28e6bc47caf3f06b1027579ea0e52172a3
 2023-05-09 09:39:36 +08:00
Derek Jedral
2696c8dbc7 Merge "Change preference title if Active Unlock enabled" into udc-dev am: 42deb763e0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997141

Change-Id: Ib0a4b4b2b76a3d1bc2244dbb6a7080c8c4b23b90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 00:18:36 +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
501f3635dc Remove feature flag for active unlock 
Active Unlock was guarded behind a feature flag for two main purposes.
1) To select the unlock intent or biometric failure layout. We've
   settled on unlock intent, so we no longer need the biometric failure
   codepath.
2) To guard the feature rollout. However, the additional platform guard
   is not necessary, since this feature availability is still guarded
   based on whether the secure settings are flipped to valid targets.
In order to keep the scope of this CL small, useBiometricFailureLayout
always returns false. Another CL will clean up all areas where it and
useUnlockIntentLayout are referenced.

Test: make RunSettingsRoboTests
Bug: b/280306741
Change-Id: I331afe9654b72249d461007c087e7f81783d7625
 2023-05-08 12:46:36 -07:00
Derek Jedral
42deb763e0 Merge "Change preference title if Active Unlock enabled" into udc-dev 2023-05-08 17:56:32 +00:00
Milton Wu
3e8a37f2c7 [BiometricsV2] Remove "Try again" button from errorDialog 
Remove "Try again" button from fingerprint enrolling error dialog for
biometrics v2.

Test: Manual (Enable biometrics v2, Start enrollment and don't
      complete it for 10 minutes; observe the dialog)
Test: atest FingerprintEnrollEnrollingViewModelTest
      FingerprintEnrollmentActivityTest
Bug: 280546173
Change-Id: I844786719a41b1a3d0e86ab32b74ab9b5aeaa0a1
 2023-05-08 13:50:03 +00:00
Treehugger Robot
6a2d24093f Merge "Fix the updateDialogForCdmaPhone test case failed" into udc-dev am: fb1cebd7f9 am: 9e7da7aaba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23078645

Change-Id: I4716b5ae4497002fa1fedd9320af07422483a38e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 11:38:26 +00:00
Chaohui Wang
2901125674 Fix flicker in SIM card page 
Before fix, the DefaultSubscriptionController will set an empty summary
before data is ready.

Not set the summary before data is ready to fix.

Also fix the ignored tests.

Fix: 277301125
Test: Manual on Mobile Settings
Test: Unit test
Change-Id: I07d964b9f9ce21f8f168cb775eea188e48172c5d
 2023-05-08 19:07:28 +08:00
Chaohui Wang
ab8a130674 Clean up DefaultSubscriptionController.getSummary 
Which is always overridden by subclass after Change
I7d29b58ca5476ae0bb6fe2e04fecb96164cb1ada

This is a no op.

Bug: 277301125
Test: Manually with Mobile Settings
Test: Unit test
Change-Id: Ifa5928e1026b18c33f2bdd51fdcba267249dcee5
 2023-05-08 18:56:06 +08:00
Treehugger Robot
99c883fd3f Merge "Fix the updateDialogForCdmaPhone test case failed" into udc-dev am: fb1cebd7f9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23078645

Change-Id: I7544b0326987e4397d7baab8514b1d1388d52005
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-08 10:55:48 +00:00
Treehugger Robot
fb1cebd7f9 Merge "Fix the updateDialogForCdmaPhone test case failed" into udc-dev 2023-05-08 10:25:06 +00:00
Sunny Shao
b723c4f96a Fix the updateDialogForCdmaPhone test case failed 
- This is a side effect of the CL(ag/16379105) which removed the getTextAsDigits API.
- Update the return value as empty string of the TelephonyManager.getImei().

Fixes: 215071948
Test: atest ImeiInfoDialogControllerTest
Change-Id: I790b5dc505ad1a91a951a4c46b241baddea392a1
 2023-05-08 14:01:23 +08:00
Milton Wu
8b0fc14f94 [BiometricsV2] Refine fingerprint ui and flow 
1. Fix "No thanks" become 2 lines, and fix the status when new
   fingerprint enrolled.
2. Fix Finish page shows again after pressing back from a new Finish
   page
3. Fix FindSensor page shows again after max number of fingerprint
   has reached.
4. Add missing tests, and remove some bypass-only tests

Bug: 279134177
Bug: 279380583
Bug: 279386539
Bug: 279394069
Test: atest FingerprintEnrollIntroViewModelTest
    FingerprintEnrollFindSensorViewModelTest
    FingerprintEnrollEnrollingViewModelTest
    FingerprintEnrollmentViewModelTest FingerprintEnrollmentActivityTest
Test: manually test 1, 2, and 3
Change-Id: I3797ceed8e7d6c10a4b4711f8bff8d7f222f0923
 2023-05-08 14:00:22 +08:00
Jack He
e64f750f61 Merge changes from topic "LeAudioBeta" into udc-dev am: 2605ccbcfa am: e188c6c0bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994939

Change-Id: I23d06ed58ed7725bfb1eed931db3ba313291c1b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 01:57:41 +00:00
Patty Huang
636eb36df0 Add toggle to show/hide the Per Device Enable LE Audio Toggle in Device details am: f05615f1e8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994938

Change-Id: I5cfb6ea17ed21f359c07f67b299f6f57c6f6d63e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-06 01:16:05 +00:00
Jack He
2605ccbcfa Merge changes from topic "LeAudioBeta" into udc-dev 
* changes:
  Hide the LE audio toggle by flag
  Add toggle to show/hide the Per Device Enable LE Audio Toggle in Device details
 2023-05-06 00:42:40 +00:00
Chaohui Wang
fab8b4d786 Merge "Fix dialog leak in RequestPermissionActivity" into udc-dev am: 5b18837a49 am: 5c437ee03b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012490

Change-Id: I06bfe151516232983621d98785d535dba1423edb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 12:47:34 +00:00
Chaohui Wang
7e441b2496 Merge "Fix dialog leak in RequestPermissionActivity" into udc-dev am: 5b18837a49 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012490

Change-Id: Ia1b143ca50843e865dd899cd1e1e7e1832027e34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 12:05:25 +00:00
Chaohui Wang
5b18837a49 Merge "Fix dialog leak in RequestPermissionActivity" into udc-dev 2023-05-05 11:32:13 +00:00
Chaohui Wang
39bf7dd530 Fix dialog leak in RequestPermissionActivity 
Dialog still show when activity destroyed will cause leak.

Dismiss dialog when activity onDestroy to fix this issue.

Fix: 279522922
Test: Manually with "Don't keep activities"
Test: Robolectric Test
Change-Id: I445f4b160020823a6f6e2883055218c1224e2c48
 2023-05-05 17:30:02 +08:00
Chaohui Wang
b39729c7aa Merge "FRP bypass defense in the Settings App for SPA" into udc-dev am: 7c042f374b am: 48c93451a8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948156

Change-Id: I07bddd6922e9aea9270eeb9d769ee6b63f46dafd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 09:18:56 +00:00
Chaohui Wang
ab3c6d568c Merge "FRP bypass defense in the Settings App for SPA" into udc-dev am: 7c042f374b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948156

Change-Id: If7fe17060ef6fd3b0f554ee8480105373d27f3cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 08:17:00 +00:00
Chaohui Wang
7c042f374b Merge "FRP bypass defense in the Settings App for SPA" into udc-dev 2023-05-05 07:57:39 +00:00
Daniel Huang
07a0572fa9 Merge "[Fixed] Reverse scrolling setting is reversed" into udc-dev am: 08b2b68e22 am: 319351aaf4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994936

Change-Id: I2e821256729615e2bbe68faa1ec2cd2bda0a8dd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 04:14:38 +00:00
Daniel Huang
ca5f384333 Merge "[Fixed] Reverse scrolling setting is reversed" into udc-dev am: 08b2b68e22 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994936

Change-Id: Ia96ff86deff46dcd51a1502058535ae5271aa5cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 02:35:06 +00:00
Daniel Huang
08b2b68e22 Merge "[Fixed] Reverse scrolling setting is reversed" into udc-dev 2023-05-05 02:33:13 +00:00
TreeHugger Robot
a2af0ba3d4 Merge "[Settings] Remove WFC enabled state condition of querying Telecomm." into udc-dev am: 3a2b8e81e5 am: 51b4b2dd2e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22961321

Change-Id: I65f4dc56f3d93256e64a1423ed1431191887ae08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 16:05:11 +00:00
TreeHugger Robot
76edddc1c5 Merge "[Settings] Remove WFC enabled state condition of querying Telecomm." into udc-dev am: 3a2b8e81e5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22961321

Change-Id: I97766d9ecac3a7de66d7d1b66a95264c14049a69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 15:23:05 +00:00
TreeHugger Robot
3a2b8e81e5 Merge "[Settings] Remove WFC enabled state condition of querying Telecomm." into udc-dev 2023-05-04 14:57:36 +00:00
Treehugger Robot
36e6a9d491 Merge "Support incompatible charger state in the battery main page" into udc-dev am: 54de6fd80b am: 94d430b929 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981565

Change-Id: If83a923bf8b1b33ca724a894566e171270302e00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 09:43:49 +00:00
Treehugger Robot
08482b1d2b Merge "Support incompatible charger state in the battery main page" into udc-dev am: 54de6fd80b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981565

Change-Id: I2cc06f818546475cb1951b0e02f44f9bf4add503
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 09:03:24 +00:00
Treehugger Robot
54de6fd80b Merge "Support incompatible charger state in the battery main page" into udc-dev 2023-05-04 08:28:57 +00:00
Chaohui Wang
0b387d23c2 Merge "Fix SettingsDumpServiceTest" into udc-dev am: 678b1d5fa4 am: f029f96558 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23015997

Change-Id: If11c36598e70dcbc93d41857adbb328dc0968b6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 08:18:31 +00:00
Chaohui Wang
396b3b45d4 Merge "Fix SettingsDumpServiceTest" into udc-dev am: 678b1d5fa4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23015997

Change-Id: I7c302932f91793a9ab80796e4e6448c99bfd39e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 07:56:51 +00:00
Chaohui Wang
678b1d5fa4 Merge "Fix SettingsDumpServiceTest" into udc-dev 2023-05-04 07:39:14 +00:00
Hao Dong
56f39eeb45 Merge "Call onFaceStrengthChanged() only when authenticators registered." into udc-dev am: 1c9288fa24 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22999810

Change-Id: I477cd05789ff62ad6cba68908de99d426d227e39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 07:37:04 +00:00