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

48321 Commits

Author SHA1 Message Date
Marcello Galhardo
d608996d1f Merge "Move Note Shortcut from Settings to SystemUI" into udc-dev am: f5a3485300 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048850

Change-Id: I1bccba1b2642e39155543448f4d2feba3139f736
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 09:44:40 +00:00
Weng Su
f65c4530e4 Hide carrier service package in Wi-Fi data usage settings 
- When there is no specified SubscriptionInfo, Wi-Fi data usage will be displayed. In this case, the carrier service package also needs to be hidden.

- Fix failing test cases in DataUsageListTest

Bug: 273167633
Bug: 280021214
Test: manual test

Change-Id: I66ff8a28d9e7f7db77c8a210cb36676a07fc2c7d
 2023-05-10 17:30:01 +08:00
Marcello Galhardo
f5a3485300 Merge "Move Note Shortcut from Settings to SystemUI" into udc-dev 2023-05-10 09:23:52 +00:00
Daniel Huang
d7bec8275e Merge "[Fixed] UI issues after rotation" into udc-dev am: 28aa2964fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23109896

Change-Id: I608e726a2ac9c92b9a565c938688430508276a41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 09:00:16 +00:00
ykhung
981726c0e7 Move duplicate operations in the BackupHelper to OptimizeUtils 
Test command for backup manager:
adb shell bmgr backupnow com.android.settings
adb shell dumpsys backup | grep Current
adb shell bmgr restore 34bbf79f36c8ed43 com.android.settings

Bug: 192523697
Test: make SettingsRoboTests
Change-Id: I2bc8842849998841aa38af3564f51bb81606c8cf
 2023-05-10 08:41:58 +00:00
Daniel Huang
28aa2964fb Merge "[Fixed] UI issues after rotation" into udc-dev 2023-05-10 07:59:20 +00:00
Guangjie (Jerry) Shi
8e70a25893 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: I79921f8f98396e741852d68f81b1d537ba0e87f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 07:14:52 +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
e98635c9fd 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: Ib24e2c605b64bc20abf7b1cdf2a1af3dee2e0346
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 06:15:55 +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
Becca Hughes
cb0643a885 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: I0e83c6d3fe56b9dc06709e8942e51e052e89aa0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 00:51:07 +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
f6d23468b1 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: I4606997e91b4e23c76480362c6736efb464d7652
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 00:28:30 +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
81180f985e 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: Ie0b3e0bb0255d3b540267192123a21546358e7d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 22:02:35 +00:00
Becca Hughes
01b75c9719 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: Ibef3433141e67938efd2f3c07978870525e14a70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 22:02:14 +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
847e29faf7 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: I1dd252d3452d0591313e3544a421d29def096cc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 22:00:18 +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
Derek Jedral
fff41e6aa3 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: I7aaeed6ad5967a88b04583b19f8b35e2551a3b3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 18:04:09 +00:00
Peter Zhang
3e498ad30d Render an additional icon to the tappable tiles with pending intents 
Test: robotest, manual
Bug: 281517110
Change-Id: Ia5fbae63d56a6f1e6ee8fb3ee58ae912d14b6c75
 2023-05-09 19:49:57 +02:00
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
Treehugger Robot
6dd01a2ef9 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: I71ec2340aaa88c8f6b2404a967b9876735af6121
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 16:41:55 +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
cd6d1d53ca 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: I3d52133a999da5163b9d14d09afa9e8561292c9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 14:29:30 +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
Chaohui Wang
b52b6f6d46 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: Ifff45d0c5fb5a65681c2ad60de6d854a5dd36c99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 11:25:01 +00:00
TreeHugger Robot
e6998973d2 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: Ie234dab67301b120466fd4b3f8b32413a320f876
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 11:24:31 +00:00
Chaohui Wang
9a96e14cc2 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: I3fdb00cad883651e6135161c843cb119932fbb6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 11:24:22 +00:00
Treehugger Robot
0cbdd648f5 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: I7441e0e8b6ecd9aa86eb6aad936c04e7d79d4dde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 11:15:35 +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
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
Alice Kuo
560abbcc49 Revert "Revert "Remove CSIP/VCP enable/disable from Setting"" 
This reverts commit 6edb515a9f.

Reason for revert: we need this change and need to merge together with prebuilt

Bug: 280626194
Change-Id: Id883c6c7c778154038c249f7be8e9fabf52299c3
 2023-05-09 08:01:50 +00:00
Guangjie (Jerry) Shi
bcd1326690 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: I174d4a00736084a32821c5328540b4e2d2663d7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 07:26:46 +00:00
Jason Chang
5f7ffb31d2 Merge "Fix 'Do it later' button overlaps with text depending on landscape direction" into udc-d1-dev 2023-05-09 07:03:38 +00:00
TreeHugger Robot
910530482a Merge "Fix the UI in the left side & right side inconsistent problem" into udc-dev 2023-05-09 06:01:11 +00:00
Chaohui Wang
d758fe853b Merge "Fix ANR of SimSlotChangeService" into udc-dev 2023-05-09 05:38:11 +00:00
Treehugger Robot
83cc6a64c6 Merge "Revert "Remove CSIP/VCP enable/disable from Setting"" into udc-dev 2023-05-09 05:33:40 +00:00
Guangjie (Jerry) Shi
ece191b09f Merge "Fix work profile issue" into udc-dev 2023-05-09 03:47:05 +00:00
Jack He
6edb515a9f Revert "Remove CSIP/VCP enable/disable from Setting" 
This reverts commit 345889b5e2.

Reason for revert: Accidental merge, should merge together with prebuilt

Bug: 280626194
Change-Id: I93f66f22b55eb906f8e079de35f2db00b102c788
 2023-05-09 02:44:45 +00:00
Jack He
d55e645795 Merge "Remove CSIP/VCP enable/disable from Setting" into udc-dev 2023-05-09 02:43:13 +00:00
Shawn Lin
f5b4a2388d Merge "Set the talkback focus to the header text when Stage is NeedToConfirm" into udc-dev 2023-05-09 02:11:48 +00:00