Noah Wang
c7b2bc65cb
Merge "Prevent gaining audio focus when opening magnification screen." into oc-dev am: 93799e8758
...
am: d26d3e77a3
2017-04-13 04:12:54 +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
985741ea1c
Merge "Update the strings for the autofill enable dialog" into oc-dev am: 0770f85cdc
...
am: 6fa685e4da
2017-04-13 02:10:31 +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
Stephen Chen
b8d2af244b
Merge "Update "Open networks available" toggle to instead open notification channel preferences." into oc-dev am: de50fff3c2
...
am: 6455544f6e
2017-04-12 22:35:52 +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
Jesse Evans
f46bfaa5fc
Merge "Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED" into oc-dev am: 12c9f41c19
...
am: e1a307eab3
2017-04-12 21:35:16 +00: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
Lei Yu
5564e51661
Merge "Move bunch of battery methods to BatteryUtils.java" into oc-dev am: 171cbf8900
...
am: 94cfdcc26c
2017-04-12 20:00:45 +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
02883b0217
Merge "Use bg appop ALLOWED, not DEFAULT" into oc-dev am: 763bfea530
...
am: 3185371382
2017-04-12 19:23:27 +00:00
Daniel Nishi
25b62b1126
Merge "Don't crash in SecondaryUserController." into oc-dev am: aa3685fe14
...
am: 129eb1773a
2017-04-12 19:23:12 +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
943b6af1fc
Merge "Allow settings preference title to span over multiple lines." into oc-dev am: d09c7e61f4
...
am: c6f5261619
2017-04-12 18:41:50 +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
Chad Brubaker
5f95b21d9f
Merge "Send ACTION_KEYCHAIN_CHANGED when installing a cert" into oc-dev am: 85eba52794
...
am: c72031f323
2017-04-12 18:05:18 +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
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
Doris Ling
395c70370a
Merge "Remove hotspot receiver from manifest." into oc-dev am: 44cfdcc9a7
...
am: 31b6dfdef8
2017-04-12 08:33:40 +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
27ea581cbe
Merge "Wi-Fi network details page fixes." into oc-dev am: 52cf25d03d
...
am: 35caf331df
2017-04-12 04:59:20 +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
6292c8eab4
Merge "Fix nav up button from running process details." into oc-dev am: 5ebfe92f09
...
am: 28e5589fcd
2017-04-12 02:34:41 +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
1562848a24
Merge "Remove divider above ExpandPreference." into oc-dev am: abac8823b2
...
am: 138d38a789
2017-04-12 00:37:48 +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
61492e99d7
Merge "Fix sketchy usage of new PreferenceScreen" into oc-dev am: 69faf046c0
...
am: d9200e5ba4
2017-04-11 23:56:08 +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
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
2017-04-11 23:48:37 +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
