Commit Graph

1987 Commits

Author SHA1 Message Date
Daniel Nishi
5d0888be75 Fix an override filter bug.
The override filter for storage to ensure that we filter by UUID and
user id was designed as an override filter. This worked as long as there
never was any other filters which could be used out of Storage Settings.
It turns out the instant apps filter applies here.

As a result, I've moved these filters into being "composite filters"
which are composed with the primary filter instead of overriding the
primary filter.

Fixes: 35245772
Test: Settings Robotests... but as for the composing part it is
b/34768986

Change-Id: I6f5acb909568ab02e81187c09fdda9533d635781
2017-05-25 14:23:29 -07:00
Fan Zhang
7a98912c94 Update logPackageName() to use new MetricsLogger API
Bug: 38258793
Test: make RunSettingsRoboTests
Change-Id: Id08e5655bdaaf0cabd952b07278cd0daf7b59a3b
2017-05-25 13:51:49 -07:00
TreeHugger Robot
5c4b1f095e Merge "Show setting for work profile lock screen notification" 2017-05-25 20:37:50 +00:00
Lei Yu
e3aefdc320 Merge "Add NPE check for refreshUi" into oc-dev am: 1a8c2dd899
am: 9e56dd44cd

Change-Id: Id487b717c57c211f9a80f584bd518b6b5267d480
2017-05-25 20:21:19 +00:00
Fan Zhang
bfbe45fd95 Reduce flakiess in account preference controller test.
The getDrawable method from AuthenticatorHelper randomly fails and
causes test flake. Replaced with a shadow.

Test: rerun robotests
Change-Id: I39afeb9082a35786a05c0e8e5adc337c850ad666
2017-05-25 13:17:43 -07:00
Lei Yu
9e56dd44cd Merge "Add NPE check for refreshUi" into oc-dev
am: 1a8c2dd899

Change-Id: I1daa1c18a7a938c1e6528aaeda2a3a874b2fe028
2017-05-25 20:07:20 +00:00
Lei Yu
1a8c2dd899 Merge "Add NPE check for refreshUi" into oc-dev 2017-05-25 19:51:14 +00:00
TreeHugger Robot
5452b5474f Merge "Add setIconContentDescription to EntityHeaderController" 2017-05-25 19:45:32 +00:00
Fan Zhang
879f079e04 Show setting for work profile lock screen notification
- Add work profile notification setting to security_lockscreen_setting
- Modify the preference controller to stop hardcode preference keys.

Merged-In: I779590e34c1eca2dab5b62dda473cfa4371fc064
Change-Id: I5966d82f6373b3bf784385423b87fb4d26aecf0e
Fix: 62051309
Fix: 62045663
Test: make RunSettingsRoboTests
2017-05-25 11:49:56 -07:00
Fan Zhang
33c493777b Show setting for work profile lock screen notification
- Add work profile notification setting to security_lockscreen_setting
- Modify the preference controller to stop hardcode preference keys.

cherry-pick of: ag/2315314

Bug: 62051309
Bug: 62045663
Test: make RunSettingsRoboTests
Change-Id: I779590e34c1eca2dab5b62dda473cfa4371fc064
2017-05-25 11:49:10 -07:00
Maurice Lam
ebb8294333 Support find sensor screen with no animation
Some illustration view can manage their own start-stop lifecycle and
doesn't need to be handled by the activity.

Make mAnimation null if the animation is not an instance of
FingerprintFindSensorAnimation.

Test: cd tests/robotests && mma
Bug: 38463695
Change-Id: I41989e5cb0639407f58d9c8edda0eef93adbf2e8
2017-05-25 11:21:16 -07:00
jackqdyulei
f984b1e1ae Sort app list after smeared on screen
Then we could make sure the app list is sorted

Bug: 62035385
Test: RunSettingsRoboTests
Change-Id: I3fa3d6ffc5930cf011e382632143e459fdbc4369
Merged-In: I3fa3d6ffc5930cf011e382632143e459fdbc4369
2017-05-25 10:09:05 -07:00
jackqdyulei
0658dcd6fa Merge "Turn on power accounting in AOSP" into oc-dev am: 0a6d61883c
am: db42779cf1

Change-Id: Ie4db806a166c45a14cd3b8ed69be6405befcb64b
2017-05-25 04:04:47 +00:00
jackqdyulei
db42779cf1 Merge "Turn on power accounting in AOSP" into oc-dev
am: 0a6d61883c

Change-Id: I9204d0b51db9fedbf2f49b5d635e46b221c5d7ea
2017-05-25 04:01:46 +00:00
TreeHugger Robot
0a6d61883c Merge "Turn on power accounting in AOSP" into oc-dev 2017-05-25 03:57:29 +00:00
Fan Zhang
b84b9cc8e7 Merge "Recursively remove preference from screen." into oc-dev am: 7731b4244e
am: 4472d8af83

Change-Id: Ie8835c9789d959ce3d75b84b05d711f976bab56e
2017-05-25 03:28:15 +00:00
Fan Zhang
4472d8af83 Merge "Recursively remove preference from screen." into oc-dev
am: 7731b4244e

Change-Id: Ib3c637bcb4bbd6ded83f626b1b00dff32f9cb12c
2017-05-25 03:25:43 +00:00
TreeHugger Robot
7731b4244e Merge "Recursively remove preference from screen." into oc-dev 2017-05-25 03:22:51 +00:00
Doris Ling
28068990d2 Merge "Listener to tether state change on Network & internet page." into oc-dev am: 1dead24890
am: be520a5f34

Change-Id: I31036a30605036e957b421727833b3a9830e4584
2017-05-25 02:37:59 +00:00
Doris Ling
be520a5f34 Merge "Listener to tether state change on Network & internet page." into oc-dev
am: 1dead24890

Change-Id: Ic64e4f29c2e7124b3e977acb245f0e3e15f84ff6
2017-05-25 02:34:26 +00:00
TreeHugger Robot
1dead24890 Merge "Listener to tether state change on Network & internet page." into oc-dev 2017-05-25 02:25:56 +00:00
TreeHugger Robot
f688c5612c Merge "Sort app list after smeared on screen" 2017-05-25 02:25:41 +00:00
TreeHugger Robot
2cc13a8206 Merge "Migrate settings robolectric tests to mockito 2" 2017-05-25 02:20:37 +00:00
TreeHugger Robot
0965a9ded4 Merge "Set correct uid when loading app icon in data usage UI." 2017-05-25 02:13:13 +00:00
Antony Sargent
ff8e3e7bde Add setIconContentDescription to EntityHeaderController
This lets us set a contentDescription on the icon in entity headers
for accessibility.

Bug: 62068874
Test: make RunSettingsRoboTests
Change-Id: I1af7aad34aa65b616cf4edb8b144f315040a9fdd
2017-05-24 17:21:58 -07:00
jackqdyulei
0b83954f1c Add NPE check for refreshUi
The reason for NPE is that callback is registered too early, so
one callback is invoked before controller is fully inited. This
cl fix it in two ways:
1. Add NPE check in refreshUi, since this method in InstalledAppDetail
is robost to NPE
2. Move the callback to the end of constructor.

Bug: 37913054
Test: RunSettingsRoboTests
Change-Id: I54b03fb51a958a8e63bfe8a7ccfda79be1fa1956
2017-05-24 17:06:20 -07:00
Doris Ling
5bf5c8ac04 Listener to tether state change on Network & internet page.
User can navigates to the page and turn hotspot on or off from the quick
settings. Need to listen to the tether state updates to refresh the
summary for the Hotspot & tethering preference accordingly.

Change-Id: I7c6869b909306b09556e19cf7b7543ce9dcd890e
Fix: 38452559
Test: make RunSettingsRoboTests
2017-05-24 16:51:14 -07:00
Jeff Davidson
f1c13fa820 Hide "Wipe eUICC" option when it isn't useful.
If a user never downloaded a profile onto their eUICC, there's no
reason to offer the wipe option, and it would only cause confusion.
But show the option nonetheless if developer options are enabled.

Bug: 38460669
Test: TreeHugger / Unit test / Manual verification
Change-Id: I51fb7b9e75c4f9a46ee0b24e64bddfafcbd48b14
2017-05-24 16:20:58 -07:00
Fan Zhang
17d63964c7 Set correct uid when loading app icon in data usage UI.
work profile apps belongs to a different user. Set the correct uid when
loading the icon so the work profile badge is displayed.

Change-Id: I2ed27d6b83c1b42961500dc8d63475bf1f7eabcd
Fix: 38372681
Test: make RunSettingsRoboTests
2017-05-24 16:04:23 -07:00
Maurice Lam
046400c2c4 Migrate settings robolectric tests to mockito 2
- Migrated ArgumentMatcher subclasses to lambdas
- Replaced any() with nullable() where tests were failing

Test: cd tests/robotests && mma
Bug: 38456058
Change-Id: Ice8c39b435c45b87f82dbbd9860e68f235314cf8
2017-05-24 15:14:31 -07:00
Fan Zhang
e84407f5c3 Recursively remove preference from screen.
The preference framework does not remove pref recursively. So when a
preference is nested in preference hierarchy, it's not safe to simply
call screen.removePreference(). We need to first find its parent and
remove pref from its parent.

Change-Id: Ic7fefa498ed71a8877d862845ddcc2d6d6034a55
Fix: 38507066
Test: make RunSettingsRoboTests
2017-05-24 21:21:00 +00:00
Phil Weaver
be39d57762 Merge "Follow O patterns for a11y settings" 2017-05-24 19:37:41 +00:00
jackqdyulei
4516644b46 Merge "Make "Battery usage" accessible at any time" into oc-dev
am: a935b3c030

Change-Id: I969c301888aca43b5e2154fc86dd139ebb83c3f3
2017-05-24 19:26:16 +00:00
TreeHugger Robot
a935b3c030 Merge "Make "Battery usage" accessible at any time" into oc-dev 2017-05-24 19:19:55 +00:00
Phil Weaver
ed5f0951f8 Follow O patterns for a11y settings
Move the summary for the toggled features to a footer.
Make the settings appear as a preference.

Bug: 36780887
Test: Start settings and observe the new UI looks a lot
like the mocks referenced in the bug. Also added unit
test to verify that summary text shows up.

Change-Id: I1d002b194991d0901ecb27198ba5de73bd23a5a9
2017-05-24 10:35:20 -07:00
jackqdyulei
e379be8277 Add background activity action
Background activity action is designed for wakeup alarm anomaly.
This cl also change the parameter in anomaly action interface
from "packageName" to "anomaly"

Bug: 36921529
Test: RunSettingsRoboTests
Change-Id: Ibde69f351f81043641f228f0e74deaa2e230c08a
2017-05-24 10:28:28 -07:00
Matthew Fritze
1dd31158a8 Merge "Revert "Revert "Replace dynamic summary text for SettingPref""" into oc-dev am: ae0886c9f7
am: 934a04509f

Change-Id: Iff239e99df07cf425f650fbdb9cfb72a3fc40182
2017-05-24 17:18:58 +00:00
Matthew Fritze
934a04509f Merge "Revert "Revert "Replace dynamic summary text for SettingPref""" into oc-dev
am: ae0886c9f7

Change-Id: I29ca4bdf7ad579699283fe4adde2ad22439d7ce9
2017-05-24 17:16:01 +00:00
TreeHugger Robot
ae0886c9f7 Merge "Revert "Revert "Replace dynamic summary text for SettingPref""" into oc-dev 2017-05-24 17:12:35 +00:00
jackqdyulei
58406203e2 Make "Battery usage" accessible at any time
Before this cl, user could go to "Battery usage" page only if
related app has battery usage. This cl breaks this rule so we
could open "Battery usage" without battery data.

Bug: 38497822
Test: RunSettingsRoboTests
Merged-In: Ic53c33b7dcbac82de58f31cf96e0bd8fa54e53ea
Change-Id: Ic53c33b7dcbac82de58f31cf96e0bd8fa54e53ea
2017-05-24 10:12:13 -07:00
Tony Mak
f7c007b2c1 Merge "Show app battery usage in correct user" into oc-dev
am: 7226c9f4c4

Change-Id: I719a19c92d9671e471b648aa6db9881dbd01ad30
2017-05-24 10:53:25 +00:00
TreeHugger Robot
7226c9f4c4 Merge "Show app battery usage in correct user" into oc-dev 2017-05-24 10:49:12 +00:00
TreeHugger Robot
b11845096a Merge "Update Settings search result unique ids" 2017-05-24 04:48:45 +00:00
jackqdyulei
c0351e0243 Merge "Split loading process for battery header" into oc-dev
am: 987ee5338a

Change-Id: I395b493338f0225bd300e155d3303a1ba9136555
2017-05-24 01:33:01 +00:00
TreeHugger Robot
2cd55c1255 Merge "Misc fixes to search and UI." 2017-05-24 01:25:16 +00:00
TreeHugger Robot
987ee5338a Merge "Split loading process for battery header" into oc-dev 2017-05-24 01:22:25 +00:00
jackqdyulei
7932484fa9 Sort app list after smeared on screen
Then we could make sure the app list is sorted

Bug: 62035385
Test: RunSettingsRoboTests
Change-Id: I3fa3d6ffc5930cf011e382632143e459fdbc4369
2017-05-23 17:36:47 -07:00
Lei Yu
bce1ef6a00 Merge "Make "Battery usage" accessible at any time" 2017-05-23 23:24:33 +00:00
jackqdyulei
4a7c8d7125 Split loading process for battery header
This cl creates BatteryHeaderPreferenceController, which will first
load the battery level in ui thread(in displayPreference()), then
display the remaining time once we get the battery stats.

This is the best we can do to avoid ui flashing while removing the
animation

Bug: 38349587
Test: RunSettingsRoboTests

Merged-In: Ic3622bb73562ba42e69b37e5674a724c03c45f12
Change-Id: Ic3622bb73562ba42e69b37e5674a724c03c45f12
2017-05-23 16:21:33 -07:00
Lei Yu
cceeac9ae8 Merge "Split loading process for battery header" 2017-05-23 23:20:56 +00:00