Commit Graph

83533 Commits

Author SHA1 Message Date
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
581789b298 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: I87ab04ff14db933b54a23348a6ce661d5d1d3d80
2021-06-10 13:11:28 +00:00
Edgar Wang
aeb2c1d8fa Merge "Moving progressBarHorizontalStyle to SettingsLib" into sc-dev 2021-06-10 12:56:21 +00:00
YUKAI HUNG
bf24efb721 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: I22b5e6c7e2a0eaaa31fdda2adf60a2aa1ad60dbf
2021-06-10 12:30:59 +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
892e1d5dcc 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: Ia9915695d981d9f7249ce86948832700590112e1
2021-06-10 09:50:30 +00:00
Alex Johnston
6a1fd88860 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: Ie8ab9ae28855e7b1c5498a2e02d28c4925325044
2021-06-10 09:50:25 +00:00
Alex Johnston
12a4f45c57 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: Ieda17041b5818f632c0586800d4cc98b3ff15974
2021-06-10 09:50:17 +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
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
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
970e76fd59 Merge "Remove FLAG_ACTIVITY_NEW_TASk when there is transition" into sc-dev 2021-06-10 07:47:29 +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
Mill Chen
491bc21fd4 Remove the duplicated skip lock screen setting
Fix: 187366696
Test: robotests
Change-Id: I063ef7c1a43e16aee6d141389896cadecfd3738f
2021-06-10 14:20:44 +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
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
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
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
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
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
Joshua Mccloskey
cc9a251082 Merge "BiometricEnrollIntroduction button update" into sc-dev 2021-06-09 20:11:48 +00:00
TreeHugger Robot
9f76510d0f Merge "Apply android accent color" into sc-dev am: 40f65961a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14918673

Change-Id: I1a08bc2ecf340a8a5dfe906bf19a7b35a6308587
2021-06-09 19:36:14 +00:00
TreeHugger Robot
40f65961a2 Merge "Apply android accent color" into sc-dev 2021-06-09 19:12:14 +00:00
Julia Reynolds
c0e361ba79 Merge "Update method name" into sc-dev am: a2c2889c78
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14919903

Change-Id: Iaedb06a7d862f708af1ba1139f17a648d74ace4e
2021-06-09 18:02:33 +00:00
Curtis Belmonte
f097ad4100 Remove intro text from Face Unlock Settings screen
Removes the intro text from the top of the Face Unlock Settings screen,
since it is now redundant with the help text shown in the footer of this
screen.

Test: Open Face Unlock Settings, ensure intro text is gone

Fixes: 190622232
Change-Id: Ie7880a2e5b1405bf1298e3b9160b7d534fabd1c2
2021-06-09 10:59:06 -07:00
Julia Reynolds
a2c2889c78 Merge "Update method name" into sc-dev 2021-06-09 17:33:23 +00:00
TreeHugger Robot
5ccaa61a2f Merge changes from topic "free_up_space_card_preference" into sc-dev am: a23533cbdd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14909652

Change-Id: I181cc7e6385a87f40d8632db84e98f4e9b279206
2021-06-09 17:04:12 +00:00
TreeHugger Robot
a23533cbdd Merge changes from topic "free_up_space_card_preference" into sc-dev
* changes:
  Tweak UI of CardPreference and ContextualCard
  'Free up space' uses CardPreference
2021-06-09 16:45:54 +00:00
Sunny Shao
20efc0ce3e Fix button is not fully rounded corner issue am: d769667e09
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880641

Change-Id: I5bb8d0590937d8544cc0eaf50705314d4bfdad07
2021-06-09 15:41:23 +00:00
kholoud mohamed
be0a96bd23 Fix failing tests
Fixed failing tests in InteractAcrossProfilesDetailsTest and removed
unused code in InteractAcrossProfilesSettingsTest.

Test: atest com.android.settings.applications.specialaccess.interactacrossprofiles.InteractAcrossProfilesDetailsTest
Test: atest com.android.settings.applications.specialaccess.interactacrossprofiles.InteractAcrossProfilesSettingsTest
Fixes: 190186823
Change-Id: I52c498b9eb9c09401548e557770cd6434de49a2c
2021-06-09 14:11:56 +00:00