Brad Fitzpatrick 7f7ce40f90 resolved conflicts for merge of 28130bae to master ...

Change-Id: I13df8dc12092c3d2536e12216df9130d5914380a

2010-08-27 16:11:27 -07:00

..

CheckBoxPreference.java

add a supportsUploading flag in the SyncAdapter description and honor it in the SyncManager

2009-08-20 13:52:22 -07:00

DialogPreference.java

Removed Calls to deprecated APIs

2010-05-17 21:16:20 +02:00

EditTextPreference.java

Deprecate fill_parent and introduce match_parent.

2010-01-08 15:11:38 -08:00

GenericInflater.java

Revert "Merge "Raw types warnings removed.""

2010-05-03 18:51:28 -07:00

ListPreference.java

Allow ListPreference summary to use entry

2010-07-13 10:28:44 -07:00

MultiSelectListPreference.java

Added MultiSelectListPreference

2010-04-15 10:18:17 -07:00

OnDependencyChangeListener.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

package.html

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

Preference.java

resolved conflicts for merge of 28130bae to master

2010-08-27 16:11:27 -07:00

PreferenceActivity.java

Some new preferences features.

2010-08-26 17:43:49 -07:00

PreferenceCategory.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

PreferenceFragment.java

Make getListView() public and hidden, as it is needed for WifiSettings.

2010-08-17 16:49:58 -07:00

PreferenceGroup.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

PreferenceGroupAdapter.java

Fix preference caching to increase recycling of preference views.

2009-10-05 15:31:47 -07:00

PreferenceInflater.java

More fragment work:

2010-08-15 17:20:59 -07:00

PreferenceManager.java

Revert I3fdda2588a7c612d7c9cfb4f25d9aedd1d609162 which open two functions

2010-01-25 13:45:52 -08:00

PreferenceScreen.java

Make the doc for PreferenceScreen aware of PreferenceFragment.

2010-08-13 13:20:04 -07:00

RingtonePreference.java

AI 145870: Add a build property for the default alarm alert. Update the various

2009-04-13 09:57:38 -07:00

SeekBarPreference.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

VolumePreference.java

Workaround for a database update callback that claims that the data doesn't exist.

2010-01-21 09:58:01 -08:00