Kevin Chyn
ce05aa8bd4
Add biometric strings to DeviceAdminStringProviderImpl am: fc19953d28
am: da4aff8c65
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14984754
Change-Id: I1983108d43a5e46b3a92a829624539b25db86e7a
2021-06-17 02:05:25 +00:00
Kevin Chyn
16bd0c2cbd
Merge "Pass context and enforcedAdmin to onClickListener" into sc-dev am: 5a8476a709
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14984578
Change-Id: I6bca8ad91ea38037374b9c2eb6468190997e5b88
2021-06-17 02:01:45 +00:00
Kevin Chyn
f721b1d9a6
Merge "Pass context and enforcedAdmin to onClickListener" into sc-dev am: 5a8476a709
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14984578
Change-Id: I5b7e86c7745b89ec5d1b0ae673a182eca594edc8
2021-06-17 02:01:44 +00:00
Kevin Chyn
3551588761
Merge changes from topic "kchyn-unicorn4a" into sc-dev am: 678a57b0df
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14991599
Change-Id: Ice19c02714ce776f6bf1cfa5e1a95a6e29ee9375
2021-06-17 02:01:25 +00:00
Kevin Chyn
da4aff8c65
Add biometric strings to DeviceAdminStringProviderImpl am: fc19953d28
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14984754
Change-Id: I52255ec8af862d982b38fecb42aee3aa275b87a4
2021-06-17 02:01:23 +00:00
Kevin Chyn
83a8b9141d
Merge changes from topic "kchyn-unicorn4a" into sc-dev am: 678a57b0df
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14991599
Change-Id: I216f08fd5182096e96debe88674d466edb93f680
2021-06-17 02:00:40 +00:00
Kevin Chyn
e70ec6e388
Add biometric strings to DeviceAdminStringProviderImpl am: fc19953d28
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14984754
Change-Id: I7ba4cfa16a8154d482f193aa2713b5b06b21e7a4
2021-06-17 02:00:38 +00:00
Kevin Chyn
5a8476a709
Merge "Pass context and enforcedAdmin to onClickListener" into sc-dev
2021-06-17 01:28:17 +00:00
Kevin Chyn
678a57b0df
Merge changes from topic "kchyn-unicorn4a" into sc-dev
...
* changes:
Show biometric-specific dialog when appropriate
Add biometric strings to DeviceAdminStringProviderImpl
2021-06-17 01:27:00 +00:00
Julia Reynolds
393134f9b1
Validate config activities with their rule owners
...
Test: RoboTests
Bug: 189332346
Change-Id: Iee1b1caca4d6eb2729feb872c3e4954b6c16519c
2021-06-16 15:40:34 -04:00
Abel Tesfaye
0c91452b68
Merge "Fix battery saver not disabling adaptive sleep switch" into sc-dev am: b8c610b188
am: 839f9e6319
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14923591
Change-Id: I94283a39e0fb2d0143122608ffcb343c8176ae4e
2021-06-16 17:56:05 +00:00
Abel Tesfaye
cc26673d5e
Merge "Fix battery saver not disabling adaptive sleep switch" into sc-dev am: b8c610b188
am: 02c941968f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14923591
Change-Id: I177596b7d596184cbfe700389d2b4dd35b5b003b
2021-06-16 17:55:45 +00:00
Abel Tesfaye
02c941968f
Merge "Fix battery saver not disabling adaptive sleep switch" into sc-dev am: b8c610b188
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14923591
Change-Id: Ib37a1f8280a7cef805545b88f09ea85fde83a076
2021-06-16 17:39:45 +00:00
Abel Tesfaye
839f9e6319
Merge "Fix battery saver not disabling adaptive sleep switch" into sc-dev am: b8c610b188
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14923591
Change-Id: I57c511d4bbebeb18c57b51009e3e1c7fda232467
2021-06-16 17:39:15 +00:00
Abel Tesfaye
b8c610b188
Merge "Fix battery saver not disabling adaptive sleep switch" into sc-dev
2021-06-16 17:25:48 +00:00
Joe Bolinger
a8808f7368
Add plumbing and placeholder screens for parental consent flow.
...
Bug: 188847063
Test: adb shell am start -a android.settings.BIOMETRIC_ENROLL --ez require_consent true
Test: atest com.android.settings.biometrics.ParentalConsentHelperTest
Change-Id: Ie136036d5f550775fd0b021979581a5d222f1b68
2021-06-16 09:58:19 -07:00
Treehugger Robot
d009484a59
Merge "Settings: use framework text colors for SwitchBar" am: b09a17bc9e
am: b34692c2b5
am: e7e7c33de7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1708559
Change-Id: Ida316fba970e1eb8be6f1d92b14ca9531846baa3
2021-06-16 15:39:31 +00:00
Treehugger Robot
e7e7c33de7
Merge "Settings: use framework text colors for SwitchBar" am: b09a17bc9e
am: b34692c2b5
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1708559
Change-Id: I15cef0a16d846f68ea331b550b1926caa952d8f6
2021-06-16 15:29:29 +00:00
Treehugger Robot
b34692c2b5
Merge "Settings: use framework text colors for SwitchBar" am: b09a17bc9e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1708559
Change-Id: I84406695c1822ccda20b74b35ea18a2d51487119
2021-06-16 15:18:06 +00:00
Treehugger Robot
b09a17bc9e
Merge "Settings: use framework text colors for SwitchBar"
2021-06-16 14:59:18 +00:00
Yanting Yang
b492aa369e
Improve flicker when open app info page
...
The Battery item moves down because the summary of Screen time is
loading in the background, we should put a summary placeholder to
avoid item shifting.
Fixes: 191115152
Test: robotests & visual
Change-Id: Iee297a7350726f02c3569231d37112f8911b1b35
2021-06-16 21:03:25 +08:00
Stanley Wang
cf2b8c48dd
Merge "Fix the problem that the "Turn off SIM" dialog will be displayed when the MobileNetwork page is slid to to top." into sc-dev am: d0adfa7b3e
am: 2773b42560
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964824
Change-Id: Icf2a0f69d5fe19b79e41df873c8d3a72c69c02f0
2021-06-16 11:46:08 +00:00
TreeHugger Robot
0197a01a82
Merge "Fix the issue of permanent loading when Wi-Fi is disabled" into sc-dev am: 1803aead52
am: b48c3f5aa6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980888
Change-Id: Ia1818431f00bd848377a52bba9c916a23a2eddd6
2021-06-16 11:46:05 +00:00
TreeHugger Robot
a720c45bfa
Merge "Add One-handed mode entry point in a11y system controls" into sc-dev am: 1da2a5390a
am: b848c52f5b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980884
Change-Id: I5befa485aa9f7a70f4bbd55afb2be516b62383fa
2021-06-16 11:46:01 +00:00
TreeHugger Robot
ef95465d2e
Merge "Fix the toggle button flicker problem when display" into sc-dev am: c0b23b03c3
am: bf2fae3df5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14819349
Change-Id: Ib0ec3fd5d761be15bbe7048d1e33e40fd8746d29
2021-06-16 11:45:57 +00:00
Stanley Wang
7a7b4242de
Merge "Fix the problem that the "Turn off SIM" dialog will be displayed when the MobileNetwork page is slid to to top." into sc-dev am: d0adfa7b3e
am: 6cb273d8c6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964824
Change-Id: Id3a3a1ef3cbb15bb06a92bc6bf406b2b723b4351
2021-06-16 11:45:49 +00:00
TreeHugger Robot
3cc252d005
Merge "Fix the issue of permanent loading when Wi-Fi is disabled" into sc-dev am: 1803aead52
am: f8c5e7357e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980888
Change-Id: I6339d4a88eff6e0f219e53933185372a391c9208
2021-06-16 11:45:45 +00:00
TreeHugger Robot
815ec73249
Merge "Add One-handed mode entry point in a11y system controls" into sc-dev am: 1da2a5390a
am: 1f0a69cdf2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980884
Change-Id: If9b9161efd6e49f0c980c6e54fee70c99133a58c
2021-06-16 11:45:41 +00:00
TreeHugger Robot
4d4105462a
Merge "Fix the toggle button flicker problem when display" into sc-dev am: c0b23b03c3
am: 49d52d14fe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14819349
Change-Id: I6bedc054eb5bbc6c21ee7b3e528c11805db1e944
2021-06-16 11:45:36 +00:00
Stanley Wang
2773b42560
Merge "Fix the problem that the "Turn off SIM" dialog will be displayed when the MobileNetwork page is slid to to top." into sc-dev am: d0adfa7b3e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964824
Change-Id: I9425dd8d67aa65b90ea6ccc080a305d1bd263dcf
2021-06-16 11:45:05 +00:00
TreeHugger Robot
b48c3f5aa6
Merge "Fix the issue of permanent loading when Wi-Fi is disabled" into sc-dev am: 1803aead52
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980888
Change-Id: I7c1501692a5d09bd4fad1369ac50eb7c6f9d7f2a
2021-06-16 11:44:59 +00:00
TreeHugger Robot
b848c52f5b
Merge "Add One-handed mode entry point in a11y system controls" into sc-dev am: 1da2a5390a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980884
Change-Id: I79f741d31a30c68bdabafee75ff9d10d9ec523d8
2021-06-16 11:44:52 +00:00
Stanley Wang
6cb273d8c6
Merge "Fix the problem that the "Turn off SIM" dialog will be displayed when the MobileNetwork page is slid to to top." into sc-dev am: d0adfa7b3e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964824
Change-Id: I85f08d862bda5f21886c7ac418fdc2120e21a91b
2021-06-16 11:42:20 +00:00
TreeHugger Robot
f8c5e7357e
Merge "Fix the issue of permanent loading when Wi-Fi is disabled" into sc-dev am: 1803aead52
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980888
Change-Id: Ie01368e09f786bee4420d6cf87d0b59cc5420834
2021-06-16 11:42:15 +00:00
Stanley Wang
d0adfa7b3e
Merge "Fix the problem that the "Turn off SIM" dialog will be displayed when the MobileNetwork page is slid to to top." into sc-dev
2021-06-16 11:42:00 +00:00
TreeHugger Robot
1803aead52
Merge "Fix the issue of permanent loading when Wi-Fi is disabled" into sc-dev
2021-06-16 11:38:32 +00:00
TreeHugger Robot
1f0a69cdf2
Merge "Add One-handed mode entry point in a11y system controls" into sc-dev am: 1da2a5390a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980884
Change-Id: I85a955f48cadecb0a641caaa5a79fce460a21ba1
2021-06-16 11:38:01 +00:00
TreeHugger Robot
1da2a5390a
Merge "Add One-handed mode entry point in a11y system controls" into sc-dev
2021-06-16 11:35:43 +00:00
TreeHugger Robot
49d52d14fe
Merge "Fix the toggle button flicker problem when display" into sc-dev am: c0b23b03c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14819349
Change-Id: I5a6cd20b1d624d151a052e0898fe072d73acef33
2021-06-16 11:33:09 +00:00
TreeHugger Robot
bf2fae3df5
Merge "Fix the toggle button flicker problem when display" into sc-dev am: c0b23b03c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14819349
Change-Id: I7ec1c5fe717c5103dcb43fe48672724bc2abba77
2021-06-16 11:32:06 +00:00
TreeHugger Robot
c0b23b03c3
Merge "Fix the toggle button flicker problem when display" into sc-dev
2021-06-16 11:19:22 +00:00
TreeHugger Robot
643dd586d6
Merge "Fix testGetDeviceOwnerDisclosure test case fail" into sc-dev am: bcc49f1fe0
am: 6976661295
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980886
Change-Id: I3d87afb4201315d3347fa0514f430948bafda32f
2021-06-16 10:31:53 +00:00
TreeHugger Robot
79e3d3c156
Merge "Fix testGetDeviceOwnerDisclosure test case fail" into sc-dev am: bcc49f1fe0
am: e0614a8c35
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980886
Change-Id: I9d3254a81dab1a5a77b9c26c0e9a825b78a756e3
2021-06-16 10:31:13 +00:00
TreeHugger Robot
e0614a8c35
Merge "Fix testGetDeviceOwnerDisclosure test case fail" into sc-dev am: bcc49f1fe0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980886
Change-Id: Ideba77ce284efcd846339b0628af19a165b0a2b7
2021-06-16 10:14:46 +00:00
TreeHugger Robot
6976661295
Merge "Fix testGetDeviceOwnerDisclosure test case fail" into sc-dev am: bcc49f1fe0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980886
Change-Id: I6b0d8fe110983769365aad5369173ff6e23bb02e
2021-06-16 10:14:03 +00:00
TreeHugger Robot
bcc49f1fe0
Merge "Fix testGetDeviceOwnerDisclosure test case fail" into sc-dev
2021-06-16 10:06:12 +00:00
Alex Johnston
2934694c28
Merge "RequestManageCredentials foldable view" into sc-dev am: 71786f9775
am: 8c310ec84f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964381
Change-Id: I2a9931df2b3ce31e1e68bcccd296f15941c53114
2021-06-16 09:57:00 +00:00
Stanley Wang
c03d18336f
Merge "Update the illustrations to Lottie format." into sc-dev am: 51308300ef
am: cd70ac2a5a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934762
Change-Id: I77154a4e8475cc06d2f06e80a170b251acea1c3e
2021-06-16 09:56:31 +00:00
Alex Johnston
762d6c4e0a
Merge "RequestManageCredentials foldable view" into sc-dev am: 71786f9775
am: 96dfbcc3b0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964381
Change-Id: I8dee17f181affa6454b75994398fe75bfc24c469
2021-06-16 09:56:14 +00:00
Stanley Wang
b603233c78
Merge "Update the illustrations to Lottie format." into sc-dev am: 51308300ef
am: 5da70e5205
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934762
Change-Id: I8347504e29bec4191c44c5cd014d15c545794873
2021-06-16 09:55:38 +00:00