diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0bc0d7d0a47c04070c02a72865e1ec49924b37b6..007372d0811fa5914a46a44992b7bd5ec368e754 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -10,45 +10,10 @@
</component>
<component name="ChangeListManager">
<list default="true" id="465ea6dc-8a6c-4c2f-9b3c-de0cba274c5a" name="Default" comment="">
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/IceScreenUtils.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/LicenseActivity.java" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/app/src/main/res/drawable-nodpi/bush.jpg" afterPath="" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/app/src/main/res/drawable-nodpi/bush_thumb.jpg" afterPath="" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/app/src/main/res/drawable-nodpi/clovers.jpg" afterPath="" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/app/src/main/res/drawable-nodpi/clovers_thumb.jpg" afterPath="" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/app/src/main/res/drawable-nodpi/daisy.jpg" afterPath="" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/app/src/main/res/drawable-nodpi/daisy_thumb.jpg" afterPath="" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/app/src/main/res/drawable-nodpi/foam.jpg" afterPath="" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/app/src/main/res/drawable-nodpi/foam_thumb.jpg" afterPath="" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/app/src/main/res/drawable-nodpi/ivy.jpg" afterPath="" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/app/src/main/res/drawable-nodpi/ivy_thumb.jpg" afterPath="" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/app/src/main/res/drawable-nodpi/menu_background.jpg" afterPath="" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/app/src/main/res/drawable-nodpi/night.jpg" afterPath="" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/app/src/main/res/drawable-nodpi/night_thumb.jpg" afterPath="" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/app/src/main/res/drawable-nodpi/rock.jpg" afterPath="" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/app/src/main/res/drawable-nodpi/rock_thumb.jpg" afterPath="" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/app/src/main/res/drawable-nodpi/wall.jpg" afterPath="" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/app/src/main/res/drawable-nodpi/wall_thumb.jpg" afterPath="" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/app/src/main/res/mipmap-hdpi/ic_launcher.png" afterPath="" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/app/src/main/res/mipmap-mdpi/ic_launcher.png" afterPath="" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/app/src/main/res/mipmap-xhdpi/ic_launcher.png" afterPath="" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/app/src/main/res/mipmap-xxhdpi/ic_launcher.png" afterPath="" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/build/intermediates/dex-cache/cache.xml" afterPath="" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/drawable-nodpi/ic_apply.png" afterPath="$PROJECT_DIR$/app/src/main/res/drawable-nodpi/ic_apply.png" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/drawable-nodpi/ic_back.png" afterPath="$PROJECT_DIR$/app/src/main/res/drawable-nodpi/ic_back.png" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/drawable-nodpi/ic_source_button.png" afterPath="$PROJECT_DIR$/app/src/main/res/drawable-nodpi/ic_source_button.png" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/drawable-nodpi/ic_wallpaper_button.png" afterPath="$PROJECT_DIR$/app/src/main/res/drawable-nodpi/ic_wallpaper_button.png" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png" afterPath="$PROJECT_DIR$/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/ICEcons.iml" afterPath="$PROJECT_DIR$/ICEcons.iml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/app.iml" afterPath="$PROJECT_DIR$/app/app.iml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/build.gradle" afterPath="$PROJECT_DIR$/app/build.gradle" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" afterPath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/MainActivity.java" afterPath="$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/MainActivity.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/WallpaperActivity.java" afterPath="$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/WallpaperActivity.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/WallpaperSetActivity.java" afterPath="$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/WallpaperSetActivity.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/local.properties" afterPath="$PROJECT_DIR$/local.properties" />
</list>
<ignored path="ICEcons.iws" />
<ignored path=".idea/workspace.xml" />
@@ -80,8 +45,9 @@
<entry file="file://$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/MainActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
- <caret line="11" column="29" selection-start-line="11" selection-start-column="29" selection-end-line="11" selection-end-column="29" />
+ <caret line="14" column="0" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
<folding>
+ <element signature="imports" expanded="true" />
<element signature="e#2612#2768#0" expanded="true" />
<element signature="e#2767#2768#0" expanded="true" />
<element signature="e#4304#4452#0" expanded="true" />
@@ -93,6 +59,38 @@
</provider>
</entry>
</file>
+ <file leaf-file-name="build.gradle" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/build.gradle">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.0">
+ <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="build.gradle" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/app/build.gradle">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="-7.6153846">
+ <caret line="11" column="24" selection-start-line="11" selection-start-column="24" selection-end-line="11" selection-end-column="24" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="AndroidManifest.xml" pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.12661196">
+ <caret line="6" column="35" selection-start-line="6" selection-start-column="35" selection-end-line="6" selection-end-column="35" />
+ <folding>
+ <element signature="e#532#550#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
<file leaf-file-name="LicenseActivity.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/LicenseActivity.java">
<provider selected="true" editor-type-id="text-editor">
@@ -120,11 +118,11 @@
</provider>
</entry>
</file>
- <file leaf-file-name="WallpaperSetActivity.java" pinned="false" current-in-tab="true">
+ <file leaf-file-name="WallpaperSetActivity.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/WallpaperSetActivity.java">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.22272727">
- <caret line="64" column="53" selection-start-line="64" selection-start-column="53" selection-end-line="64" selection-end-column="53" />
+ <state vertical-scroll-proportion="0.0">
+ <caret line="55" column="0" selection-start-line="55" selection-start-column="0" selection-end-line="55" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -136,7 +134,7 @@
<entry file="file://$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/IceScreenUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
- <caret line="23" column="8" selection-start-line="23" selection-start-column="8" selection-end-line="23" selection-end-column="70" />
+ <caret line="25" column="1" selection-start-line="25" selection-start-column="1" selection-end-line="25" selection-end-column="1" />
<folding />
</state>
</provider>
@@ -146,7 +144,7 @@
<entry file="file://$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/IceImageUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
- <caret line="13" column="51" selection-start-line="13" selection-start-column="51" selection-end-line="13" selection-end-column="51" />
+ <caret line="41" column="72" selection-start-line="0" selection-start-column="0" selection-end-line="145" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -1380,7 +1378,7 @@
</option>
<option name="modificationStamps">
<map>
- <entry key="$PROJECT_DIR$" value="4382698451734" />
+ <entry key="$PROJECT_DIR$" value="4382713976917" />
</map>
</option>
<option name="projectBuildClasspath">
@@ -1663,17 +1661,17 @@
<option value="$PROJECT_DIR$/app/src/main/res/values/colors.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_wallpaper.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/values/styles.xml" />
- <option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/App.java" />
<option value="$PROJECT_DIR$/app/src/main/res/IceImageUtils.java" />
<option value="$PROJECT_DIR$/app/src/main/res/IceScreenUtils.java" />
- <option value="$PROJECT_DIR$/app/build.gradle" />
<option value="$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/IceScreenUtils.java" />
<option value="$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/IceImageUtils.java" />
<option value="$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/WallpaperActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/MainActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/LicenseActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/WallpaperSetActivity.java" />
+ <option value="$PROJECT_DIR$/app/build.gradle" />
+ <option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
</list>
</option>
</component>
@@ -1729,52 +1727,6 @@
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidBuildScriptsGroupNode" />
</PATH_ELEMENT>
</PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="ICEcons" />
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="app" />
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="res" />
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidResFolderNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="ICEcons" />
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="app" />
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="java" />
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidSourceTypeNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="ICEcons" />
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="app" />
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="java" />
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidSourceTypeNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="icecons" />
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidPsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="ICEcons" />
@@ -2244,6 +2196,7 @@
<state vertical-scroll-proportion="0.0">
<caret line="22" column="0" selection-start-line="22" selection-start-column="0" selection-end-line="22" selection-end-column="0" />
<folding>
+ <element signature="imports" expanded="true" />
<element signature="e#2612#2768#0" expanded="true" />
<element signature="e#2767#2768#0" expanded="true" />
<element signature="e#4304#4452#0" expanded="true" />
@@ -2301,6 +2254,7 @@
<state vertical-scroll-proportion="0.0">
<caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" />
<folding>
+ <element signature="imports" expanded="true" />
<element signature="e#2612#2768#0" expanded="true" />
<element signature="e#2767#2768#0" expanded="true" />
<element signature="e#4304#4452#0" expanded="true" />
@@ -2497,36 +2451,43 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/build.gradle">
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/WallpaperActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
- <caret line="8" column="24" selection-start-line="8" selection-start-column="24" selection-end-line="8" selection-end-column="24" />
- <folding />
+ <caret line="67" column="0" selection-start-line="67" selection-start-column="0" selection-end-line="67" selection-end-column="0" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/LicenseActivity.java">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.3125">
- <caret line="10" column="40" selection-start-line="10" selection-start-column="40" selection-end-line="10" selection-end-column="40" />
+ <state vertical-scroll-proportion="0.0">
+ <caret line="93" column="141" selection-start-line="93" selection-start-column="141" selection-end-line="93" selection-end-column="141" />
<folding>
- <element signature="e#408#426#0" expanded="true" />
+ <element signature="e#2484#2632#0" expanded="true" />
+ <element signature="e#2631#2632#0" expanded="true" />
+ <element signature="e#3835#3982#0" expanded="true" />
+ <element signature="e#3981#3982#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/build.gradle">
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/WallpaperSetActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
- <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- <folding />
+ <caret line="55" column="0" selection-start-line="55" selection-start-column="0" selection-end-line="55" selection-end-column="0" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/IceImageUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
- <caret line="13" column="51" selection-start-line="13" selection-start-column="51" selection-end-line="13" selection-end-column="51" />
+ <caret line="41" column="72" selection-start-line="0" selection-start-column="0" selection-end-line="145" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -2536,7 +2497,7 @@
<entry file="file://$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/IceScreenUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
- <caret line="23" column="8" selection-start-line="23" selection-start-column="8" selection-end-line="23" selection-end-column="70" />
+ <caret line="25" column="1" selection-start-line="25" selection-start-column="1" selection-end-line="25" selection-end-column="1" />
<folding />
</state>
</provider>
@@ -2544,8 +2505,9 @@
<entry file="file://$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/MainActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
- <caret line="11" column="29" selection-start-line="11" selection-start-column="29" selection-end-line="11" selection-end-column="29" />
+ <caret line="14" column="0" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
<folding>
+ <element signature="imports" expanded="true" />
<element signature="e#2612#2768#0" expanded="true" />
<element signature="e#2767#2768#0" expanded="true" />
<element signature="e#4304#4452#0" expanded="true" />
@@ -2556,35 +2518,28 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/WallpaperActivity.java">
+ <entry file="file://$PROJECT_DIR$/build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
- <caret line="67" column="0" selection-start-line="67" selection-start-column="0" selection-end-line="67" selection-end-column="0" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/LicenseActivity.java">
+ <entry file="file://$PROJECT_DIR$/app/build.gradle">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="93" column="141" selection-start-line="93" selection-start-column="141" selection-end-line="93" selection-end-column="141" />
- <folding>
- <element signature="e#2484#2632#0" expanded="true" />
- <element signature="e#2631#2632#0" expanded="true" />
- <element signature="e#3835#3982#0" expanded="true" />
- <element signature="e#3981#3982#0" expanded="true" />
- </folding>
+ <state vertical-scroll-proportion="-7.6153846">
+ <caret line="11" column="24" selection-start-line="11" selection-start-column="24" selection-end-line="11" selection-end-column="24" />
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/ovh/ice/icecons/WallpaperSetActivity.java">
+ <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.22272727">
- <caret line="64" column="53" selection-start-line="64" selection-start-column="53" selection-end-line="64" selection-end-column="53" />
+ <state vertical-scroll-proportion="0.12661196">
+ <caret line="6" column="35" selection-start-line="6" selection-start-column="35" selection-end-line="6" selection-end-column="35" />
<folding>
- <element signature="imports" expanded="true" />
+ <element signature="e#532#550#0" expanded="true" />
</folding>
</state>
</provider>
diff --git a/app/app.iml b/app/app.iml
index 087373adec8d20765520b3a89b97a9779e4f592c..b6dfecb9153d9c88e34db88116871719f5608253 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -61,13 +61,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -75,29 +68,24 @@
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
- <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
diff --git a/app/build.gradle b/app/build.gradle
index 6176bdbd7043aefb6fc2f2577976db93156542ad..1ee3544adb855375bb3626df61e2ce4269548c94 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
applicationId "ovh.ice.icecons"
minSdkVersion 16
targetSdkVersion 23
- versionCode 3
- versionName "1.2"
+ versionCode 4
+ versionName "2.0"
}
buildTypes {
release {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7899e24dc6d8b7f9925ad41946758dd17ea42705..f31d2127c7c10b54fad2370568bd628b65c78412 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="ovh.ice.icecons">
+ package="ovh.ice.icecons"
+ android:versionCode="4"
+ android:versionName="2.0"
+ android:minSdkVersion="16"
+ android:targetSdkVersion="23" >
<uses-permission android:name="android.permission.SET_WALLPAPER" />
<uses-permission android:name="android.permission.SET_WALLPAPER_HINTS" />
@@ -10,7 +14,7 @@
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:supportsRtl="true"
- android:theme="@style/AppTheme">
+ android:theme="@style/AppTheme" >
<activity android:name=".MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />