Commit Graph

964 Commits

Author SHA1 Message Date
Stephen Chen
b8d2af244b Merge "Update "Open networks available" toggle to instead open notification channel preferences." into oc-dev am: de50fff3c2
am: 6455544f6e

Change-Id: I62689c3716e34c1c9faa4c0b56235c2a699552c1
2017-04-12 22:35:52 +00:00
TreeHugger Robot
de50fff3c2 Merge "Update "Open networks available" toggle to instead open notification channel preferences." into oc-dev 2017-04-12 20:24:22 +00:00
Lei Yu
5564e51661 Merge "Move bunch of battery methods to BatteryUtils.java" into oc-dev am: 171cbf8900
am: 94cfdcc26c

Change-Id: I84c4fe7eb70a3e6461e8f7d97669721b6d1c2b03
2017-04-12 20:00:45 +00:00
Lei Yu
171cbf8900 Merge "Move bunch of battery methods to BatteryUtils.java" into oc-dev 2017-04-12 19:39:08 +00:00
Chris Tate
02883b0217 Merge "Use bg appop ALLOWED, not DEFAULT" into oc-dev am: 763bfea530
am: 3185371382

Change-Id: Ib784dbd11aea5a94ee8f60d87df8d84bc68c260c
2017-04-12 19:23:27 +00:00
Daniel Nishi
25b62b1126 Merge "Don't crash in SecondaryUserController." into oc-dev am: aa3685fe14
am: 129eb1773a

Change-Id: Iae6c55f2e6f26dc6b147d70c070109398c528636
2017-04-12 19:23:12 +00:00
Chris Tate
763bfea530 Merge "Use bg appop ALLOWED, not DEFAULT" into oc-dev 2017-04-12 18:58:26 +00:00
Daniel Nishi
aa3685fe14 Merge "Don't crash in SecondaryUserController." into oc-dev 2017-04-12 18:57:48 +00:00
jackqdyulei
7f4c5fc1f4 Move bunch of battery methods to BatteryUtils.java
This cl moves following methods to BatteryUtils:
1. shouldHideSipper
2. removeHiddenBatterySippers
3. calculateBatteryPercent

As a result, we could use these methods in battery page as well
as app info page.

This cl also move bunch of tests to new file and add test for
method calculateBatteryPercent

Bug: 36816681
Test: RunSettingsRoboTests
Change-Id: Ic32700fe9741fbb96363db4af2d4fccb3ee8e317
2017-04-12 10:10:51 -07:00
Daniel Nishi
06470b68e0 Don't crash in SecondaryUserController.
If icons were fetched before displayPreference() is called, it can
cause a NPE. This adds a null check to ensure that it never
attempts to set an icon without both the icon and preference being
non-null.

Change-Id: Ib4269428e64545c9e255f7e3292fb6c046c1f307
Fixes: 37248158
Test: Settings Robotest
2017-04-12 09:33:32 -07:00
Doris Ling
395c70370a Merge "Remove hotspot receiver from manifest." into oc-dev am: 44cfdcc9a7
am: 31b6dfdef8

Change-Id: I217c5658ed3197fac32fa9c9fa7458f5e9254fbc
2017-04-12 08:33:40 +00:00
TreeHugger Robot
44cfdcc9a7 Merge "Remove hotspot receiver from manifest." into oc-dev 2017-04-12 08:20:06 +00:00
Amin Shaikh
27ea581cbe Merge "Wi-Fi network details page fixes." into oc-dev am: 52cf25d03d
am: 35caf331df

Change-Id: Ia1613cc4909e68cd1f1b40c70e9e1bfe6beecb72
2017-04-12 04:59:20 +00:00
TreeHugger Robot
52cf25d03d Merge "Wi-Fi network details page fixes." into oc-dev 2017-04-12 04:40:11 +00:00
TreeHugger Robot
375c22d031 Merge "Fake the cache size to be 0 bytes when cleared." into oc-dev 2017-04-12 01:25:21 +00:00
Fan Zhang
09641675af Merge "Don't show vpn info box when we don't have anything useful" into oc-dev am: d70abb53ee
am: 007b9e3cdd

Change-Id: I0686ca0de807f7dab72d261536da02faa0703847
2017-04-11 23:48:51 +00:00
Fan Zhang
57c1ce4980 Merge "Revert "Revert "Convert BT preference to use TwoTargetPreference""" into oc-dev am: fd29aada6b
am: 668dae22e7

Change-Id: Ib618566f6078793be3460070e65bd78b9d0f0a59
2017-04-11 23:48:37 +00:00
TreeHugger Robot
d70abb53ee Merge "Don't show vpn info box when we don't have anything useful" into oc-dev 2017-04-11 23:35:39 +00:00
TreeHugger Robot
fd29aada6b Merge "Revert "Revert "Convert BT preference to use TwoTargetPreference""" into oc-dev 2017-04-11 23:35:13 +00:00
Amin Shaikh
399e1a5810 Wi-Fi network details page fixes.
- Fix NPE in WifiDetailPreferenceController#setIpText
- Add MAC address preference in the details section
- Set subnet mask and gateway preferences
- Do not show IP information preferences if no information is available
- Fix string capitalization errors
- Only show IPv4 DNS servers under "Network details" section

Bug: 36483230
Bug: 37096448
Bug: 36482499
Bug: 37165860
Test: m RunSettingsRoboTests
Change-Id: I0e3f0ccfc4a8d802b51ed6b3be81c75e384dd06f
2017-04-11 16:25:53 -07:00
Christopher Tate
65cb0d6488 Use bg appop ALLOWED, not DEFAULT
DEFAULT is not actually the right thing; it's a subtlety used for
other things that have compound state.  ALLOWED is the proper
outright "let this thing run free" state for this appop.

Also, set the appop only for the target package, not for the
entire uid.

Bug 37226920
Bug 37242946
Test: make RunSettingsRoboTests

Change-Id: I8c0a995b9519f980685e8573da946dcc93ac4e7c
2017-04-11 14:07:00 -07:00
Hyunyoung Song
ad3843f4e4 Merge "Add shadow to AdaptiveIconDrawables using View level shadow" into oc-dev am: 9234a34a80
am: 71ba393033

Change-Id: I656587f889bdc4694cf0e8805a1f32feef7b8078
2017-04-11 19:47:01 +00:00
Doris Ling
f94401b06d Remove hotspot receiver from manifest.
The hotspot receiver if used to cancel any tethering alarm set when wifi
ap state changes. Removing it from the manifest, and only register the
receiver when we schedule the tethering alarm.

Change-Id: I97c3be6e2a374949208bbdd4ac5ccc2fabf0291a
Fix: 35968322
Test: make RunSettingsRoboTests
2017-04-11 12:03:54 -07:00
Fan Zhang
b0509b48c6 Don't show vpn info box when we don't have anything useful
Change-Id: I12a71b38486cab8a6a188c299e90a7674926dc98
Fix: 36068109
Test: make RunSettingsRoboTests -j40
2017-04-11 12:02:29 -07:00
Stephen Chen
2c4b42c0b7 Update "Open networks available" toggle to instead open notification channel preferences.
Bug: 36526438
Test: make ROBOTEST_FILTER=NotifyOpenNetworkPreferenceControllerTest RunSettingsRoboTests -j40
Change-Id: Idde3949856d050e62abff2c75a7b7db475a94d99
2017-04-11 11:54:51 -07:00
Daniel Nishi
1359d4fe0e Fake the cache size to be 0 bytes when cleared.
The fast track storage calculation returns a non-zero answer after
the storage has been cleared. The simplest workaround here is to
fake the size as 0 bytes in the view after cache clearing.

It will not be zero if the user exits and comes back, but this
should be fine.

MARK IT ZERO!

Change-Id: Ia012c2cf2842040d5eac3d4a72539ec7dcfb9570
Fixes: 34965659
Test: Settings Robotest
(cherry picked from commit bf1f8e9ca7)
2017-04-11 18:23:55 +00:00
Hyunyoung Song
9234a34a80 Merge "Add shadow to AdaptiveIconDrawables using View level shadow" into oc-dev 2017-04-11 18:11:49 +00:00
Fan Zhang
00d8ff5d6e Revert "Revert "Convert BT preference to use TwoTargetPreference""
This reverts commit 457c3cbec2.

Revert with fix/test.
The fix is that we removed DevicePickerFragment#initDevicePreference(),
which incorrectly set a useless widget on preference, and removes the
gear icon from preference, preventing bind() call to go through

Change-Id: Ia70cdb51d13cca6035a4e7fe8008d195f7f00c6e
Fix: 36511169
Test: runtest --path tests/app/src/com/android/settings/bluetooth/DevicePickerActivityTest.java
2017-04-11 09:45:27 -07:00
Sean Stout
79065d5a3c Merge "Remove Night Light suggestion. DO NOT MERGE" into oc-dev am: e4c73c24bc
am: 2fcca5a647

Change-Id: Iad30a04550e10682772174b490ca7085f5846418
2017-04-11 02:17:24 +00:00
TreeHugger Robot
e4c73c24bc Merge "Remove Night Light suggestion. DO NOT MERGE" into oc-dev 2017-04-11 01:24:09 +00:00
Matthew Fritze
78bc33c327 Merge "Reindex on OTA and locale change" into oc-dev am: f84c8d3480
am: 5bb64aeb59

Change-Id: I5551e8502a162a40e80f0c1c5637fd22f5545094
2017-04-11 00:37:41 +00:00
TreeHugger Robot
f84c8d3480 Merge "Reindex on OTA and locale change" into oc-dev 2017-04-10 23:54:55 +00:00
Sean Stout
40067bee4d Remove Night Light suggestion. DO NOT MERGE
Test: make ROBOTEST_FILTER=SettingsSuggestionsTest RunSettingsRoboTests
Bug: 37207263
Change-Id: Ieeb660abdcbe07cb66f1ae3b6e86d8fd27a26478
2017-04-10 16:22:01 -07:00
Hyunyoung Song
ebc17237c3 Add shadow to AdaptiveIconDrawables using View level shadow
Test: $ make RunSettingsRoboTests -j40
RunSettingsRoboTests: ......
RunSettingsRoboTests: Time: 151.394
RunSettingsRoboTests:
RunSettingsRoboTests: OK (1355 tests)
RunSettingsRoboTests:

Bug: 36088922

Change-Id: I5b5651d2305ab65e1358609a4110e248dee9eab2
2017-04-10 14:43:02 -07:00
Matthew Fritze
a0d03178d0 Reindex on OTA and locale change
When the user gets an OTA or changes language, settings
will clear the database and reindex it.

Test: make RunSettingsRoboTests
Change-Id: I379ece86b2d41d673bbbffbcf947774f3ccd4cb9
Fixes: 36859162
2017-04-10 14:28:39 -07:00
Daniel Nishi
84aba27da4 Merge "Add user icon to the other user preferences." into oc-dev am: b1c336de5f
am: f4af2774ee

Change-Id: I1ff26ce55a3b1ade531745e091e5c6e2de243593
2017-04-10 17:37:54 +00:00
Daniel Nishi
b1c336de5f Merge "Add user icon to the other user preferences." into oc-dev 2017-04-10 17:27:25 +00:00
Lei Yu
cce44a57bf Merge "Add log for BatteryUtils" into oc-dev am: 27dc9b69ac
am: 964de0d7be

Change-Id: I11d8232ca7b1d96625cec881d085269fb81e8322
2017-04-10 17:17:52 +00:00
Lei Yu
27dc9b69ac Merge "Add log for BatteryUtils" into oc-dev 2017-04-10 17:06:45 +00:00
Daniel Nishi
fe33c58a18 Add user icon to the other user preferences.
This icon is loaded in the background to avoid doing IO on
the main thread. Once we know there are more users and also
have the icon loaded, we add the category to the view.

Fixes: 36252572
Test: Robotest

Change-Id: Ib50287bb7ed323f22fbe407b56be1bf2fe98f121
2017-04-07 14:57:07 -07:00
Doris Ling
0ec7d2eb0d Merge "Add summary text to Lock screen preferences." into oc-dev am: a258e424a2
am: f8dead2f40

Change-Id: Id623c73b1bce56b3ec25a5b0dc7f4016a5fce72e
2017-04-07 20:12:28 +00:00
TreeHugger Robot
a258e424a2 Merge "Add summary text to Lock screen preferences." into oc-dev 2017-04-07 20:03:36 +00:00
Daniel Nishi
27d8d2b46e Merge "Update the automatic storage management preferences." into oc-dev am: 7badf46542
am: af587b0cfc

Change-Id: Icec5b8d5118497a7e4af21cc1c262400695b75e1
2017-04-07 19:50:05 +00:00
Daniel Nishi
7badf46542 Merge "Update the automatic storage management preferences." into oc-dev 2017-04-07 19:38:27 +00:00
Daniel Nishi
a480952e3d Merge "Fake the cache size to be 0 bytes when cleared." 2017-04-07 19:34:58 +00:00
jackqdyulei
5d2918a675 Add log for BatteryUtils
This cl add logs to get more data for app usage time.

Also refactor BatteryUtils to singleton pattern because we need
to extract package name from uid.

Bug: 36909166
Test: RunSettingsRoboTests
Change-Id: I6ede354035c46e46cb856b7cf57bd1b7ccbd6d4f
2017-04-07 11:18:39 -07:00
Doris Ling
cee83e4bbf Add summary text to Lock screen preferences.
Each time we refresh the security preference page, get the current
summary text from "On the lock screen" and populate to Lock screen
preferences summary.

Bug: 36540633
Test: make RunSettingsRoboTests
Change-Id: I317e3892b35b30981b62f7b7aee9cfdacd04a3ed
2017-04-07 11:11:45 -07:00
Lei Yu
e0e4c5d3eb Merge "Remove misc data in battery main page." into oc-dev am: abde170529
am: 52e096284f

Change-Id: I7f1665ea0864ff726a2964952c43fbb69d95e6f1
2017-04-07 18:03:21 +00:00
Lei Yu
abde170529 Merge "Remove misc data in battery main page." into oc-dev 2017-04-07 17:37:18 +00:00
Filip Pavlis
5a2590dfdb Merge "Omit using ctor of PreferenceViewHolder in tests." into oc-dev am: f023f50787
am: 7ae53e7df7

Change-Id: I9f075fbb5abe2767db1cd743a8c828d6f77fb9de
2017-04-07 10:45:07 +00:00