Merge branch 'pretty_icons' into develop

MonoStockPortfolio/MainActivity.cs

@@ -10,7 +10,7 @@ using MonoStockPortfolio.Entities;
 
 namespace MonoStockPortfolio
 {
-    [Activity(Label = "Stock Portfolio", MainLauncher = true)]
+    [Activity(Label = "Stock Portfolio", MainLauncher = true, Icon = "@drawable/icon")]
     public class MainActivity : Activity
     {
         public static string ClassName { get { return "monoStockPortfolio.MainActivity"; } }

MonoStockPortfolio/MonoStockPortfolio.csproj

@@ -62,11 +62,6 @@
   <ItemGroup>
     <AndroidResource Include="Resources\values\strings.xml" />
   </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-hdpi\icon.png" />
-    <AndroidResource Include="Resources\drawable-ldpi\icon.png" />
-    <AndroidResource Include="Resources\drawable-mdpi\icon.png" />
-  </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\layout\addportfolio.xml">
       <SubType>Designer</SubType>
@@ -92,6 +87,11 @@
       <SubType>Designer</SubType>
     </AndroidResource>
   </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-hdpi\icon.png" />
+    <AndroidResource Include="Resources\drawable-ldpi\icon.png" />
+    <AndroidResource Include="Resources\drawable-mdpi\icon.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
      Other similar extension points exist, see Microsoft.Common.targets.