Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 704af39c authored by Charles Mendis's avatar Charles Mendis Committed by Android Git Automerger
Browse files

am 638d8653: Merge change I47ef4266 into eclair 

Merge commit '638d8653' into eclair-mr2

* commit '638d8653':
  Expose WallpaperSettingsActivity in the public API.
parents d874afb8 638d8653

api/current.xml

+28 −0
Original line number Diff line number Diff line
@@ -123841,6 +123841,34 @@ 
</parameter>

</method>

</class>

<class name="WallpaperSettingsActivity"

 extends="android.preference.PreferenceActivity"

 abstract="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<constructor name="WallpaperSettingsActivity"

 type="android.service.wallpaper.WallpaperSettingsActivity"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</constructor>

<field name="EXTRA_PREVIEW_MODE"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.service.wallpaper.PREVIEW_MODE&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

</package>

<package name="android.speech"

>

core/java/android/service/wallpaper/WallpaperSettingsActivity.java

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import android.preference.PreferenceActivity; 
 * Base class for activities that will be used to configure the settings of

 * a wallpaper.  You should derive from this class to allow it to select the

 * proper theme of the activity depending on how it is being used.

 * @hide Live Wallpaper

 */

public class WallpaperSettingsActivity extends PreferenceActivity {

    /**