svetoslavganov 76879bc234 resolved conflicts w/ 75986cf9bc merge....

2009-05-15 00:44:45 -07:00

..

CheckBoxPreference.java

Accessibility feature - framework changes (replacing 698, 699, 700, 701 and merging with the latest Donut)

2009-05-14 23:47:05 -07:00

DialogPreference.java

auto import from //depot/cupcake/@135843

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

EditTextPreference.java

auto import from //depot/cupcake/@135843

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

GenericInflater.java

auto import from //depot/cupcake/@135843

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

ListPreference.java

auto import from //depot/cupcake/@135843

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

AI 143298: am: CL 143150 Fixed the problem where setEnabled(false) has no effect from onResume().

2009-03-27 17:46:36 -07:00

PreferenceActivity.java

auto import from //depot/cupcake/@135843

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

auto import from //depot/cupcake/@135843

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

PreferenceInflater.java

auto import from //depot/cupcake/@135843

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

PreferenceManager.java

auto import from //depot/cupcake/@135843

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

PreferenceScreen.java

auto import from //depot/cupcake/@135843

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

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

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