Becca Hughes
40af741095
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: I337e45dbb93e15e2d1fe0465128555226c54e4b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 22:39:13 +00:00
Becca Hughes
015d352ccf
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: I171410b193418d45554642641601cf18ac592d65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 22:38:52 +00:00
Himanshu Gupta
1e77d0d6c9
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: I0399436978010582b29b91af55756dd9eec25d39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 22:17:40 +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
75d3f20983
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: Id7cab0e08c14935830d60b947af63e6213b81cda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 21:58:04 +00:00
Becca Hughes
914cd963d6
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: If3ad0b48110c1f6ea8195ee10f7e3ab4f1b6a0ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 21:55:58 +00:00
Becca Hughes
5031d67f21
Merge "Fix provider update bug" into udc-dev
2023-05-09 21:48:13 +00:00
Derek Jedral
abbf9c2894
Merge "Remove feature flag for active unlock" into udc-dev am: 9c67ee1eb1
am: fff41e6aa3
am: 0863849a36
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23089996
Change-Id: I135cb6a78b6f65d7ddff42ea9543c3dc061d48db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 21:17:43 +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
27b5b2d1ff
Merge "Remove feature flag for active unlock" into udc-dev am: 9c67ee1eb1
am: fff41e6aa3
am: 6b96b8fc4f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23089996
Change-Id: I9082a27ea2c7ca6f6352e2b94080ff7581389afe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 19:56:17 +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
0863849a36
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: I1ae494fdf01a9aa5e7a0f5a84ece9f1136f558a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 19:23:51 +00:00
Evan Laird
4c0fb53033
Merge "Set default value of battery percent preference" am: 145caf7d4e
am: b4d2e7da30
am: ff6f9337c8
am: 930bee6167
am: 2785a8410d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1719617
Change-Id: I451f665460e8892671dedeb504db3692c507e53f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 19:04:29 +00:00
Derek Jedral
caddd6aea6
Merge "Remove feature flag for active unlock" into udc-dev am: 9c67ee1eb1
am: a711dc3a06
am: d08083bc1a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23089996
Change-Id: Id037011863899b15ed080bc44874509a130e5682
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 19:03:28 +00:00
Evan Laird
2785a8410d
Merge "Set default value of battery percent preference" am: 145caf7d4e
am: b4d2e7da30
am: ff6f9337c8
am: 930bee6167
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1719617
Change-Id: Ic3dd3167fac3cc4a3fd82e1caeddc104db871899
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 18:46:43 +00:00
Derek Jedral
d08083bc1a
Merge "Remove feature flag for active unlock" into udc-dev am: 9c67ee1eb1
am: a711dc3a06
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23089996
Change-Id: I1cc88d80c7cf2cbca9a54fe5b4ca2a044b135973
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 18:46:30 +00: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
Treehugger Robot
681a85f7d8
Merge "[Metrics] Remove locale string from Metrics because it should be reviewed" into udc-dev am: f4939a4bda
am: 6dd01a2ef9
am: 870face978
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080180
Change-Id: I636004b3bb282013b6a3277935500271cf79ba2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 18:04:24 +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
Evan Laird
930bee6167
Merge "Set default value of battery percent preference" am: 145caf7d4e
am: b4d2e7da30
am: ff6f9337c8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1719617
Change-Id: I6af1354602e15a80f8c101ccad9b84cb89ba8131
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 18:03:25 +00:00
Derek Jedral
a711dc3a06
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: Iede1c8c33c9c3999952f363625687482e5980b11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 17:59:27 +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
Treehugger Robot
13b09784cb
Merge "[Metrics] Remove locale string from Metrics because it should be reviewed" into udc-dev am: f4939a4bda
am: 6dd01a2ef9
am: 9eb3053b30
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080180
Change-Id: I0b2f85a83863d501b4a0837fe7d8ce75b4b52a9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 17:39:12 +00:00
Treehugger Robot
c37d7456da
Merge "[Metrics] Remove locale string from Metrics because it should be reviewed" into udc-dev am: f4939a4bda
am: 0c592cd8a7
am: 84d7ca0e35
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080180
Change-Id: I30cf8bd2b496eb020b29b315dfece5849d4e6e57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 17:38:21 +00: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
Treehugger Robot
9eb3053b30
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: I02fb643894b84834bd9b39362f7dc117274c0a2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 17:17:40 +00:00
Evan Laird
ff6f9337c8
Merge "Set default value of battery percent preference" am: 145caf7d4e
am: b4d2e7da30
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1719617
Change-Id: Ifd81c0ea3c845d9f48b5eef143357960f21a66a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 17:17:25 +00:00
Derek Jedral
9c67ee1eb1
Merge "Remove feature flag for active unlock" into udc-dev
2023-05-09 17:17:11 +00:00
Treehugger Robot
84d7ca0e35
Merge "[Metrics] Remove locale string from Metrics because it should be reviewed" into udc-dev am: f4939a4bda
am: 0c592cd8a7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080180
Change-Id: I4c6cbbcbb316fed1c6ec22cd4674494cd333a745
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 16:57:56 +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
Evan Laird
b4d2e7da30
Merge "Set default value of battery percent preference" am: 145caf7d4e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1719617
Change-Id: I34fe8a73fb89283e44dd46c9c655f8db9353e41b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 16:37:47 +00:00
Treehugger Robot
0c592cd8a7
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: I0965eeedb82446b8e50721e6618310221e37fa83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 16:35:03 +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
3916147ecf
Merge "Allow BAL for confirm device credential activity when work profile apps are protected by PIN prompt." into udc-dev am: 38b99012f4
am: cd6d1d53ca
am: 3407bb7611
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23087497
Change-Id: I74a2fa05e95d1f71134909de50e47b198f1c14b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 15:56:59 +00:00
Evan Laird
145caf7d4e
Merge "Set default value of battery percent preference"
2023-05-09 15:53:08 +00:00
Nan Wu
a1454b1c99
Merge "Allow BAL for confirm device credential activity when work profile apps are protected by PIN prompt." into udc-dev am: 38b99012f4
am: 1acff65bc3
am: 497a436d22
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23087497
Change-Id: I90a48c85869640be7f4d817d10c7d5f2b072963c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 15:47:42 +00:00
Nan Wu
c0dc0e24ab
Merge "Allow BAL for confirm device credential activity when work profile apps are protected by PIN prompt." into udc-dev am: 38b99012f4
am: cd6d1d53ca
am: 5bbe972498
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23087497
Change-Id: I6e87cb403a35e1177177400d36c05f1154e8baa2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 15:47:16 +00:00
Nan Wu
497a436d22
Merge "Allow BAL for confirm device credential activity when work profile apps are protected by PIN prompt." into udc-dev am: 38b99012f4
am: 1acff65bc3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23087497
Change-Id: I198cf507f27779e52780ef8d83558fb5a1850289
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 15:14:20 +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
5bbe972498
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: Ib15e9b947c9c510ff7543446d4b442d5ff18e499
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 15:09:36 +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
1acff65bc3
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: I8e5f2a5a2d4d44fb54d43a952c9a30b429791b6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 14:25:11 +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
Vincent Wang
210df9e107
Merge "Test Fix SettingRobolectricTest Fail" into udc-dev am: 5801e98d7f
am: 1e8948fbcb
am: 65856e78af
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23074022
Change-Id: If8c599d38cb28634e493ce09e4d1367f39e40260
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 12:28:24 +00:00