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
0b19e92158
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
am: 81180f985e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22381242
Change-Id: If6633fb997d54a37ad07b26c097d98ce19de3602
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 22:43:28 +00:00
Becca Hughes
ce1c823116
Merge "Fix provider update bug" into udc-dev am: 5031d67f21
am: 01b75c9719
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23112934
Change-Id: I3edb704fe21ee0391b23cd3ac17244e737651c18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 22:43:15 +00:00
Becca Hughes
8df9b69c10
Hide enable dialog and prefix pref wrongly enabled am: e513c71189
am: 847e29faf7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23114516
Change-Id: I4bca53d2ab71d1d88242483a5a2f9c3344098c1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 22:42:50 +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
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
6b96b8fc4f
Merge "Remove feature flag for active unlock" into udc-dev am: 9c67ee1eb1
am: fff41e6aa3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23089996
Change-Id: I31a9c9a6a2b2fb1578f57f8b701dd1abcd6e0deb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 18:45:48 +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
Treehugger Robot
870face978
Merge "[Metrics] Remove locale string from Metrics because it should be reviewed" into udc-dev am: f4939a4bda
am: 6dd01a2ef9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080180
Change-Id: Ie03385ba50efc467c69fa51f63facaff559bf3f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 17:21:10 +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
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
3407bb7611
Merge "Allow BAL for confirm device credential activity when work profile apps are protected by PIN prompt." into udc-dev am: 38b99012f4
am: cd6d1d53ca
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23087497
Change-Id: If263ed1327fb7bc170ecc7409983fb6c2098ce21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 15:13:39 +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
Vincent Wang
2e8cba3e95
Merge "Test Fix SettingRobolectricTest Fail" into udc-dev am: 5801e98d7f
am: 1e8948fbcb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23074022
Change-Id: I3cfeb0c4e8117e4aca83e3a0da18050210d29236
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 11:33:29 +00:00
Chaohui Wang
39c6a23f92
Merge changes I07d964b9,Ifa5928e1 into udc-dev am: 1cc7d75d91
am: b52b6f6d46
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081917
Change-Id: I133e238da705871a308265ba66ea39e28b7e559f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 11:33:08 +00:00
TreeHugger Robot
cbe5c8f504
Merge "Fix the UI in the left side & right side inconsistent problem" into udc-dev am: 910530482a
am: e6998973d2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981572
Change-Id: I739c4c8bfe467ab16c293ddd9c738e669ea15d60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 11:32:48 +00:00
Chaohui Wang
e2869f34fa
Merge "Fix ANR of SimSlotChangeService" into udc-dev am: d758fe853b
am: 9a96e14cc2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23083797
Change-Id: I0084db67d3524ae8d7a3309b6c015b8ddd286bdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 11:32:26 +00:00
Treehugger Robot
fe33d447f9
Merge "Revert "Remove CSIP/VCP enable/disable from Setting"" into udc-dev am: 83cc6a64c6
am: 0cbdd648f5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23101218
Change-Id: I21debfcb2a88abb3c53f5af84627cfe8694fb37f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 11:31:59 +00:00
Weng Su
af32065193
Merge "Refine Settings textColor" into udc-dev am: e24cbeb6b7
am: bfc8efc4de
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23083621
Change-Id: I6e90cce1fb6ae6907b0bd63c0e2d1421608a3f80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 11:31:02 +00:00
Vincent Wang
1e8948fbcb
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: I68350a070fd57a6358b099bd303fb37ac84bf6ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 11:25:12 +00: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
Weng Su
bfc8efc4de
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: Ic6ebc234fb721cc0f2b0cf28bfdd029755aba943
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:50:45 +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
Guangjie (Jerry) Shi
580c493fbb
Merge "Fix work profile issue" into udc-dev am: ece191b09f
am: bcd1326690
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23086871
Change-Id: I9b7344ae294f03ccd26a948ff80a3aeae296c75f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 09:19:27 +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
f240c5594c
Merge "Fix 'Do it later' button overlaps with text depending on landscape direction" into udc-d1-dev am: 5f7ffb31d2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23050583
Change-Id: Ic0674ded6b1519f2dc14d7d29cc85097ea6a4279
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 07:06:50 +00:00
Jack He
d6476ad161
Merge "Remove CSIP/VCP enable/disable from Setting" into udc-dev am: d55e645795
am: 7d96f185ee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23065696
Change-Id: Iedcb056939ee55a84fdcef9bf805937bd75e61ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 07:04:33 +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
Shawn Lin
2576ca80ba
Merge "Set the talkback focus to the header text when Stage is NeedToConfirm" into udc-dev am: f5b4a2388d
am: 01a434865f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23053883
Change-Id: If7a321ad13c98a392e0f026dde5a19d4a70abaf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 07:03:07 +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
Jack He
7d96f185ee
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: Ib7e054b0f9bb497d227d32d9a8fbbd4acb7003a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 06:20:49 +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