Noah Wang
d26d3e77a3
Merge "Prevent gaining audio focus when opening magnification screen." into oc-dev
...
am: 93799e8758
Change-Id: I53c70dcd4986588819f1d7a36337392c4c74748c
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
Change-Id: Iac9a8bf0430652396809784598ed75f947b75426
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
Change-Id: Ia40ef434f7f67a8942496540360f5a5547eb8255
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
Sundeep Ghuman
8474a9c877
Add a broadcast receiver to WifiDetailsPreferenceController.
...
This allows the WifiNetworkDetailsFragment to update dynamically based
on network and connection changes.
Bug: b/36278407
Test: make RunSettingsRoboTests
Change-Id: I388cf9842a144e45b68f2d173c7b29f347226b78
2017-04-12 17:56:58 -07:00
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
Jack He
37fb338cda
Add developer menu entry to enable Bluetooth inband ringing
...
Bug: 19171297
Test: Make, HFP regression test, testplans/82144
Change-Id: Ib24463347323f83daf8b4d9f1d38bb9c3071fb95
(cherry picked from commit 8d64a93c6a
)
2017-04-12 22:24:20 +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
Change-Id: Iee0963f524d4c7a689111a551fc8f7febf195dbb
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
Change-Id: I500d13e65b8aa63b62e5eacb750ed2a6a1ffc163
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
jackqdyulei
781c3000d1
Update Summary for Battery Optimization
...
Bug: 37221696
Test: RunSettingsRoboTests
Change-Id: I7dc24879521a1375e0ad4b4b73e9a40633b93c3f
2017-04-12 13:04:28 -07: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
Jesse Evans
e1a307eab3
Merge "Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED" into oc-dev
...
am: 12c9f41c19
Change-Id: Id70340013a4a446ff21178aaa143b120f390d71c
2017-04-12 19:52:54 +00:00
Saige McVea
672cb2edc6
Added generic icon and magnification icon to a11y Settings.
...
Test: Manual
Bug: 36895362
Change-Id: I85281c0904bd6f562f9ebd39dd35b1eeb79108e6
2017-04-12 12:52:21 -07:00
Lei Yu
94cfdcc26c
Merge "Move bunch of battery methods to BatteryUtils.java" into oc-dev
...
am: 171cbf8900
Change-Id: Id54c001de93286d83883ea6da476fd241acf77cd
2017-04-12 19:52:20 +00:00
jackqdyulei
f8e6f43425
Revamp battery Ui in low battery mode
...
This cl refine battery icon ui in low battery mode:
1. Should show indicator(fixed in ag/2035178)
2. Show bolt icon when charging
3. When battery is low, set battery background as red and indicator
as white.
This cl also includes the field updates for battery.
Bug: 36862496
Test: RunSettingsRoboTests
Change-Id: Ifb2ed339742119bbff78712df09288b895756b1f
2017-04-12 12:47:52 -07: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
Adam Lesinski
c78fe99e09
Update FakeUid to match ag/2099507
...
Bug: 36002715
Change-Id: I6c2a92bee1a9931e08e11596d9a31844a3bc6bfc
Test: builds
2017-04-12 12:32:24 -07: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
3185371382
Merge "Use bg appop ALLOWED, not DEFAULT" into oc-dev
...
am: 763bfea530
Change-Id: I0bc1f8f580aa7a0ee23b1d7fc634053ada12891a
2017-04-12 19:16:52 +00:00
Daniel Nishi
129eb1773a
Merge "Don't crash in SecondaryUserController." into oc-dev
...
am: aa3685fe14
Change-Id: Ic888ee5baf063ab3bc9075292c32fafe612ddb4e
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
Change-Id: I388c45690f8eb59db2d1d590268319ee8b72b983
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
Change-Id: I81b0285f59195911e3b98ca6f4bf8333da9b23a4
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
Change-Id: I3b7eada3708edc919f5f8b883e3d40aedfb72e6e
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
Change-Id: Id5ffbd16ec1d0124669bd232a4c0cfa2440106cb
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
Jesse Evans
de4e056449
Instant apps should not say App Installed by
...
Changes the text on the app installer details to say
"More info on {App Store Name}".
Test: make RunSettingsRoboTests
Bug: 36512295
Change-Id: I8629f840e9f4e5ce12ba91e9cb9def0db0471162
2017-04-12 07:02:19 -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
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
Doris Ling
31b6dfdef8
Merge "Remove hotspot receiver from manifest." into oc-dev
...
am: 44cfdcc9a7
Change-Id: If2461a2b66be0dbc76d6504dc4a8dca12782c86b
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
Change-Id: Ia1613cc4909e68cd1f1b40c70e9e1bfe6beecb72
2017-04-12 04:59:20 +00:00
Amin Shaikh
35caf331df
Merge "Wi-Fi network details page fixes." into oc-dev
...
am: 52cf25d03d
Change-Id: Ic426479331d1946ea697301e2e015852c3d0fa46
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
Change-Id: If852b5f08a8604865a083ad763544fd2120107e0
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
Change-Id: I3fe9ed12b497584d079b94e89ac7cfeec63752e4
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
Change-Id: I2672ff3a908272feb1b1e8c2fd8584be745d71f1
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