Commit Graph

83405 Commits

Author SHA1 Message Date
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
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
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
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
ac84b879dc Merge "Remove intro text from Face Unlock Settings screen" into sc-dev 2021-06-09 21:41:19 +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
cc9a251082 Merge "BiometricEnrollIntroduction button update" into sc-dev 2021-06-09 20:11:48 +00:00
TreeHugger Robot
1652fde41c 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: I943fe7c1560ad0250edb2fdc79d0cc02503f2de7
2021-06-09 19:30:36 +00:00
TreeHugger Robot
40f65961a2 Merge "Apply android accent color" into sc-dev 2021-06-09 19:12:14 +00:00
Julia Reynolds
6f89dddcc0 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: I4e469fcfc86a3117e094ded36279675341ccd34f
2021-06-09 18:04:04 +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
38bd71ed07 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: I2bb61c9034d31d650ba1e815c6a0f3d0ddbaac47
2021-06-09 17:05:01 +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
997641d20c 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: Iafa9ad7cc80c67b58ad84a717d33caec58552e90
2021-06-09 15:42:55 +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
Julia Reynolds
b70d3d5c13 Update method name
Test: RoboTests
Bug: 184709662
Change-Id: I3a998a151f9647efae00909e2b4f88fa27d645eb
2021-06-09 09:53:09 -04:00
Sunny Shao
d769667e09 Fix button is not fully rounded corner issue
Fixes: 189903078
Test: manual test
Change-Id: I498e2a9050255801c8c2613c4a933d8a713a0d55
2021-06-09 21:42:06 +08:00
Yi-Ling Chuang
e031b6f551 Merge "Suppress Shared Axis transiiton on the SIM dialog" into sc-dev am: 562ad29721
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880642

Change-Id: I7ee7cebf5286051bb20cf3de07dabcf9a1fe0f68
2021-06-09 13:22:09 +00:00
Yi-Ling Chuang
562ad29721 Merge "Suppress Shared Axis transiiton on the SIM dialog" into sc-dev 2021-06-09 13:06:59 +00:00
Zoey Chen
ee2b43c9f1 Merge "[Settings] Fix test failure of WFC group" into sc-dev am: 38b22563f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14912500

Change-Id: I1e71f378cdfb59767153a9363076780c367e7ebb
2021-06-09 11:58:18 +00:00
YUKAI HUNG
6312c7a213 Merge "Resolve locale not update issues in the chart view" into sc-dev am: 4248531508
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14912493

Change-Id: Icf066ed7b1eb33625e2b8fb16565df29b3f07089
2021-06-09 11:58:11 +00:00
Tsung-Mao Fang
27927f3cb7 Apply android accent color
We should add android accent color to get the correct color.

Test: Icons show up in screen lock page. And see correct color in SUW
flow.
Fix: 190582618

Change-Id: I0d1062288228772fa2ea45103512c8e46793ae9d
2021-06-09 19:51:15 +08:00
Zoey Chen
38b22563f8 Merge "[Settings] Fix test failure of WFC group" into sc-dev 2021-06-09 11:43:47 +00:00
YUKAI HUNG
4248531508 Merge "Resolve locale not update issues in the chart view" into sc-dev 2021-06-09 11:43:41 +00:00
PETER LIANG
f2982d3868 Merge changes I99fb2ed2,Iba18bfab into sc-dev am: d2c4944cbb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14823310

Change-Id: I2ffa32fa36681ded8ad2694b39b9cb315ffd56b6
2021-06-09 11:02:48 +00:00
PETER LIANG
d2c4944cbb Merge changes I99fb2ed2,Iba18bfab into sc-dev
* changes:
  Support the lottie image file for the banner in Accessibility Settings.
  Fixing the animation of drawable couldn't play automatically for the banner.
2021-06-09 10:44:10 +00:00
Weng Su
73a6b9f657 Merge "[Provider Model] Fix the panel non responsive issue" into sc-dev am: 635e57bd4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14891919

Change-Id: I5f8a0cbc49cf3c5af4ce3bc19185a6b046bf9d5d
2021-06-09 10:27:45 +00:00
Peter_Liang
3ce3a93e71 Support the lottie image file for the banner in Accessibility Settings.
Action:
Currently, the ImageView component couldn’t handle the lottie image from raw resource folder,  so temporarily using the LottieAnimationView from settingsLib to support lottie image for the banner of Accessibility settings.

Bug: 186065724
Bug: 179451422
Test: atest AnimatedImagePreferenceTest
Change-Id: I99fb2ed26085c73bc262c58001de8dec3078e1d0
2021-06-09 10:11:23 +00:00
Weng Su
635e57bd4e Merge "[Provider Model] Fix the panel non responsive issue" into sc-dev 2021-06-09 10:05:51 +00:00
Mill Chen
81446170b5 Merge "Update the theme to fix background color problem" into sc-dev am: 6a1ff49cb7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14878872

Change-Id: I8acbbbd7188ffb186733c72e64a8d6a0219368ed
2021-06-09 09:49:56 +00:00
Arc Wang
bdb70b1078 Tweak UI of CardPreference and ContextualCard
- CardPreference uses settingslib_preference
  layout to fix title/summary alignment issue.

- Remove stroke for CardPreference and ContextualCard.

- Set colorSurface as default card background color.

Bug: 188599776
Test: manual visual
Change-Id: Id0ee40be60de1f7605849490ee43eae4b9420abb
2021-06-09 17:43:43 +08:00
Mill Chen
6a1ff49cb7 Merge "Update the theme to fix background color problem" into sc-dev 2021-06-09 09:36:04 +00:00
Arc Wang
7b85f2af24 'Free up space' uses CardPreference
For material next style.

Bug: 188599776
Test: make RunSettingsRoboTests ROBOTEST_FILTER=CardPreferenceTest
Change-Id: Ibaf4d11ab44017453498676db00cff1e49c83b9d
2021-06-09 17:35:33 +08:00
Yanting Yang
1e2f161950 Correct the app bar color theme of Digital Assistant app
Fixes: 190450049
Test: visual
Change-Id: Ib3ff19bd8a00060400960fd92060ac7b136fd3d5
2021-06-09 17:20:14 +08:00
Alex Johnston
7db8142435 Credential management app UI tweaks
Credential management app Settings screen
* Add uninstall certificates button
* Reformat summary
* Remove dividing lines
Request manage credentials screen
* Make requesting app name bold

Manual testing
* Install TestDPC and select 'Request to
  manage credentials'
* Verify app name is bold and select allow
* Install a certificate as the cred mng app
  via TestDPC
* Go to Setting > Security > Encryption
  & Credentials > Credential Management App
* Verify screen looks like mocks
* Select 'Remove certificates' and
  verify all certificates installed by the
  cred mng app are removed
Settings screen: https://screenshot.googleplex.com/C6n9bnwkw843jgf
Request screen: https://screenshot.googleplex.com/5qH44NXKKGRsdHs

Bug: 189416800
Test: manual testing
      CredentialManagementAppControllerTest
      CredentialManagementAppFragmentTest
      CredentialManagementAppButtonsControllerTest
      CredentialManagementAppHeaderControllerTest
      RequestManageCredentialsTest
Change-Id: I71334b231ae7cefbc055e2575eda5418da2548b4
2021-06-09 10:13:53 +01:00
Tsung-Mao Fang
0ae249e8c7 Fix broken tests for main clear pages
After ag/14438399, a lot of related tests failed.
Create two overlay layout files in robolectric and add original theme
style back.

It's not perfect, but it didn't affect the behavior of tests,
Tests still can build the views and do the original tests.

Test: Run robo test
Fix: 187819138
Change-Id: I7af0e9e6c61fc204efeea03ec3ca8437aeb2d256
2021-06-09 17:08:07 +08:00
Zoey Chen
ff0c06f20a [Settings] Fix test failure of WFC group
Bug: 190569916
Test: atest NetworkProviderWifiCallingGroupTest
Change-Id: Ie520f3709eb0751150fdbda1f14e878ba21e22c4
2021-06-09 09:07:50 +00:00
ykhung
2a75186e4b Resolve locale not update issues in the chart view
- read locale from configuration rather than Locale.getDefault
- refine 12-24 format to align the current status bar short style
- resolve locale change not update chart percentage label
- extend timestamp label in the chart graph from 4 to 5 labels

Bug: 190150515
Bug: 190422902
Bug: 190226837
Test: make SettingsRoboTests
Change-Id: I5347964900123a6d112dbc37c2af87eb7d73f1d2
2021-06-09 16:11:15 +08:00
Alex Johnston
848a388a71 RequestManageCredentials Material Next Spec
* Update buttons to have rounded corners
  and more padding
* Update text colour of buttons
* Update floating action button background
  and text colour

Manual Testing via TestDPC
* Light mode https://screenshot.googleplex.com/8MxZZjftRFMXJhM
* Dark mode https://screenshot.googleplex.com/3vgWrEJnCbzUdhh
* Floating action button https://screenshot.googleplex.com/5H4nfTWz7sNJJmT
* Landscape

Bug: 189193577
Test: Manual testing
       RequestManageCredentialsTest
Change-Id: Iba8b4b6af655abfdab6216e6042ee222c3f745dd
2021-06-09 08:09:54 +00:00