Commit Graph

82640 Commits

Author SHA1 Message Date
TreeHugger Robot
a7b3e18038 Merge "Correct the app bar color theme of Digital Assistant app" into sc-dev am: efd1c870f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14912508

Change-Id: Id3c6949cd3fe8bc5ab90809dfe4e53f0bf3d6917
2021-06-11 10:04:42 +00:00
TreeHugger Robot
efd1c870f2 Merge "Correct the app bar color theme of Digital Assistant app" into sc-dev 2021-06-11 09:50:43 +00:00
TreeHugger Robot
c379bbc0f9 Merge "Revert "[Provider Model] Replace WiFi panel to Internet panel"" into sc-dev am: 443a3f03ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934751

Change-Id: Id31b32bceb720cee3c11c297c4e8bbe84b83b1af
2021-06-11 06:45:35 +00:00
TreeHugger Robot
443a3f03ab Merge "Revert "[Provider Model] Replace WiFi panel to Internet panel"" into sc-dev 2021-06-11 06:35:02 +00:00
Betty Chang
344f45deb6 Merge "Disable EntityHeaderController animation for item move down issue" into sc-dev am: 8896a0d217
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14928764

Change-Id: I22ad82c4e667a6c5a707dfe5986bd91700798fd3
2021-06-11 03:27:41 +00:00
Betty Chang
8896a0d217 Merge "Disable EntityHeaderController animation for item move down issue" into sc-dev 2021-06-11 03:09:38 +00:00
TreeHugger Robot
f711c010be Merge "[Provider Model] Update the no internet unavailable icon" into sc-dev am: 9faa566ea0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14912503

Change-Id: I21716429a91981e3624159718729f8ea0c2d2ab7
2021-06-11 02:56:54 +00:00
TreeHugger Robot
9faa566ea0 Merge "[Provider Model] Update the no internet unavailable icon" into sc-dev 2021-06-11 02:42:52 +00:00
Yanting Yang
a1487e391b Merge "Left aligned the dropdown list of ManageApplications" into sc-dev am: 391c121920
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934750

Change-Id: Ieb69cbef10b905e1e2b9fc28bb356847a0466b3d
2021-06-11 01:38:47 +00:00
TreeHugger Robot
e1c53b2db1 Merge "Fix Learn more link placement is wrong problem" into sc-dev am: 8dca5ab699
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14928761

Change-Id: Ice1cdf470ac502dcde20db151ffda7b795f669c6
2021-06-11 01:38:37 +00:00
Yanting Yang
391c121920 Merge "Left aligned the dropdown list of ManageApplications" into sc-dev 2021-06-11 01:29:28 +00:00
TreeHugger Robot
8dca5ab699 Merge "Fix Learn more link placement is wrong problem" into sc-dev 2021-06-11 01:23:43 +00:00
TreeHugger Robot
2c40af09e4 Merge "Check in auto rotate settings summary for rotation resolver service" into sc-dev am: ad84b3dd39
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14830090

Change-Id: I7c276b7313261a639746c13d2d678bdd713eeb7e
2021-06-10 19:26:42 +00:00
TreeHugger Robot
ad84b3dd39 Merge "Check in auto rotate settings summary for rotation resolver service" into sc-dev 2021-06-10 18:35:43 +00:00
Abel Tesfaye
5131c691b5 Check in auto rotate settings summary for rotation resolver service
Fixes issue where summary text would not properly describe the state of
camera based auto rotation when permission is missing or when another state is blocking the feature

Bug: 190095500
Test: locally with flame & make RunSettingsRoboTests -j$(nproc) ROBOTEST_FILTER=SmartAutoRotatePreferenceControllerTest
Change-Id: I7609ca87658e08831f3bc37c839f00f63946ddec
2021-06-10 17:31:39 +00:00
Dmitri Plotnikov
b771c4fd3e Merge "Fix missing time-in-foreground and time-in-background for some apps" into sc-dev am: 6c09370c43
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14911672

Change-Id: I6adcaf080d740e208ba339c150218bea9a88b15c
2021-06-10 16:23:29 +00:00
Dmitri Plotnikov
6c09370c43 Merge "Fix missing time-in-foreground and time-in-background for some apps" into sc-dev 2021-06-10 16:10:42 +00:00
Edgar Wang
4bad84cf9b Merge "Moving progressBarHorizontalStyle to SettingsLib" into sc-dev am: aeb2c1d8fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14891915

Change-Id: Ibfba04d2a75f814ed9bd5f8dd25562b1e615d408
2021-06-10 13:12:51 +00:00
Edgar Wang
aeb2c1d8fa Merge "Moving progressBarHorizontalStyle to SettingsLib" into sc-dev 2021-06-10 12:56:21 +00:00
YUKAI HUNG
d971cb22c6 Merge "Ignore the flaky test in the ConvertUtils first to investigate" into sc-dev am: 394211dd75
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14928763

Change-Id: I687efe774f5bbd5334623bcc486ec864f571045a
2021-06-10 12:32:18 +00:00
Weng Su
908d4ffadf Revert "[Provider Model] Replace WiFi panel to Internet panel"
This reverts commit c33f69673a.

Reason for revert: Because Wi-Fi toggle design is rollback, resume the Wi-Fi panel as well.

Bug: 190563749
Merged-In: Ia214ff9abaa7f4f33c485ca9aa72f73749ce7fc3
Change-Id: Ia214ff9abaa7f4f33c485ca9aa72f73749ce7fc3
(cherry picked from commit 368852424c)
2021-06-10 12:23:38 +00:00
YUKAI HUNG
394211dd75 Merge "Ignore the flaky test in the ConvertUtils first to investigate" into sc-dev 2021-06-10 12:18:53 +00:00
Yanting Yang
467c7e81ea Left aligned the dropdown list of ManageApplications
Based on the Android S design, left aligned the dropdown list of
ManageApplications, e.g., All apps, App notifications

Bug: 178774987
Test: visual
Change-Id: I04143798475d20319980396d6bd755193ae2b1f0
2021-06-10 20:18:51 +08:00
Sunny Shao
a6eb37b215 Fix Learn more link placement is wrong problem
- Use the new style of the FooterPreference.

Fixes: 189389674
Test: Robo test
Change-Id: I1529952181cca0eccd18f911eaa265b19dbb97f7
2021-06-10 20:14:56 +08:00
Alex Johnston
2adb28dca2 Merge "RequestManageCredentials Material Next Spec" into sc-dev am: cf5bb13576
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14881531

Change-Id: I28a4a269a20f90c05d3b27ff949056c418954198
2021-06-10 09:51:51 +00:00
Alex Johnston
342d0bb40c Merge "RequestManageCredentials landscape mode" into sc-dev am: 17101d6ebe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14874757

Change-Id: I7f42f564853d7d1113aafb2e1b25866894b038ff
2021-06-10 09:51:45 +00:00
Alex Johnston
58bc189dbf Merge "Credential management app UI tweaks" into sc-dev am: e2f5b87c14
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14817109

Change-Id: I59b98577ce2d981141335ae65dceebd5c691e538
2021-06-10 09:51:38 +00:00
Alex Johnston
cf5bb13576 Merge "RequestManageCredentials Material Next Spec" into sc-dev 2021-06-10 09:38:35 +00:00
Alex Johnston
17101d6ebe Merge "RequestManageCredentials landscape mode" into sc-dev 2021-06-10 09:38:29 +00:00
Alex Johnston
e2f5b87c14 Merge "Credential management app UI tweaks" into sc-dev 2021-06-10 09:38:15 +00:00
changbetty
5a23ca7c21 Disable EntityHeaderController animation for item move down issue
EntityHeaderController include the RecyclerView and it has animation by
default. When RecyclerView do the animation first then update the UI, it
will cause the issue.

Bug: 189071671
Test: manaul test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiDetailPreferenceController2Test

Change-Id: Ieb7e0a8f7658bface9af090ea061ca7265099fcd
2021-06-10 17:37:16 +08:00
ykhung
671405b6d3 Ignore the flaky test in the ConvertUtils first to investigate
Bug: 190689531
Test: make SettingsRoboTests
Change-Id: Icf4fdd98d087f3e693a33d63030bec880648c356
2021-06-10 17:33:08 +08: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
4ee8d6de71 Merge "Fix failing tests" into sc-dev 2021-06-10 08:55:12 +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
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
554eaf72b0 Merge "Fix broken tests for main clear pages" into sc-dev 2021-06-10 07:22:38 +00: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
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
c547c43977 Merge "Fix shifting problem in location services page" into sc-dev 2021-06-10 05:25:16 +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
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
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
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
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