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

Commit 6925de12 authored by Sergey Ten's avatar Sergey Ten
Browse files

Change thumbnail type in manifest. 

So far only thumbnail was specified by resource id,
while all other images are specified by a relative
path in assets folder. The only reason why thunbnail
was treated differently was idea that a user may
specify a custom thumbnail, generated on fly. Since
this scenario is no longer supported, there is no
reason thumbnails should be treated any differently
than other images.

CR:JoshG.
parent 076f5448

api/current.xml

+1 −1
Original line number Diff line number Diff line
@@ -32653,7 +32653,7 @@ 
>

</field>

<field name="thumbnail"

 type="int"

 type="java.lang.String"

 transient="false"

 volatile="false"

 static="false"

core/java/android/content/pm/BaseThemeInfo.java

+3 −3
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ public class BaseThemeInfo implements Parcelable { 
     * @see thumbnail attribute

     *

     */

    public int thumbnail = - 1;

    public String thumbnail;



    /**

     * The theme id, which does not change when the theme is modified.
@@ -190,7 +190,7 @@ public class BaseThemeInfo implements Parcelable { 
        dest.writeString(wallpaperImageName);

        dest.writeString(favesImageName);

        dest.writeString(favesAppImageName);

        dest.writeInt(thumbnail);

        dest.writeString(thumbnail);

        dest.writeString(themeId);

        dest.writeInt(styleResourceId);

        dest.writeString(name);
@@ -234,7 +234,7 @@ public class BaseThemeInfo implements Parcelable { 
        wallpaperImageName = source.readString();

        favesImageName = source.readString();

        favesAppImageName = source.readString();

        thumbnail = source.readInt();

        thumbnail = source.readString();

        themeId = source.readString();

        styleResourceId = source.readInt();

        name = source.readString();

core/java/android/content/pm/SoundsInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ public class SoundsInfo extends BaseThemeInfo { 
                        break;



                    case THUMBNAIL_INDEX:

                        thumbnail = attrs.getAttributeResourceValue(i, -1);

                        thumbnail = attrs.getAttributeValue(i);

                        break;



                    case AUTHOR_INDEX:

core/java/android/content/pm/ThemeInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ public final class ThemeInfo extends BaseThemeInfo { 


                    case THUMBNAIL_INDEX:

                        // theme thumbprint

                        thumbnail = attrs.getAttributeResourceValue(i, -1);

                        thumbnail = attrs.getAttributeValue(i);

                        break;



                    case AUTHOR_INDEX: