Brad Fitzpatrick 28130baefb resolved conflicts for merge of 6b50986a to gingerbread-plus-aosp ...

Change-Id: I7c5ec7ae717e75ad242e2c1ad4537052e4eea718

2010-08-27 12:08:40 -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

auto import from //depot/cupcake/@135843

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

ListPreference.java

Allow ListPreference summary to use entry

2010-07-13 10:28:44 -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

SharedPreferences$Editor.startCommit()

2010-08-27 09:10:11 -07:00

PreferenceActivity.java

Fix bug 2520540

2010-03-18 17:08:15 -07:00

PreferenceCategory.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08: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

auto import from //depot/cupcake/@135843

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

PreferenceManager.java

Revert I3fdda2588a7c612d7c9cfb4f25d9aedd1d609162 which open two functions

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

PreferenceScreen.java

Fix the nested preferences title. Again.

2009-06-26 16:05:33 -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