Sundeep Ghuman
e4d80f99a1
Merge "Revert "Force update APs when enabling wifi in WifiSettings."" into oc-dev
...
am: 76ed3e5344
Change-Id: I7541a423acd06f69fa944a9044a4768e62e76d68
2017-04-20 20:52:45 +00:00
Sundeep Ghuman
76ed3e5344
Merge "Revert "Force update APs when enabling wifi in WifiSettings."" into oc-dev
2017-04-20 20:45:33 +00:00
Sundeep Ghuman
b2bdc8f17b
Revert "Force update APs when enabling wifi in WifiSettings."
...
This reverts commit 1c231d32b1 .
Reason for revert: b/37530557 - ANR in Settings due to deadlock
Change-Id: I85d70aa957dca76189b7600d7b39cb9a09437e91
2017-04-20 17:49:20 +00:00
Daniel Nishi
8f68658aef
Merge "Gracefully handle null volumes after forgetting." into oc-dev
...
am: d6d6185167
Change-Id: I55411a233e2dfb6239d4d2f8e17f32dc2c9fdc73
2017-04-20 17:18:27 +00:00
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
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
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
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
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
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
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
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
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
Fan Zhang
a6006285b4
Fix malformatted preference xml.
...
Change-Id: I48273492bebb280f422b97ad0d5cbe23ff667a53
Fix: 37343765
Test: instrumentation test
2017-04-19 12:41:26 -07:00
Fan Zhang
30dd978830
Merge "Fix action bar background not wide enough on tablets" into oc-dev
...
am: 8cd4b4541d
Change-Id: I226818d439c7351331ff356e4bc25906a6601b9f
2017-04-19 19:39:03 +00:00
Fan Zhang
3acabbdee9
Merge "Use AfW user handle when setting auto_sync for work" into oc-dev
...
am: 4967646661
Change-Id: I6548247f2eb2f4946fd51e109bccfb0ea3bfcfb9
2017-04-19 19:38:30 +00:00
TreeHugger Robot
8cd4b4541d
Merge "Fix action bar background not wide enough on tablets" into oc-dev
2017-04-19 19:36:25 +00:00
TreeHugger Robot
4967646661
Merge "Use AfW user handle when setting auto_sync for work" into oc-dev
2017-04-19 19:32:55 +00:00
Daniel Nishi
0cd1f73b21
Change how we calculate system size.
...
As per storage discussions, the best way to calculate storage for the
System is to just take all known data and subtract it from the used
bytes. There is more to the system than just the /system partition and,
even if we ignore the partitions and use the underlying block device
method of calculating it, we run into the problem of it not adding up to
the actual device size.
Change-Id: I6e1f775ea3f3b8b2cc78d734623934651e2fb7b4
Fixes: 37166310
Test: Robotests
2017-04-19 11:42:34 -07:00
Phil Weaver
a989b19646
Fix default for a11y shortcut setting
...
Settings thought the default for "Allow from lock screen" was
on. It's really off.
Bug: 37158451
Test: Manually confirmed that a fresh device now shows off.
Change-Id: I38dc4f6d2bfec5e0c8562c0d2c6e034db461aa98
2017-04-19 11:09:23 -07:00
Fan Zhang
fbb2331ee5
Use AfW user handle when setting auto_sync for work
...
Change-Id: Ib1aa576a0083282dc59d8fe0d5c4784233eef024
Fix: 36675513
Test: make RunSettingsRoboTests
2017-04-19 10:09:11 -07:00
Phil Weaver
8a3d606a60
Merge "Respect user's choice on a11y shortcut dialog" into oc-dev
...
am: d4ce883c64
Change-Id: I82abeb908dee28948443c05adadc96ba2ca2bea6
2017-04-19 16:14:47 +00:00
Phil Weaver
d4ce883c64
Merge "Respect user's choice on a11y shortcut dialog" into oc-dev
2017-04-19 16:09:16 +00:00
Kevin Chyn
98a7794b13
Merge "FP name shouldn't be allowed to allow/display non-null names" into oc-dev
...
am: eb62407114
Change-Id: I720cf3554c54cedfb674e93c552f45ab368734a9
2017-04-19 08:13:20 +00:00
TreeHugger Robot
eb62407114
Merge "FP name shouldn't be allowed to allow/display non-null names" into oc-dev
2017-04-19 08:07:54 +00:00
Sundeep Ghuman
1c231d32b1
Force update APs when enabling wifi in WifiSettings.
...
Bug: b/37324736
Test: See bug for repro steps.
Change-Id: I2a789e13781c64d2cc72b059685c5f3dfb9ff2ad
2017-04-18 20:28:50 -07:00
Sunny Goyal
77fca989a0
Merge "Using a common class for loading drawables and handling various badging" into oc-dev
...
am: d2561263a8
Change-Id: I2e8d795a9d94f068c988c57cdc7610421b62da96
2017-04-19 02:53:17 +00:00
TreeHugger Robot
d2561263a8
Merge "Using a common class for loading drawables and handling various badging" into oc-dev
2017-04-19 02:43:48 +00:00
Sundeep Ghuman
56de2b521a
Merge "Remove animations in WifiSettings." into oc-dev
...
am: 36a3579c61
Change-Id: I9c0a79d1caed78275e728fc454a97b4124f1da1e
2017-04-19 02:22:28 +00:00
TreeHugger Robot
36a3579c61
Merge "Remove animations in WifiSettings." into oc-dev
2017-04-19 02:17:33 +00:00
Fan Zhang
2bb10c9e57
Merge "Add test to verify regulatory info launches properly" into oc-dev
...
am: 4766183336
Change-Id: Idac77bcc7377dd55169f817d39eea52fc757f135
2017-04-19 01:52:26 +00:00