am 0df39f39: am 2fba8be9: am 4e54c2a1: Integrate remote display routes into screen cast settings UI.

* commit '0df39f39fcc45ff3efe92740ee46d7a762410b86':
  Integrate remote display routes into screen cast settings UI.
This commit is contained in:
Jeff Brown
2013-11-11 20:51:05 -08:00
committed by Android Git Automerger
5 changed files with 268 additions and 289 deletions

View File

@@ -509,7 +509,6 @@ public class Settings extends PreferenceActivity
// uiOptions for fragments also defined as activities in manifest.
if (WifiSettings.class.getName().equals(fragmentName) ||
WifiP2pSettings.class.getName().equals(fragmentName) ||
WifiDisplaySettings.class.getName().equals(fragmentName) ||
BluetoothSettings.class.getName().equals(fragmentName) ||
DreamSettings.class.getName().equals(fragmentName) ||
LocationSettings.class.getName().equals(fragmentName) ||