Daniel Nishi
d6d6185167
Merge "Gracefully handle null volumes after forgetting." into oc-dev
2017-04-20 17:05:29 +00:00
Daniel Nishi
c7734f589e
Merge "Don't show warning dialog on opening ASM settings." into oc-dev
...
am: 81f98a8fd5
Change-Id: I70516ed0b6bbc7720d3da33461fed52a0aa8adda
2017-04-20 17:04:50 +00:00
Phil Weaver
bffd5636ff
Merge "Fix default for a11y shortcut setting" into oc-dev
...
am: 5ef1135b9f
Change-Id: Ifd07d03a81c62e6f82afec9cb964bc9bc007a54e
2017-04-20 17:04:28 +00:00
jackqdyulei
0a8e081855
Change "Cell standby" to "Mobile network standby"
...
Bug: 37356060
Test: Build
Change-Id: I2c726a7f31ae37cf0a31b76e2a99d9c5735692fe
2017-04-20 10:03:21 -07:00
Daniel Nishi
81f98a8fd5
Merge "Don't show warning dialog on opening ASM settings." into oc-dev
2017-04-20 16:55:29 +00:00
Gustav Sennton
cad1d15586
Merge "Remove WebView MultiProcess Developer Option." into oc-dev am: ae72f1eeef
...
am: b54f96015f
Change-Id: I6dc23db7a2043310860e56d7f5aa0f591f2813ce
2017-04-20 16:37:22 +00:00
Lenka Trochtova
5cb384e625
Check for user restrictions disallowing BT in BluetoothEnabler. am: 363b3303c0
...
am: 33707767be
Change-Id: I102ee434e7d8f2931f3cdedffdbb6955b0b8d897
2017-04-20 16:36:46 +00:00
Gustav Sennton
b54f96015f
Merge "Remove WebView MultiProcess Developer Option." into oc-dev
...
am: ae72f1eeef
Change-Id: I93b5db79f458b8808935f0d005e3a5631d96e496
2017-04-20 16:04:02 +00:00
Lenka Trochtova
33707767be
Check for user restrictions disallowing BT in BluetoothEnabler.
...
am: 363b3303c0
Change-Id: I6c85b31a44930e174a8caff04696d70884fc1dbc
2017-04-20 16:03:26 +00:00
Phil Weaver
5ef1135b9f
Merge "Fix default for a11y shortcut setting" into oc-dev
2017-04-20 14:52:23 +00:00
TreeHugger Robot
ae72f1eeef
Merge "Remove WebView MultiProcess Developer Option." into oc-dev
2017-04-20 12:59:34 +00:00
Gustav Sennton
c14e09bde0
Remove WebView MultiProcess Developer Option.
...
Now that MultiProcess WebView is enabled by default we can remove the
Developer Option that lets users choose whether to enable MultiProcess
for WebView.
Bug: 36513859
Test: Ensure the WebView MultiProcess Dev Setting no longer exists.
Change-Id: Ib2eab3831b5d8b56daeaf4c7a06337075804a1d4
2017-04-20 11:51:46 +01:00
Lenka Trochtova
363b3303c0
Check for user restrictions disallowing BT in BluetoothEnabler.
...
Test: make RunSettingsRoboTests -j40
Test: manual
BUG: 35596982
BUG: 32895313
Change-Id: Ie8f53b665a4aad4e6b17b20602cbe5502998d7a2
(cherry picked from commit 479d197196
)
2017-04-20 10:26:14 +00:00
TreeHugger Robot
8e4abb13d0
Merge "Check for user restrictions disallowing BT in BluetoothEnabler."
2017-04-20 10:23:10 +00:00
Sundeep Ghuman
ebde427ebb
Merge "Fix scanning settings link clickability in Talkback mode." into oc-dev am: 2ba8f10717
...
am: 638a864cd5
Change-Id: I3a58f97a7a43902b90af33c265f079c756eead51
2017-04-20 01:16:57 +00:00
Daniel Nishi
9c9c2b5871
Merge "Change how we calculate system size." into oc-dev am: 0b75d39312
...
am: aebda427d8
Change-Id: I7a0efbf7745fe52d9dbefe94ead07be603b6f96e
2017-04-20 00:58:05 +00:00
Fan Zhang
c76b85317e
Merge "Display and parse numbers properly in all locales" into oc-dev am: 28e5271c61
...
am: feea41f6cc
Change-Id: I3d9ffaa6f13a1d2859c6d591dfcb1c573c7cd11e
2017-04-20 00:57:30 +00:00
Sundeep Ghuman
638a864cd5
Merge "Fix scanning settings link clickability in Talkback mode." into oc-dev
...
am: 2ba8f10717
Change-Id: If7d84b22d7f232e80b2ad43db828c2566d9145a5
2017-04-20 00:18:05 +00:00
William Luh
b03f19991f
Update security status icons.
...
Bug: 36847800
Test: make RunSettingsRoboTests
Also tested manually in app.
Change-Id: I5b7c043ed6af4c5a888710b582e8e69c6e3974c3
2017-04-19 17:06:46 -07:00
Daniel Nishi
aebda427d8
Merge "Change how we calculate system size." into oc-dev
...
am: 0b75d39312
Change-Id: Icaf7f87f280cd60ed37e02608821ab07815abbad
2017-04-19 23:56:54 +00:00
Fan Zhang
feea41f6cc
Merge "Display and parse numbers properly in all locales" into oc-dev
...
am: 28e5271c61
Change-Id: I209c67664d3713609cdc10bde9598f796b167139
2017-04-19 23:56:32 +00:00
TreeHugger Robot
2ba8f10717
Merge "Fix scanning settings link clickability in Talkback mode." into oc-dev
2017-04-19 23:49:03 +00:00
TreeHugger Robot
c037add5dc
Merge "Prevent search crashes from uninstalled apps"
2017-04-19 23:45:44 +00:00
TreeHugger Robot
0b75d39312
Merge "Change how we calculate system size." into oc-dev
2017-04-19 23:33:58 +00:00
TreeHugger Robot
28e5271c61
Merge "Display and parse numbers properly in all locales" into oc-dev
2017-04-19 23:30:08 +00:00
TreeHugger Robot
8968e61b95
Merge "Remove duplicates between battery and display settings"
2017-04-19 23:05:03 +00:00
Matthew Fritze
626fb0d7e6
Merge "Revert "Listen to brigtness updates to update brightness summary."" into oc-dev am: 552fc2922a
...
am: af89d062b4
-s ours
Change-Id: I81e66724eff9c907d3494d8388ce2ca22b0ae03b
2017-04-19 22:57:44 +00:00
TreeHugger Robot
f9b6ccf9fd
Merge "Use the new OemLockService to get OEM lock state."
2017-04-19 22:53:13 +00:00
Matthew Fritze
af89d062b4
Merge "Revert "Listen to brigtness updates to update brightness summary."" into oc-dev
...
am: 552fc2922a
Change-Id: I535dbb31e1951869220b50b4f822c068f9cea0f3
2017-04-19 22:36:11 +00:00
TreeHugger Robot
552fc2922a
Merge "Revert "Listen to brigtness updates to update brightness summary."" into oc-dev
2017-04-19 22:29:25 +00:00
Sundeep Ghuman
5ac900b5da
Merge "Force update APs when enabling wifi in WifiSettings." into oc-dev am: 8025906b7c
...
am: 05f252ec53
Change-Id: I77d68fe604e84e16aa545b119be96241b855abf6
2017-04-19 22:14:15 +00:00
Fan Zhang
41b5a55175
Merge "Fix malformatted preference xml." into oc-dev am: 569a93b8bb
...
am: 0a9fddd631
Change-Id: I9aa9f77d224fdd63ec4c2222c510d1958e4f7166
2017-04-19 22:13:53 +00:00
Adrian Roos
478dcb35d6
Merge "Revert "Changed the ambient display setting name"" into oc-dev am: 97d3709b25
...
am: 1b322f6283
Change-Id: Ia33ee063b87d2cc6951d6a85a88b45b14c67b229
2017-04-19 22:13:21 +00:00
Matthew Fritze
359bce4f50
Prevent search crashes from uninstalled apps
...
All search results are now refreshed when resuming the
search fragment, to prevent crashes from results that
no longer exist.
Bug: 34817357
Test: make RunSettingsRoboTests
Change-Id: I96a0cbfee711ab9dee49d56bfdc4e885202d9ecd
2017-04-19 15:06:39 -07:00
Sundeep Ghuman
05f252ec53
Merge "Force update APs when enabling wifi in WifiSettings." into oc-dev
...
am: 8025906b7c
Change-Id: Icfe7abd987ad1f4b6a0475904759cc87eb61a00a
2017-04-19 21:54:21 +00:00
Fan Zhang
0a9fddd631
Merge "Fix malformatted preference xml." into oc-dev
...
am: 569a93b8bb
Change-Id: Ida4d8631bf7f36d68c9022b9ff72cd2ef3cd4995
2017-04-19 21:54:01 +00:00
Adrian Roos
1b322f6283
Merge "Revert "Changed the ambient display setting name"" into oc-dev
...
am: 97d3709b25
Change-Id: I6383e11eeba2470bb98822bb393dab909a0c9191
2017-04-19 21:53:40 +00:00
TreeHugger Robot
8025906b7c
Merge "Force update APs when enabling wifi in WifiSettings." into oc-dev
2017-04-19 21:48:19 +00:00
TreeHugger Robot
569a93b8bb
Merge "Fix malformatted preference xml." into oc-dev
2017-04-19 21:42:36 +00:00
Matthew Fritze
c6f2638009
Remove duplicates between battery and display settings
...
Change preference keys of duplicate settings between
display and battery to avoid duplication in search.
Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: I56c82e9e7f163d345065ca478849de9b14c173fe
2017-04-19 14:34:13 -07:00
Fan Zhang
8648c5ed3d
Display and parse numbers properly in all locales
...
Change-Id: Iddf74fd6ed3139eede27733b69a31ce2fa7d1a92
Fix: 37311645
Test: make RunSettingsRoboTests
2017-04-19 14:30:19 -07:00
Sundeep Ghuman
b3b0250be8
Fix scanning settings link clickability in Talkback mode.
...
Bug: b/37431709
Test: make RunSettingsRoboTests
Change-Id: I0dc0a524a3c4abd1743748ebc8ebf20937018047
2017-04-19 14:29:11 -07:00
Daniel Nishi
fa3766a220
Don't show warning dialog on opening ASM settings.
...
On older devices, the activation warning dialog would show upon the
switchbar changing to On. This was occurring when the page opens
because the status was changing onResume. By shuffling the switchbar
changes into the ASMSwitchBarController, we can register our listener
after the initialization of the switch bar's first status.
Change-Id: I3610d07345684d1e66444981a8059d1c2965e955
Fixes: 37472724
Test: Settings robotests
2017-04-19 14:04:50 -07:00
Adrian Roos
97d3709b25
Merge "Revert "Changed the ambient display setting name"" into oc-dev
2017-04-19 20:50:33 +00:00
Matthew Fritze
0811fd544b
Revert "Listen to brigtness updates to update brightness summary."
...
This reverts commit 4b95879634
.
Change-Id: I13de29b0e42a09f6b3618826d7eb2a9ed00a54d8
Merged-In: I09fd9c843a4d32a131b87cd638785af552f81507
2017-04-19 20:35:36 +00:00
Andrew Scull
c23357e9af
Use the new OemLockService to get OEM lock state.
...
Previously, the PersistentDataBlockService but that is only one possible
implementation of the OEM lock. The new service abstracts the
implementation so is the API that should be used.
Test: Manual
Bug: 34766843
Change-Id: I5f9cb94996f84c4c082d152f05cd8aef566edc66
2017-04-19 21:33:37 +01:00
TreeHugger Robot
db654c88bc
Merge "Revert "Listen to brigtness updates to update brightness summary.""
2017-04-19 20:22:12 +00:00
Fan Zhang
8a7d60d1ff
Merge "Fix action bar background not wide enough on tablets" into oc-dev am: 8cd4b4541d
...
am: 30dd978830
Change-Id: I2f63be40765bb8d2acd6c9c06809420f53eaa032
2017-04-19 19:45:50 +00:00
Fan Zhang
c109797d13
Merge "Use AfW user handle when setting auto_sync for work" into oc-dev am: 4967646661
...
am: 3acabbdee9
Change-Id: If82d3bcee39eb0c14f1ffb05cb20051d341e2cba
2017-04-19 19:45:30 +00:00
Fan Zhang
a6006285b4
Fix malformatted preference xml.
...
Change-Id: I48273492bebb280f422b97ad0d5cbe23ff667a53
Fix: 37343765
Test: instrumentation test
2017-04-19 12:41:26 -07:00