PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
122,702 Commits 1 Branch 0 Tags
aa55b9dde732862cb50bf24fbc299b2edd9633f6
Commit Graph

122702 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Guangjie (Jerry) Shi
c93df29409 Merge "Add null check for settings default preference controller" into udc-dev am: ba44f13498 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23127101

Change-Id: Ica8ac64f4e85934d11e556ff214db60afa75b8e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 07:14:54 +00:00
Guangjie (Jerry) Shi
ba44f13498 Merge "Add null check for settings default preference controller" into udc-dev 2023-05-10 06:30:37 +00:00
Chaohui Wang
2bf036e61c Merge "Fix button not clickable in sim confirm dialog" into udc-dev am: 6619994919 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012494

Change-Id: Ia36b1bc8d0263d26f0550a0dbda3a5189c2e49a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 06:14:43 +00:00
Chaohui Wang
6619994919 Merge "Fix button not clickable in sim confirm dialog" into udc-dev 2023-05-10 05:26:02 +00:00
Chaohui Wang
9beb5605b8 Fix button not clickable in sim confirm dialog 
Bug: 261994361
Fix: 280787593
Test: Manually with Talkback on
Test: Manually with Talkback off
Change-Id: I23d4ea816eb534dcde48cc2ebc6bb4a9770d107e
 2023-05-10 04:15:37 +00:00
Jerry Shi
21df117d52 Add null check for settings default preference controller 
Test: local built and tested
Bug: 281771729
Change-Id: Ib3467c22262125ac7dac00eb9ea68516ddf53b5a
 2023-05-09 21:00:32 -07:00
Bill Yi
606f49981b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id26e7c7d2af276519fe72823d2b0288898a8c72b
 2023-05-09 19:51:19 -07:00
Bill Yi
b6efea437a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9247eac3406d8d55e580a2012484fb58dc72aa4e
 2023-05-09 19:49:52 -07:00
Bill Yi
6b8c61c9a6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ica68575ce29c2ca9f82bfc8a694750f589fbb492
 2023-05-09 19:19:35 -07:00
Bill Yi
13c4c2accb Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4df0fe515c3acf2eddfeabef5b6088f437ad1b8d
 2023-05-09 19:15:29 -07:00
Bill Yi
e69bec0564 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If7cdbc4d2562b4104a9de90f1f97b67eadcc4ad1
 2023-05-09 19:10:50 -07:00
Bill Yi
7a494fc7c5 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I041ed592d479aeb038cb23092fa85b14d71df157
 2023-05-09 19:08:51 -07:00
Bill Yi
be6f57545f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I33712e7c3fd9062f28b3043d2dd6189a52532254
 2023-05-09 19:06:37 -07:00
Bill Yi
63af1d8683 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id5b16e70d8c5cc99699281eed833bcabbcd8e8aa
 2023-05-09 19:04:28 -07:00
Bill Yi
eac02feb2d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I752b8c12cf13fcb989dbb335b3230198d3be3201
 2023-05-09 19:02:21 -07:00
Becca Hughes
6a52165bd2 Merge "If you tap outside dialog then re-enable" into udc-dev am: 90b344e760 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121656

Change-Id: I225d72a2eb1442cfb6594b147c71e860fd8ab981
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 00:51:56 +00:00
Becca Hughes
90b344e760 Merge "If you tap outside dialog then re-enable" into udc-dev 2023-05-10 00:33:11 +00:00
Bill Lin
9eb1ba4169 Merge "Refine SkipDialog title and desc by device configs" into udc-dev am: 4d5063ffdc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779802

Change-Id: Ia55e7d1a1abadd54644e8ec60c61930cf7255abc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 00:29:49 +00:00
Bill Lin
4d5063ffdc Merge "Refine SkipDialog title and desc by device configs" into udc-dev 2023-05-09 23:09:38 +00:00
Becca Hughes
48d406cecc If you tap outside dialog then re-enable 
Test: ondevice
Bug: 281696686
Change-Id: I7aee51952b8a905010710a574e0dd39616b2e5d9
 2023-05-09 22:48:53 +00:00
Himanshu Gupta
0eff752b20 Merge "Enabling App Cloning Device Config flags by default. The features will be guarded *only* by config overlays, which are off by default." into udc-dev am: 53bf6b1dc8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22381242

Change-Id: Iea1458738e3360c374d3cf843da35db2aa14cd1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 22:05:15 +00:00
Becca Hughes
26cc21e52d Merge "Fix provider update bug" into udc-dev am: 5031d67f21 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23112934

Change-Id: I1e5cfb145ca038e756d58bc96c5679c506154187
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 22:05:05 +00:00
Becca Hughes
335c87b924 Hide enable dialog and prefix pref wrongly enabled am: e513c71189 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23114516

Change-Id: Iffe894a996b2a19863fc61007857aa1cb3b4c6f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 22:02:59 +00:00
Himanshu Gupta
53bf6b1dc8 Merge "Enabling App Cloning Device Config flags by default. The features will be guarded *only* by config overlays, which are off by default." into udc-dev 2023-05-09 22:00:36 +00:00
Becca Hughes
5031d67f21 Merge "Fix provider update bug" into udc-dev 2023-05-09 21:48:13 +00:00
Becca Hughes
e513c71189 Hide enable dialog and prefix pref wrongly enabled 
Test: ondevice
Bug: 281329396
Bug: 280905737
Change-Id: I82652a2520a2f9ca9bc7f8f78cf020bef7af0b15
 2023-05-09 21:16:01 +00:00
Becca Hughes
49d11e4995 Fix provider update bug 
Test: make
Bug: 280905737
Change-Id: Ia7f33f4c5e1168cadd66119c42bd52e0a80eda10
 2023-05-09 20:41:51 +00:00
Florian Mayer
8512191c33 Fix mistake in test 
Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER=DevelopmentMemtagPageTest
Bug: 280021647
Change-Id: I74aa8764933d2abe9ae9dfd47c9f010411a3efee
 2023-05-09 12:25:20 -07:00
Derek Jedral
1f01e15499 Merge "Remove feature flag for active unlock" into udc-dev am: 9c67ee1eb1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23089996

Change-Id: I8f09f30f1961e46abe77fa45229a89d40b55f05e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 18:03:23 +00: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
Treehugger Robot
aae0bf1fdc Merge "[Metrics] Remove locale string from Metrics because it should be reviewed" into udc-dev am: f4939a4bda 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080180

Change-Id: I9f691058174ed6ab89b364a9ab0e67c0dd64d22a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 16:40:15 +00:00
Treehugger Robot
f4939a4bda Merge "[Metrics] Remove locale string from Metrics because it should be reviewed" into udc-dev 2023-05-09 15:59:32 +00:00
Nan Wu
1671f75b46 Merge "Allow BAL for confirm device credential activity when work profile apps are protected by PIN prompt." into udc-dev am: 38b99012f4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23087497

Change-Id: I30a429f8cbccbcc22873e16f777258b6f9ffb4b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 14:29:23 +00:00
Nan Wu
38b99012f4 Merge "Allow BAL for confirm device credential activity when work profile apps are protected by PIN prompt." into udc-dev 2023-05-09 13:49:06 +00:00
danielwbhuang
c92bd9789d [Fixed] UI issues after rotation 
1. Use onSaveInstanceState to store the data.
2. Do not repeat to automatically select the keyboard layout.

Bug: 281481973
Bug: 281461013
Test: manual
Change-Id: Ieaa8fa3d2e6c22c39b34313d255e4f7869777a8b
 2023-05-09 20:03:17 +08:00
Vincent Wang
81740a7c0c 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: I86856a4eb08ed51abcfd4c345603bdbb7238f312
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 10:48:14 +00:00
Chaohui Wang
5d8cbe5b2c 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: Ifd59f50e7eea488490808733c26d0cdbc4916f37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 10:46:48 +00:00
Automerger Merge Worker
7374006284 Merge "Merge "Fix the UI in the left side & right side inconsistent problem" into udc-dev am: 910530482a" into udc-mainline-prod 2023-05-09 10:41:50 +00:00
TreeHugger Robot
914ed31fe3 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: I84c0e63a99e107078706f0c7a791729969f30325
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 10:41:46 +00:00
TreeHugger Robot
035f91279a 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: Ic93863ba889db6073ceac7073902e2e690152012
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 10:41:46 +00:00
Chaohui Wang
c688e7b316 Merge "Fix ANR of SimSlotChangeService" into udc-dev am: d758fe853b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23083797

Change-Id: I68aa54b13a8253bbd330bd16c9c5dab32cc84723
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 10:41:01 +00:00
Treehugger Robot
cb94f83fee Merge "Revert "Remove CSIP/VCP enable/disable from Setting"" into udc-dev am: 83cc6a64c6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23101218

Change-Id: I481ebff42620108099ec56dbda24e5eed2c74bf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 10:40:51 +00:00
Weng Su
0a4538dd97 Merge "Refine Settings textColor" into udc-dev am: e24cbeb6b7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23083621

Change-Id: Ieb60ec8e97e23bb6d30419b5b287c73727aaaa1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 10:38:08 +00:00
Guangjie (Jerry) Shi
1855ff060c Merge "Fix work profile issue" into udc-dev am: ece191b09f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23086871

Change-Id: Ia264a90698f09a7d98e0180311b03acffeab92b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 10:32:12 +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
Jack He
e556e425f1 Merge "Remove CSIP/VCP enable/disable from Setting" into udc-dev am: d55e645795 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23065696

Change-Id: Icd97d90d93dee167b1f65d48990e6f1a08f7b7b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 08:40:36 +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