Lei Yu
94cfdcc26c
Merge "Move bunch of battery methods to BatteryUtils.java" into oc-dev
...
am: 171cbf8900
2017-04-12 19:52:20 +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
3185371382
Merge "Use bg appop ALLOWED, not DEFAULT" into oc-dev
...
am: 763bfea530
2017-04-12 19:16:52 +00:00
Daniel Nishi
129eb1773a
Merge "Don't crash in SecondaryUserController." into oc-dev
...
am: aa3685fe14
2017-04-12 19:16:22 +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
Bill Yi
7f51d672c8
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: ec7ebc3f72
2017-04-12 18:49:57 +00:00
TreeHugger Robot
ec7ebc3f72
Merge "Import translations. DO NOT MERGE" into oc-dev
2017-04-12 18:37:23 +00:00
Doris Ling
c6f5261619
Merge "Allow settings preference title to span over multiple lines." into oc-dev
...
am: d09c7e61f4
2017-04-12 18:10:41 +00:00
TreeHugger Robot
d09c7e61f4
Merge "Allow settings preference title to span over multiple lines." into oc-dev
2017-04-12 17:57:28 +00:00
Chad Brubaker
c72031f323
Merge "Send ACTION_KEYCHAIN_CHANGED when installing a cert" into oc-dev
...
am: 85eba52794
2017-04-12 17:33:45 +00:00
Christine Franks
c783d634a3
Merge "Use correct title when opening from notification" into oc-dev
...
am: f61d4f38be
2017-04-12 17:33:29 +00:00
Chad Brubaker
85eba52794
Merge "Send ACTION_KEYCHAIN_CHANGED when installing a cert" into oc-dev
2017-04-12 17:21:09 +00:00
Christine Franks
f61d4f38be
Merge "Use correct title when opening from notification" into oc-dev
2017-04-12 17:19:40 +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
Charles He
38752c4f48
Merge "VPN settings: better a11y voice for legacy dialog" into oc-dev
...
am: 2371009a22
2017-04-12 11:22:47 +00:00
Niels Egberts
0b51491a46
Remove unused xml file.
...
am: 07e3f619eb
2017-04-12 11:22:31 +00:00
TreeHugger Robot
2371009a22
Merge "VPN settings: better a11y voice for legacy dialog" into oc-dev
2017-04-12 11:20:09 +00:00
Niels Egberts
07e3f619eb
Remove unused xml file.
...
Bug: 36741587
Test: mmma packages/apps/Settings
Change-Id: I35eee7fb442a1cdeb54d8a9f54426322c75e3f99
(cherry picked from commit ecb613bd8d
2017-04-12 08:55:21 +00:00
Doris Ling
31b6dfdef8
Merge "Remove hotspot receiver from manifest." into oc-dev
...
am: 44cfdcc9a7
2017-04-12 08:27:20 +00:00
TreeHugger Robot
44cfdcc9a7
Merge "Remove hotspot receiver from manifest." into oc-dev
2017-04-12 08:20:06 +00:00
Amin Shaikh
35caf331df
Merge "Wi-Fi network details page fixes." into oc-dev
...
am: 52cf25d03d
2017-04-12 04:50:14 +00:00
Suprabh Shukla
eb2e6c7add
Merge "Renaming intent action for unknown sources" into oc-dev
...
am: 3fa963b28e
2017-04-12 04:45:58 +00:00
TreeHugger Robot
52cf25d03d
Merge "Wi-Fi network details page fixes." into oc-dev
2017-04-12 04:40:11 +00:00
Suprabh Shukla
3fa963b28e
Merge "Renaming intent action for unknown sources" into oc-dev
2017-04-12 04:32:51 +00:00
Fan Zhang
752f902c2a
Merge "Add placeholder summary to stablize app info pref height" into oc-dev
...
am: 0bc2aaea70
2017-04-12 02:45:56 +00:00
TreeHugger Robot
0bc2aaea70
Merge "Add placeholder summary to stablize app info pref height" into oc-dev
2017-04-12 02:36:12 +00:00
Fan Zhang
28e5589fcd
Merge "Fix nav up button from running process details." into oc-dev
...
am: 5ebfe92f09
2017-04-12 01:35:30 +00:00
Daniel Nishi
cb472bef7b
Merge "Fake the cache size to be 0 bytes when cleared." into oc-dev
...
am: 375c22d031
2017-04-12 01:35:15 +00:00
TreeHugger Robot
5ebfe92f09
Merge "Fix nav up button from running process details." into oc-dev
2017-04-12 01:25:36 +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
Andrew Sapperstein
138d38a789
Merge "Remove divider above ExpandPreference." into oc-dev
...
am: abac8823b2
2017-04-12 00:20:08 +00:00
TreeHugger Robot
abac8823b2
Merge "Remove divider above ExpandPreference." into oc-dev
2017-04-12 00:03:06 +00:00
Tony Mantler
d9200e5ba4
Merge "Fix sketchy usage of new PreferenceScreen" into oc-dev
...
am: 69faf046c0
2017-04-11 23:48:17 +00:00
TreeHugger Robot
69faf046c0
Merge "Fix sketchy usage of new PreferenceScreen" into oc-dev
2017-04-11 23:43:27 +00:00
Fan Zhang
007b9e3cdd
Merge "Don't show vpn info box when we don't have anything useful" into oc-dev
...
am: d70abb53ee
2017-04-11 23:43:01 +00:00
Fan Zhang
668dae22e7
Merge "Revert "Revert "Convert BT preference to use TwoTargetPreference""" into oc-dev
...
am: fd29aada6b
2017-04-11 23:42:46 +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
Jesse Evans
708a85065d
Merge "Fixes instant apps on the Opening links screen" into oc-dev
...
am: 15f963bed9
2017-04-11 22:52:09 +00:00
TreeHugger Robot
15f963bed9
Merge "Fixes instant apps on the Opening links screen" into oc-dev
2017-04-11 22:36:31 +00:00
Christine Franks
e12bf697b0
Use correct title when opening from notification
...
Bug: 36070413
Test: tap system alert window notification, which brings up Settings
with the correct title.
Change-Id: I6f346a7336a71c046cbc58b7291a851a7537d5ac
2017-04-11 14:57:33 -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
Fan Zhang
7685987af1
Fix nav up button from running process details.
...
Change-Id: I08fbbc1dab886dd26e7d780c0fc1b50c98a0e2f8
Fix: 36667083
Test: manual
2017-04-11 13:41:31 -07:00
Doris Ling
aa805e70ed
Allow settings preference title to span over multiple lines.
...
- add singleLineTitle=false to SettingsPreference style, so that it will
not confined the title to a single line.
- remove the custom multi line title from DividerPreference and
MasterSwitchPreference.
Change-Id: I5a78d2cd6ac00c4482e252b0789fd2d265bd9adf
Fix: 34886787
Test: manual
2017-04-11 13:17:38 -07:00
Julia Reynolds
80f06dc54c
Merge "Sort channels and groups by id" into oc-dev
...
am: 665c1ced58
2017-04-11 19:43:06 +00:00
Hyunyoung Song
71ba393033
Merge "Add shadow to AdaptiveIconDrawables using View level shadow" into oc-dev
...
am: 9234a34a80
2017-04-11 19:42:47 +00:00
Andrew Sapperstein
c9469cddbc
Remove divider above ExpandPreference.
...
Change-Id: Ib1841d99025af3f97495efd6d6186b328af33f84
Fixes: 36479214
Test: manual, visual update
2017-04-11 19:41:34 +00:00
