Treehugger Robot
2c2a56b7cc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 97bc1fcff7 -s ours am: 7c2ed6be16 -s ours am: b07d67eeaf -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1519229
Change-Id: Iad49ac4afe76b8c35934414fe6db8eec566d22e3
2020-12-06 16:20:44 +00:00
Treehugger Robot
b07d67eeaf
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 97bc1fcff7 -s ours am: 7c2ed6be16 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1519229
Change-Id: I719c254b4796c4dd1d53dc30e0f53d63b3e75fce
2020-12-06 16:06:01 +00:00
Treehugger Robot
7c2ed6be16
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 97bc1fcff7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1519229
Change-Id: I215cb3c7612b323dd67437d31dfee850b8a12227
2020-12-06 15:48:44 +00:00
Treehugger Robot
97bc1fcff7
Merge "Import translations. DO NOT MERGE ANYWHERE"
2020-12-06 15:36:04 +00:00
Bill Yi
10caa304c0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6e8d356f279ba834c5493badcb5a0f8e7b916c6c
2020-12-06 12:37:23 +00:00
Bonian Chen
ac77c237d8
Merge "[Settings][Test] Fix Junit test failure - MobileNetworkSwitchControllerTest"
2020-12-06 01:46:32 +00:00
TreeHugger Robot
9f27b4d633
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 448ec6b5fe -s ours am: 8e913664b5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13168703
Change-Id: Ieec85d570818e565a2d0c2bd6f4d9fe4eb5f7941
2020-12-05 02:08:21 +00:00
TreeHugger Robot
8e913664b5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 448ec6b5fe -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13168703
Change-Id: Id2a91ce9acfc651d32f9a3ca46f52612a8904eb7
2020-12-05 01:55:42 +00:00
TreeHugger Robot
448ec6b5fe
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2020-12-05 01:04:28 +00:00
Bill Yi
47416e4fde
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d890249a20 -s ours am: d582948ff6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13168705
Change-Id: If1e7a719cbe03f43b12a87a6b2eefe7d7c31315f
2020-12-05 00:18:28 +00:00
Bill Yi
d582948ff6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d890249a20 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13168705
Change-Id: Ibdf3ca3e032c9eba6d58bfca5409556ede8d15e7
2020-12-05 00:10:24 +00:00
Bonian Chen
eaabc5969e
[Settings][Test] Fix Junit test failure - MobileNetworkSwitchControllerTest
...
android.test.UiThreadTest has been deprecated.
This is a change migrate it into androidx.test.annotation.UiThreadTest
Bug: 174832214
Change-Id: I38f35e7602a269a018510723c199a7259d704b4e
Test: atest -c MobileNetworkSwitchControllerTest
2020-12-04 12:51:10 +00:00
Bill Yi
d890249a20
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I106d32515484c4ad081b1a0bc2bf01d79b5097ad
2020-12-04 03:58:02 -08:00
Bill Yi
d0f3a4ca19
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2d0e585779a9e28de3aeb1eb8ca3246a09b717d4
2020-12-04 03:09:46 -08:00
Wesley.CW Wang
1f8853d37b
Update Settings Battery Defender strings am: 45a02ee994 am: 15cad1e712
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13146801
Change-Id: Ifc196dd2f2e3b381186aed5276ab74dd5d23cbd5
2020-12-04 04:11:10 +00:00
Wesley.CW Wang
15cad1e712
Update Settings Battery Defender strings am: 45a02ee994
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13146801
Change-Id: I9b6d03d465b981e13da2f056680d04f6f4f3ec6e
2020-12-04 03:39:03 +00:00
Kevin Chyn
edb5aab5b9
Merge changes I7cdf5fc4,I701baf06
...
* changes:
Start udfps enroll after activity animates in
Update portrait enrollment for UDFPS
2020-12-03 19:18:58 +00:00
Wesley.CW Wang
45a02ee994
Update Settings Battery Defender strings
...
Bug: 172794045
Test: make SettingsRoboTests
Change-Id: Ia9612fe891431869dc8e84e78db952ac8f1ab3dc
2020-12-03 19:00:44 +00:00
TreeHugger Robot
0c114e5c58
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: ec47b9a783 -s ours am: 1710016924 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13161901
Change-Id: I5a38a20ebe422f734564c7ac2eec228502fd066f
2020-12-03 18:08:35 +00:00
TreeHugger Robot
1710016924
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: ec47b9a783 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13161901
Change-Id: I2cb6d59d77c7d4671660f064f492f3337a176709
2020-12-03 17:18:05 +00:00
TreeHugger Robot
ec47b9a783
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2020-12-03 16:51:46 +00:00
Bill Yi
4b1662623a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ied07776386dcf321cb8405f5f972bc792b696da4
2020-12-03 14:54:31 +00:00
Alex Johnston
25cca45c09
Merge "Add credential management app preference to Settings"
2020-12-03 10:00:27 +00:00
TreeHugger Robot
e08936a25b
Merge "Show Floating action button to request manage credentials"
2020-12-03 09:02:21 +00:00
Alex Johnston
672c2aaaec
Add credential management app preference to Settings
...
Background
* This is part of the work to support
a credential management app on
unmanaged devices.
Changes
* Add a preference controller which will only
be enabled if there is a credential management app.
* Add a fragment to display details on the credential
management app and its policy. Add a remove button
to remove the credential management app.
* Link CredentialManagementAppAdapter to new fragment
and add expander.
Manual Testing
* Verify preference is disabled if there is no credential
management app.
* Verify preference summary shows credential mangement
app name if a credential management app exists.
* Verify fragment details page displays the
authentication policy correctly.
Bug: 165641221
Test: Manual testing
make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.security.CredentialManagementAppFragmentTest
make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.security.CredentialManagementAppControllerTest
Change-Id: I06d6b88d0c89022f7a6cbf3031834defcb54bd51
2020-12-03 07:23:50 +00:00
Xin Li
c7c1c6d15b
[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: cec81e3030 -s ours am: b23c8335fb -s ours
...
am skip reason: Change-Id Iafcefc2aa64cf3c50b1d139ec0204a315be29da7 with SHA-1 159de41477 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13122824
Change-Id: Ibe781c52461200cffa1a43174e81a709ff9f2c8b
2020-12-03 04:39:37 +00:00
Xin Li
b23c8335fb
[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: cec81e3030 -s ours
...
am skip reason: Change-Id Iafcefc2aa64cf3c50b1d139ec0204a315be29da7 with SHA-1 159de41477 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13122824
Change-Id: I63b84242c8f858bb3abd3d04a64ccb3e3db8d3ac
2020-12-03 04:25:17 +00:00
John Li
e986314b06
Merge "Add haptic effect for the seekbar in Settings 5/n."
2020-12-03 02:14:37 +00:00
TreeHugger Robot
f7d2ec9e7a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 084b1e0ece -s ours am: 473d899903 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13154699
Change-Id: Id250720314ccad3f65cde04ed3e70d68bfa5fdb2
2020-12-02 19:02:02 +00:00
Bill Yi
9fbbf4c2e9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a86f4b1fc8 -s ours am: b6bb945dac -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13153923
Change-Id: Ifc32e9cc6d42dd645a488ba0184a9bfc848031ba
2020-12-02 19:01:02 +00:00
TreeHugger Robot
473d899903
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 084b1e0ece -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13154699
Change-Id: Ibe505474c923eb2a548f1516387ec3cde4cfb549
2020-12-02 18:31:24 +00:00
Bill Yi
b6bb945dac
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a86f4b1fc8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13153923
Change-Id: I30ebedab39bbe054f5cfc1e5d2983079be268fe6
2020-12-02 18:31:16 +00:00
TreeHugger Robot
084b1e0ece
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2020-12-02 17:33:31 +00:00
Alex Johnston
a12b402f36
Show Floating action button to request manage credentials
...
Background
* This is part of the work to support
a credential management app on
unmanaged devices.
Changes
* Show FAB for detailed/long manage credentials
authentication policy.
* Hide FAB for short manage credentials
authentication policy.
* Unexpand FAB once the user start starts
scrolling.
* Hide FAB once the user has scrolled to
the bottom.
Manual Testing
* Verify FAB is shown for a detailed/long policy:
https://screenshot.googleplex.com/BUb4LGz3GD6AozS
* Verify FAB is hidden for a short policy
* Verify FAB is hidden when user has scrolled to the
bottom:
https://screenshot.googleplex.com/6FQRqto3r3jzfXH
* Verify FAB is unexpanded (text hidden)
when the users start scrolling:
https://screenshot.googleplex.com/4FfAt5MsCfrAwQK
Bug: 165641221
Test: Manual Testing
make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.security.RequestManageCredentialsTest
Change-Id: Ied2ef726ad4dcc3f92c20249f80294f0a3071a8a
2020-12-02 17:17:12 +00:00
Lucas Dupin
0fb6330904
Merge "Use theme color instead of fixed one"
2020-12-02 15:59:56 +00:00
John Li
a6db5b754f
Merge "Add haptic effect for the seekbar in Settings 4/n."
2020-12-02 12:34:33 +00:00
Bill Yi
def7fc914e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id901b94be193bb820bf90a645d7c716497af96dc
2020-12-02 00:31:42 -08:00
Xin Li
cec81e3030
Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855
...
Bug: 172690556
Merged-In: Iafcefc2aa64cf3c50b1d139ec0204a315be29da7
Change-Id: I5d4e70fe723d890b5694c3490d6ec841b1ac596e
2020-12-02 00:29:15 -08:00
Bill Yi
a86f4b1fc8
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I91b4abf5fc6aa17632203a700fbc0306a231bdf0
2020-12-01 23:44:15 -08:00
John Li
424a15fc99
Merge "Add haptic effect for the seekbar in Settings 3/n."
2020-12-02 05:59:28 +00:00
Kevin Chyn
201f027586
Start udfps enroll after activity animates in
...
1) Do not request enrollment until activity animation is complete
2) Do not show fingerprint icon until activity animation is complete
Bug: 171353506
Test: manual
Change-Id: I7cdf5fc4888e35c0a7ba38ea622ae9f3fe1a3abf
2020-12-01 18:17:16 -08:00
Kevin Chyn
b07e2dbfd3
Update portrait enrollment for UDFPS
...
Bug: 171353506
Test: No effect on existing devices
Change-Id: I701baf06bf3defde78af50eff5c0e01fafeb07cd
2020-12-01 17:01:57 -08:00
Alex Stetson
0d31082631
Merge "Allow extended apps to change package name"
2020-12-01 21:49:16 +00:00
Jason Parks
ff51776ff6
Merge "Launch DO/PO sepecific settings when parental are enabled."
2020-12-01 17:58:45 +00:00
John Li
2ae3b0223b
Merge "Add haptic effect for the seekbar in Settings 2/n."
2020-12-01 10:50:28 +00:00
Eran Messeri
f4e2b05795
Merge "Enforce password complexity in lockscreen setting"
2020-12-01 09:53:08 +00:00
Wesley.CW Wang
9a6aae5006
Add Battery Defender feature to Settings
...
- Reupload CL from ag/13108999 to fix the merge conflict
- Adding new tips of Battery Defender, will be presented once battery is overheated
- Launch Help Center article of battery overheat when clicking Battery Defender tip
Screenshots: https://screenshot.googleplex.com/7jUibTJANgR6UQ6.png
https://screenshot.googleplex.com/tUj2LLi87SfndBN.png
Bug: 172794045
Bug: 173497281
Bug: 173496188
Test: make RunSettingsRoboTests -j40
Change-Id: Ibb106a5d42cdf6232abf9ddf4b3225bdcebccf4a
2020-12-01 16:00:49 +08:00
Treehugger Robot
2cd9bd7fe1
Merge "Makes this class abstract so that Tradefed's automatic search for runnable test classes doesn't get confused by this class." am: 4f8b47e5c2 am: 0cf0f58ceb am: 2112d09ac6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1515029
Change-Id: I98b017509ed0369bafbaa2262699c40c965fd04a
2020-12-01 03:10:27 +00:00
Treehugger Robot
2112d09ac6
Merge "Makes this class abstract so that Tradefed's automatic search for runnable test classes doesn't get confused by this class." am: 4f8b47e5c2 am: 0cf0f58ceb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1515029
Change-Id: I9804a65d41dd36fea23925e62a8958d0808a87c6
2020-12-01 02:57:03 +00:00
Treehugger Robot
0cf0f58ceb
Merge "Makes this class abstract so that Tradefed's automatic search for runnable test classes doesn't get confused by this class." am: 4f8b47e5c2
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1515029
Change-Id: Ib92cfdb77164a7b24e65b2a028f963b606144096
2020-12-01 02:41:37 +00:00