Commit Graph

84174 Commits

Author SHA1 Message Date
Kholoud Mohamed
27b3a2e49f Merge "Fix failing tests" into sc-dev am: 4ee8d6de71 am: 8cb66ec54a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14881549

Change-Id: I63ee5dd9bd18dea1b6aa80d099bd5957e811feea
2021-06-10 09:30:57 +00:00
Kholoud Mohamed
e510d72376 Merge "Fix failing tests" into sc-dev am: 4ee8d6de71 am: a36537b7a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14881549

Change-Id: I2af50a9e87d7cd2b642b790ddb19dc64f6296ecb
2021-06-10 09:26:44 +00:00
Kholoud Mohamed
8cb66ec54a Merge "Fix failing tests" into sc-dev am: 4ee8d6de71
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14881549

Change-Id: I0b741d1d91b78d722e275516ef11c4b69d88ab91
2021-06-10 09:13:23 +00:00
Kholoud Mohamed
a36537b7a5 Merge "Fix failing tests" into sc-dev am: 4ee8d6de71
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14881549

Change-Id: I8a1378d044ef9f5fe8927113456a7168975dc06c
2021-06-10 09:12:03 +00:00
Kholoud Mohamed
4ee8d6de71 Merge "Fix failing tests" into sc-dev 2021-06-10 08:55:12 +00:00
TreeHugger Robot
eaad00b30e Merge "Remove FLAG_ACTIVITY_NEW_TASk when there is transition" into sc-dev am: 970e76fd59 am: 8c4a1e129a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880238

Change-Id: I7cb870e05f5c5c3eb5ed4dadd289fe8dcdd7164d
2021-06-10 08:13:24 +00:00
TreeHugger Robot
f429b0d997 Merge "Remove FLAG_ACTIVITY_NEW_TASk when there is transition" into sc-dev am: 970e76fd59 am: 7dd56aaa7b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880238

Change-Id: Ie1215b366eaabfd35c3d1080b977b93897371a68
2021-06-10 08:12:39 +00:00
TreeHugger Robot
7dd56aaa7b Merge "Remove FLAG_ACTIVITY_NEW_TASk when there is transition" into sc-dev am: 970e76fd59
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880238

Change-Id: Ia28bb9746cb2b77a856d9ee90ab2132dcf57d07f
2021-06-10 08:02:21 +00:00
TreeHugger Robot
8c4a1e129a Merge "Remove FLAG_ACTIVITY_NEW_TASk when there is transition" into sc-dev am: 970e76fd59
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880238

Change-Id: I82055f3fba3ba7101a3c51a1f5feba4db153bb1b
2021-06-10 08:00:59 +00:00
TreeHugger Robot
a3502057c6 Merge "Fix broken tests for main clear pages" into sc-dev am: 554eaf72b0 am: bf101173ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14912505

Change-Id: I5b5134520cd5cd8dcf4a0c5b6a78861843c1666f
2021-06-10 07:56:27 +00:00
TreeHugger Robot
53055d6ac1 Merge "Fix broken tests for main clear pages" into sc-dev am: 554eaf72b0 am: f33d9d4b39
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14912505

Change-Id: I4170054d7d6c09ab189bfdea8d354bbf75344d53
2021-06-10 07:51:56 +00:00
TreeHugger Robot
970e76fd59 Merge "Remove FLAG_ACTIVITY_NEW_TASk when there is transition" into sc-dev 2021-06-10 07:47:29 +00:00
TreeHugger Robot
bf101173ad Merge "Fix broken tests for main clear pages" into sc-dev am: 554eaf72b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14912505

Change-Id: I455e74f27cf2b67cb7227c9e7a44262a96b395f6
2021-06-10 07:39:13 +00:00
TreeHugger Robot
f33d9d4b39 Merge "Fix broken tests for main clear pages" into sc-dev am: 554eaf72b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14912505

Change-Id: I5a3b240ac57a0e507acfd8a57955bcca87be63fb
2021-06-10 07:37:47 +00:00
TreeHugger Robot
554eaf72b0 Merge "Fix broken tests for main clear pages" into sc-dev 2021-06-10 07:22:38 +00:00
Peter_Liang
3e06c2e599 Update the Lottie images for Accessibility features.
Features:
1.Magnification
2.Color Inversion

Bug: 188625240
Test: manual test
Change-Id: I51c1c230d5f230eb3d933c98253f0d9d2bf30d37
2021-06-10 14:53:39 +08:00
Peter_Liang
db1d3d2a47 Update the material next style for AnimatedImagePreference.
Bug: 179451422
Test: manual test
Change-Id: I7c54a1bddb26a4f5039e1ce543866d9dbd16da3b
2021-06-10 14:53:24 +08:00
Dmitri Plotnikov
1afe9c0ddc Fix missing time-in-foreground and time-in-background for some apps
The gist of the issue is that many apps have two UIDs associated
with them: a regular, "real" UID, e.g. 10123, and a shared group GID,
e.g. 50123, which is used for multiuser support.

Prior to this fix, the code in BatteryAppListPreferenceController,
would go over the list of all UidBatteryConsumers and would randomly
encounter either the "real" UID or the shared GID for each app first.
The UidBatteryConsumer for a shared GID does not have all of the
properties of the real UID, so some information, such as
time-in-foreground and time-in-background would be lost with
a high probability.

After this fix, we process "real" UIDs before shared GIDs ensuring
that time-in-* and other properties such as package names are obtained
for the real UID.  When we later encounter a shared GID for the same app,
we just add the consumed power and time-in-* durations to the real UID's
BatteryEntry.

Bug: 188656360
Test: make RunSettingsRoboTests
Test: make RunSettingsGoogleRoboTests
Change-Id: I4bfea813ac5eb8f866804b2c4a9153eb877fb325
2021-06-10 05:58:15 +00:00
TreeHugger Robot
486340906a Merge "Fix shifting problem in location services page" into sc-dev am: c547c43977 am: 555fb90e50
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14912504

Change-Id: Ib94283b0344caa97e9f2f79d3da3912b1a464312
2021-06-10 05:54:14 +00:00
TreeHugger Robot
89d6453656 Merge "Fix shifting problem in location services page" into sc-dev am: c547c43977 am: 3d8e18d905
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14912504

Change-Id: I49763abe87f131e57015062f2e48dc7c7ddf2118
2021-06-10 05:53:23 +00:00
TreeHugger Robot
3d8e18d905 Merge "Fix shifting problem in location services page" into sc-dev am: c547c43977
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14912504

Change-Id: If31b1742df8cbb89b884bb1e436c1d4829bc4478
2021-06-10 05:42:16 +00:00
TreeHugger Robot
555fb90e50 Merge "Fix shifting problem in location services page" into sc-dev am: c547c43977
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14912504

Change-Id: I14c94ab95a3f6148900c9858a759789efef117d5
2021-06-10 05:41:00 +00:00
TreeHugger Robot
c547c43977 Merge "Fix shifting problem in location services page" into sc-dev 2021-06-10 05:25:16 +00:00
Tom Hsu
0a5aee68d1 Merge "[Settings] Disable gear button if user is not admin." into sc-dev am: a2a570f60b am: 96c1ff8d06
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14819346

Change-Id: I539ded93087bf650cf186773f8d0edc83d609145
2021-06-10 04:30:30 +00:00
Tom Hsu
95f6c8814c Merge "[Settings] Resolves unsynced infomation between status bar and settings" into sc-dev am: 8974f99365 am: b235d51559
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14877595

Change-Id: I8dc30621559cefabff8790dad3f2b4c16309c8fe
2021-06-10 04:30:15 +00:00
Tom Hsu
db544a358a Merge "[Settings] Disable gear button if user is not admin." into sc-dev am: a2a570f60b am: 6466893bf1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14819346

Change-Id: I8892e6239eda1ae90ebe9bbd2483765439e5ce1c
2021-06-10 04:29:31 +00:00
Tom Hsu
4787f78598 Merge "[Settings] Resolves unsynced infomation between status bar and settings" into sc-dev am: 8974f99365 am: 57e089e385
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14877595

Change-Id: Icbce9f4ded7a2ed874c5861b9290a90df6ca3fdd
2021-06-10 04:29:22 +00:00
Tom Hsu
6466893bf1 Merge "[Settings] Disable gear button if user is not admin." into sc-dev am: a2a570f60b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14819346

Change-Id: I2afd628b39c4bd855345a69cc9da19a854bf31aa
2021-06-10 04:13:04 +00:00
Tom Hsu
57e089e385 Merge "[Settings] Resolves unsynced infomation between status bar and settings" into sc-dev am: 8974f99365
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14877595

Change-Id: I48f3dceb4d356dfb28fe210fb60404577f390b24
2021-06-10 04:12:53 +00:00
Tom Hsu
96c1ff8d06 Merge "[Settings] Disable gear button if user is not admin." into sc-dev am: a2a570f60b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14819346

Change-Id: Ib263e0b74e2b5708c7723f6bc8498e2c9dd712e5
2021-06-10 04:11:52 +00:00
Tom Hsu
b235d51559 Merge "[Settings] Resolves unsynced infomation between status bar and settings" into sc-dev am: 8974f99365
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14877595

Change-Id: I06726069d5e99e2b4870c32d17718df0819cfb47
2021-06-10 04:11:38 +00:00
Tom Hsu
a2a570f60b Merge "[Settings] Disable gear button if user is not admin." into sc-dev 2021-06-10 04:00:12 +00:00
Tom Hsu
8974f99365 Merge "[Settings] Resolves unsynced infomation between status bar and settings" into sc-dev 2021-06-10 03:58:00 +00:00
Tsung-Mao Fang
cbf5ccab0e Fix shifting problem in location services page
Controller generates the injection location settings
in updateState() which happens in onResume.
That's the primary reason why we observed the shifting issue.

In a good practice, we generate preference in displayPreference(),
and then update the setting state in updateState().

In this cl, we create a base controller class to encapsulate
most implementation, and developer need to inject location
services in child class.

Test: Add work profile, and see correct services list.
Bug: 183169265
Change-Id: I5735ba974da87ad83b56791abd8a8637c2317571
2021-06-10 11:26:23 +08:00
TreeHugger Robot
03e99d367a Merge "Adjust size/position of face education illustrations" into sc-dev am: 0a111093bd am: f6d3b406b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14922977

Change-Id: I0d9fd139271b81328d3e57f9fcdd2e9e33ebe5fb
2021-06-10 02:21:43 +00:00
TreeHugger Robot
0f31f9bd84 Merge "Adjust size/position of face education illustrations" into sc-dev am: 0a111093bd am: 6eb29afaff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14922977

Change-Id: I0ab191970421bf313ef8588673859eb43b5cfeb2
2021-06-10 02:21:11 +00:00
TreeHugger Robot
6eb29afaff Merge "Adjust size/position of face education illustrations" into sc-dev am: 0a111093bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14922977

Change-Id: I4c4ee05dadd5f705549fb602977127f17814e277
2021-06-10 02:04:17 +00:00
TreeHugger Robot
f6d3b406b4 Merge "Adjust size/position of face education illustrations" into sc-dev am: 0a111093bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14922977

Change-Id: I29eb0e6131cb2d861b29f1f48ef749f727ef26b6
2021-06-10 02:02:16 +00:00
TreeHugger Robot
0a111093bd Merge "Adjust size/position of face education illustrations" into sc-dev 2021-06-10 01:38:21 +00:00
Curtis Belmonte
2f2acef17a Adjust size/position of face education illustrations
Increase the size of the Lottie animation and adjust the margins of both
illustrations shown on the Face Unlock enrollment education screen.

Test: Start face enroll, press accessibility button on education screen

Fixes: 189725079
Change-Id: I40fc174c2ae574ed1a2919e8fab8a62ce90c8d0e
2021-06-09 17:31:56 -07:00
Abel Tesfaye
384bed509c Fix battery saver not disabling adaptive sleep switch
Test: locally with flame

Bug: 189900026
Change-Id: I1f0bc5eb1cd021f1eb8526c020f772ce0dd96da0
2021-06-09 23:11:57 +00:00
Curtis Belmonte
a819e28549 Merge "Remove intro text from Face Unlock Settings screen" into sc-dev am: ac84b879dc am: 4f9906769e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14922390

Change-Id: I27e2f8eac3c068ce2663afdb23c3a79915ddaba5
2021-06-09 22:12:21 +00:00
Curtis Belmonte
17dd91093e Merge "Remove intro text from Face Unlock Settings screen" into sc-dev am: ac84b879dc am: 5c440f729b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14922390

Change-Id: I807713a3dd188658093408cc64620079cfd2a6b1
2021-06-09 22:11:29 +00:00
Curtis Belmonte
5c440f729b Merge "Remove intro text from Face Unlock Settings screen" into sc-dev am: ac84b879dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14922390

Change-Id: Ice2a7a3b1a9252c1e1ffda770fab41d4bc7e6785
2021-06-09 21:54:19 +00:00
Curtis Belmonte
4f9906769e Merge "Remove intro text from Face Unlock Settings screen" into sc-dev am: ac84b879dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14922390

Change-Id: I487a6d0dd1bdfb331c765b2e75b8d784bbc22e79
2021-06-09 21:52:51 +00:00
Curtis Belmonte
ac84b879dc Merge "Remove intro text from Face Unlock Settings screen" into sc-dev 2021-06-09 21:41:19 +00:00
Joshua Mccloskey
6ac51192f1 Merge "BiometricEnrollIntroduction button update" into sc-dev am: cc9a251082 am: 115302057b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14909536

Change-Id: I5f26fb6fac4a8e8445cc8ac6bd3ba1ff521fc51c
2021-06-09 20:52:35 +00:00
Joshua Mccloskey
3bf8a7a7fc Merge "BiometricEnrollIntroduction button update" into sc-dev am: cc9a251082 am: 62f05dc807
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14909536

Change-Id: I0623606273aaaabbe855571256d86586e655047e
2021-06-09 20:52:04 +00:00
Joshua Mccloskey
62f05dc807 Merge "BiometricEnrollIntroduction button update" into sc-dev am: cc9a251082
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14909536

Change-Id: I267821d5a9088792f57d6731b646ac94f1bcc8bc
2021-06-09 20:33:28 +00:00
Joshua Mccloskey
115302057b Merge "BiometricEnrollIntroduction button update" into sc-dev am: cc9a251082
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14909536

Change-Id: I59c751047daa2028b1c6baaf2a2f9260e3d58e3d
2021-06-09 20:31:58 +00:00