diff options
author | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2014-06-23 11:00:59 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@collabora.com> | 2014-06-30 14:48:02 +0200 |
commit | 7d8d1fe4aa887a134b10dff38299a1966b5b1c81 (patch) | |
tree | 1cb6753327f18c4d48dac0ccce8e2554b138e906 | |
parent | 1c7bcda5525f710ad016f22995fcd88be6c040aa (diff) |
LODroid2: Remove sdk v7 and v4 support libraries
Change-Id: I41a30d44c44cb439dc2e60e212eea18b00f316dd
-rw-r--r-- | android/experimental/LOAndroid2/.idea/libraries/appcompat_v7_19_1_0.xml | 10 | ||||
-rw-r--r-- | android/experimental/LOAndroid2/.idea/libraries/support_v4_19_1_0.xml | 11 | ||||
-rw-r--r-- | android/experimental/LOAndroid2/app/app.iml | 2 | ||||
-rw-r--r-- | android/experimental/LOAndroid2/app/build.gradle | 1 | ||||
-rw-r--r-- | android/experimental/LOAndroid2/app/src/main/res/menu/main.xml | 3 | ||||
-rwxr-xr-x[-rw-r--r--] | android/experimental/LOAndroid2/gradlew | 0 |
6 files changed, 1 insertions, 26 deletions
diff --git a/android/experimental/LOAndroid2/.idea/libraries/appcompat_v7_19_1_0.xml b/android/experimental/LOAndroid2/.idea/libraries/appcompat_v7_19_1_0.xml deleted file mode 100644 index 7efbfdf278f4..000000000000 --- a/android/experimental/LOAndroid2/.idea/libraries/appcompat_v7_19_1_0.xml +++ /dev/null @@ -1,10 +0,0 @@ -<component name="libraryTable"> - <library name="appcompat-v7-19.1.0"> - <CLASSES> - <root url="jar://$PROJECT_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/19.1.0/classes.jar!/" /> - <root url="file://$PROJECT_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/19.1.0/res" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> -</component>
\ No newline at end of file diff --git a/android/experimental/LOAndroid2/.idea/libraries/support_v4_19_1_0.xml b/android/experimental/LOAndroid2/.idea/libraries/support_v4_19_1_0.xml deleted file mode 100644 index 1ca1ac68ad96..000000000000 --- a/android/experimental/LOAndroid2/.idea/libraries/support_v4_19_1_0.xml +++ /dev/null @@ -1,11 +0,0 @@ -<component name="libraryTable"> - <library name="support-v4-19.1.0"> - <CLASSES> - <root url="jar://$USER_HOME$/Programs/android-sdk-linux/extras/android/m2repository/com/android/support/support-v4/19.1.0/support-v4-19.1.0.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES> - <root url="jar://$USER_HOME$/Programs/android-sdk-linux/extras/android/m2repository/com/android/support/support-v4/19.1.0/support-v4-19.1.0-sources.jar!/" /> - </SOURCES> - </library> -</component>
\ No newline at end of file diff --git a/android/experimental/LOAndroid2/app/app.iml b/android/experimental/LOAndroid2/app/app.iml index 34b87a5df4f4..2fc60e01b0bf 100644 --- a/android/experimental/LOAndroid2/app/app.iml +++ b/android/experimental/LOAndroid2/app/app.iml @@ -61,8 +61,6 @@ </content> <orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="library" exported="" name="appcompat-v7-19.1.0" level="project" /> - <orderEntry type="library" exported="" name="support-v4-19.1.0" level="project" /> </component> </module> diff --git a/android/experimental/LOAndroid2/app/build.gradle b/android/experimental/LOAndroid2/app/build.gradle index 7e98dd4c48c9..6053f9101f39 100644 --- a/android/experimental/LOAndroid2/app/build.gradle +++ b/android/experimental/LOAndroid2/app/build.gradle @@ -20,5 +20,4 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:19.+' } diff --git a/android/experimental/LOAndroid2/app/src/main/res/menu/main.xml b/android/experimental/LOAndroid2/app/src/main/res/menu/main.xml index 6768fd32a890..e9709c90d729 100644 --- a/android/experimental/LOAndroid2/app/src/main/res/menu/main.xml +++ b/android/experimental/LOAndroid2/app/src/main/res/menu/main.xml @@ -4,6 +4,5 @@ tools:context="org.libreoffice.MainActivity" > <item android:id="@+id/action_settings" android:title="@string/action_settings" - android:orderInCategory="100" - app:showAsAction="never" /> + android:orderInCategory="100" /> </menu> diff --git a/android/experimental/LOAndroid2/gradlew b/android/experimental/LOAndroid2/gradlew index 91a7e269e19d..91a7e269e19d 100644..100755 --- a/android/experimental/LOAndroid2/gradlew +++ b/android/experimental/LOAndroid2/gradlew |