Browse Source

Oops, fixed build erros on last commits changes.

Matthew Clark 6 years ago
parent
commit
f6e8cca332
6 changed files with 10 additions and 14 deletions
  1. 2 0
      .gitignore
  2. 4 5
      AndroidManifest.xml
  3. 3 0
      lint.xml
  4. 1 3
      project.properties
  5. 0 1
      res/layout/main_home.xml
  6. 0 5
      res/values/styles.xml

+ 2 - 0
.gitignore

@@ -0,0 +1,2 @@
+/bin
+/gen

+ 4 - 5
AndroidManifest.xml

@@ -8,15 +8,13 @@
 
     <uses-sdk
         android:minSdkVersion="11"
-        android:targetSdkVersion="21" />
+        android:targetSdkVersion="22" />
 
     <application
         android:allowBackup="true"
         android:icon="@drawable/icon_launcher"
         android:label="@string/app_name"
-        android:largeHeap="true"
-        android:theme="@style/AppTheme" >
-
+        android:largeHeap="true" >
         <activity
             android:name="org.h4e.utils.iconimport.MainActivity"
             android:label="@string/app_name"
@@ -28,4 +26,5 @@
             </intent-filter>
         </activity>
     </application>
-</manifest>
+
+</manifest>

+ 3 - 0
lint.xml

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+</lint>

+ 1 - 3
project.properties

@@ -11,6 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-19
-android.library.reference.1=../android-support-v7-appcompat
-android.library.reference.2=../google-play-services_lib
+target=android-22

+ 0 - 1
res/layout/main_home.xml

@@ -261,7 +261,6 @@
         android:id="@+id/main_home_intro"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-        android:layout_above="@id/main_home_adview"
         android:layout_margin="@dimen/activity_margin"
         android:background="@drawable/frame"
         android:clickable="true"

+ 0 - 5
res/values/styles.xml

@@ -1,8 +1,3 @@
 <resources>
 
-    <!-- Application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <!-- All customizations that are NOT specific to a particular API-level can go here. -->
-    </style>
-
 </resources>