Commit Graph

36392 Commits

Author SHA1 Message Date
Daniel Nishi
4ab4ff8bec Fix a flaky test.
If a test with an initialized fake factory was run before this test, it
passed. If it runs first, though, it would flake. By initializing the
fake factory in the test, it shouldn't flake anymore.

Change-Id: I3ecb7477b6b29d093059f01d5dc0124690fb15b3
Fixes: 62103876
Test: Robotests pass
2017-05-25 15:34:03 -07:00
Philip Quinn
a0d327a5ac Merge "Add metrics category for the assist gesture settings." 2017-05-25 16:18:54 +00:00
Charles He
0b7dfb03c2 Merge "Make failed ConfirmCredential attempts count towards wipe" 2017-05-25 12:35:43 +00:00
TreeHugger Robot
2e283ab634 Merge "Add icons to choose lock dialog" 2017-05-25 04:43:28 +00: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
TreeHugger Robot
755ff93155 Merge "Add a flag for the Bluetooth device details page" 2017-05-25 02:10:35 +00:00
TreeHugger Robot
939362671b Merge "UI Cleanup on supported links dialog in app info page." 2017-05-25 02:04:36 +00:00
Maurice Lam
35c9abd4af Add icons to choose lock dialog
- Add icons to items in choose lock dialog
- Add title to the dialog
- Update the font size and color to match specs

Test: Manual. Existing tests pass
Bug: 38394440
Change-Id: Ie7ed9944b71fa5ca408ec6898f49cbd36865a1dd
2017-05-24 18:57:48 -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
Antony Sargent
e4a9530cc1 Add a flag for the Bluetooth device details page
This flag will be used to control whether we use a new, separate page
for Bluetooth device details, or the existing dialog.

Bug: 35877479
Test: make RunSettingsGoogleRoboTests
Change-Id: I2bda77493695ebe3b3bb824657a1422a68918256
2017-05-24 16:37:42 -07:00
Fan Zhang
0b6f8fad03 UI Cleanup on supported links dialog in app info page.
- Simplify layout file
- Increase paddings

Change-Id: I61b7d9315f74172aeb036ef835de73e268329de5
Fix: 62065754
Test: visual
2017-05-24 16:33:08 -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
Fan Zhang
21aab578c9 Tether screen cleanup am: 20ae31e87c
am: a6f821c015

Change-Id: Icaa0173c43b80964aac5d0560e69426536c8da29
2017-05-24 22:51:59 +00:00
Fan Zhang
a6f821c015 Tether screen cleanup
am: 20ae31e87c

Change-Id: I5294531666526a05d07db15ff208eedec3504970
2017-05-24 22:48:55 +00: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
Fan Zhang
20ae31e87c Tether screen cleanup
- Add a summary placeholder reserving 2 lines for wifi tether pref
- Replace DividerPreference with regular Preference

Change-Id: I2e0c36f27abe2c17625d00d80c816b526f59a6fd
Fix: 37518463
Test: visual
(cherry picked from commit d80117dcea)
2017-05-24 19:59:15 +00:00
Phil Weaver
be39d57762 Merge "Follow O patterns for a11y settings" 2017-05-24 19:37:41 +00:00
jackqdyulei
3b0da6d478 Merge "Make "Battery usage" accessible at any time" into oc-dev am: a935b3c030
am: 4516644b46  -s ours

Change-Id: Id2468f81d36e890897d60b6eda3f50c5c162203c
2017-05-24 19:31:14 +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
TreeHugger Robot
ba7230e3be Merge "Import translations. DO NOT MERGE" 2017-05-24 19:08:49 +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
47a7d102c6 Merge "Show app battery usage in correct user" into oc-dev am: 7226c9f4c4
am: f7c007b2c1  -s ours

Change-Id: I77d663cdd0c9dc6a3a411789591421a238a76766
2017-05-24 10:56:22 +00: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
acabf61592 Merge "Split loading process for battery header" into oc-dev am: 987ee5338a
am: c0351e0243  -s ours

Change-Id: Ia38ba8d7710511d740d4427674dd9f8f1a917abf
2017-05-24 01:40:32 +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
07894014d5 Merge "Update the strings for "show all apps"" into oc-dev am: 4e0f69c10c
am: 6870de6772

Change-Id: I184acec76978463b3d62a6eedadd456ee6fa7a89
2017-05-24 01:01:41 +00:00
jackqdyulei
6870de6772 Merge "Update the strings for "show all apps"" into oc-dev
am: 4e0f69c10c

Change-Id: I86150368f09801e90263fc099d4e0a703029dac2
2017-05-24 00:54:40 +00:00
TreeHugger Robot
4e0f69c10c Merge "Update the strings for "show all apps"" into oc-dev 2017-05-24 00:49:50 +00:00