Merge change 23415 into eclair

* changes:
  Open some methods on PrefereneManager to allow others use the inflater.