Niels Egberts
5e0d74d80c
Merge "Save instance to avoid crash opon restore in onCreate." into oc-dev
...
am: dc322cf18b
2017-04-13 16:30:56 +00:00
TreeHugger Robot
dc322cf18b
Merge "Save instance to avoid crash opon restore in onCreate." into oc-dev
2017-04-13 16:21:58 +00:00
Julia Reynolds
cd8f4fb614
Merge "Notification sound field updates" into oc-dev
...
am: b40a459031
2017-04-13 13:13:18 +00:00
Julia Reynolds
b40a459031
Merge "Notification sound field updates" into oc-dev
2017-04-13 13:01:52 +00:00
Tony Mak
8e413e2a88
Merge "Show RingtonePickerActivity in work user instead" into oc-dev
...
am: 35f1e055d1
2017-04-13 12:36:47 +00:00
TreeHugger Robot
35f1e055d1
Merge "Show RingtonePickerActivity in work user instead" into oc-dev
2017-04-13 12:13:04 +00:00
Noah Wang
d26d3e77a3
Merge "Prevent gaining audio focus when opening magnification screen." into oc-dev
...
am: 93799e8758
2017-04-13 04:07:11 +00:00
Noah Wang
93799e8758
Merge "Prevent gaining audio focus when opening magnification screen." into oc-dev
2017-04-13 03:58:47 +00:00
Svet Ganov
6fa685e4da
Merge "Update the strings for the autofill enable dialog" into oc-dev
...
am: 0770f85cdc
2017-04-13 02:04:32 +00:00
TreeHugger Robot
0770f85cdc
Merge "Update the strings for the autofill enable dialog" into oc-dev
2017-04-13 01:56:06 +00:00
Svet Ganov
4fafa4e403
Update the strings for the autofill enable dialog
...
Test: manual
bug:37244333
Change-Id: I6dfac8826d5a817567116ef2f57d646d92b54b4e
2017-04-12 15:17:53 -07:00
Stephen Chen
6455544f6e
Merge "Update "Open networks available" toggle to instead open notification channel preferences." into oc-dev
...
am: de50fff3c2
2017-04-12 20:37:15 +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
Jesse Evans
e1a307eab3
Merge "Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED" into oc-dev
...
am: 12c9f41c19
2017-04-12 19:52:54 +00:00
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
TreeHugger Robot
12c9f41c19
Merge "Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED" into oc-dev
2017-04-12 19:39:16 +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
Noah Wang
ea5ebaa50c
Prevent gaining audio focus when opening magnification screen.
...
bug: 30521125
Change-Id: I22fe63ed2b0529c2a08b7be03c12753f3f060c1a
2017-04-12 11:52:23 -07: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
Chad Brubaker
85eba52794
Merge "Send ACTION_KEYCHAIN_CHANGED when installing a cert" into oc-dev
2017-04-12 17:21:09 +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
Tony Mak
007dc1abe6
Show RingtonePickerActivity in work user instead
...
Test: make RunSettingsRoboTests
Test: Try to import custom ringtone in work profile, no crash observed
Test: Set the custom ringtone as default. Tested both work gmail and
calendar can play that ringtone.
Test: Try to import the peresonal ringtone, it is still working.
Bug: 37197930
Change-Id: I2b662247d7e70b59bae08e082e9682d74d797484
2017-04-12 15:12:44 +01:00
Jesse Evans
fef4a43155
Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED
...
Test: make RunSettingsRoboTests
Change-Id: Iee3a279be6a33932797a5e9378c451feb9b3df1a
2017-04-12 07:03:34 -07:00
Niels Egberts
4b89142256
Save instance to avoid crash opon restore in onCreate.
...
Bug: 37110223
Test: mmma packages/apps/Settings
Change-Id: I82457880bf310efbb7e999a5776858e47b0660c9
2017-04-12 10:42:01 +01: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
TreeHugger Robot
52cf25d03d
Merge "Wi-Fi network details page fixes." into oc-dev
2017-04-12 04:40:11 +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
