diff --git a/.gitignore b/.gitignore index f8d7224..de6fd71 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ - +project.properties *.i .hg/store/fncache @@ -38,3 +38,77 @@ bin/AndroidManifest.xml *.dex *.jar + +#From https://github.com/ReactiveX/RxAndroid/blob/master/.gitignore + +# Compiled source # +################### +*.class + +# Packages # +############ +# it's better to unpack these files and commit the raw source +# git has its own built in compression methods +*.7z +*.dmg +*.gz +*.iso +*.rar +*.tar +*.zip + +# Logs and databases # +###################### +*.log + +# OS generated files # +###################### +.DS_Store* +ehthumbs.db +Icon? +Thumbs.db + +# Editor Files # +################ +*~ +*.swp + +# Gradle Files # +################ +.gradle +.gradletasknamecache +.m2 + +# Build output directies +target/ +build/ + +# IntelliJ specific files/directories +out +.idea +*.ipr +*.iws +*.iml +atlassian-ide-plugin.xml + +# AndroidStudio specific files/directories +local.properties + +# Eclipse specific files/directories +.classpath +.project +.settings +.metadata +bin/ + +# NetBeans specific files/directories +.nbattrs +/.nb-gradle/profiles/private/ +.nb-gradle-properties + +# Android +local.properties + +# jEnv +.java-version + diff --git a/project.properties b/project.properties index a95cbd7..de1367a 100644 --- a/project.properties +++ b/project.properties @@ -11,5 +11,5 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-20 +target=android-19 android.library.reference.1=../sinavideo_playersdk diff --git a/res/layout/simple_test.xml b/res/layout/simple_test.xml index 7a44815..38c5e62 100644 --- a/res/layout/simple_test.xml +++ b/res/layout/simple_test.xml @@ -1,6 +1,6 @@ @@ -13,4 +13,29 @@ app:layerAttrs="@array/sv_videoview_layers2" > + + +