diff --git a/android_commons.gradle b/android_commons.gradle index fcb1a6b..bab67bd 100644 --- a/android_commons.gradle +++ b/android_commons.gradle @@ -9,7 +9,7 @@ android { buildToolsVersion '21.1.2' defaultConfig { - minSdkVersion 10 + minSdkVersion 14 targetSdkVersion 21 } diff --git a/app/build.gradle b/app/build.gradle index 7b1c4c5..dfac463 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,7 +11,6 @@ apt { dependencies { compile project(':libraries:aFileChooser') - compile project(':libraries:Preferencefragment') compile project(':libraries:payme') diff --git a/app/src/main/java/com/doplgangr/secrecy/premium/PremiumFragment.java b/app/src/main/java/com/doplgangr/secrecy/premium/PremiumFragment.java index 7481608..e483da0 100644 --- a/app/src/main/java/com/doplgangr/secrecy/premium/PremiumFragment.java +++ b/app/src/main/java/com/doplgangr/secrecy/premium/PremiumFragment.java @@ -16,9 +16,9 @@ package com.doplgangr.secrecy.premium; import android.app.AlertDialog; +import android.app.Fragment; import android.content.Intent; import android.os.Bundle; -import android.support.v4.app.Fragment; import android.support.v7.app.ActionBarActivity; import android.util.Log; import android.view.LayoutInflater; diff --git a/app/src/main/java/com/doplgangr/secrecy/settings/SettingsFragment.java b/app/src/main/java/com/doplgangr/secrecy/settings/SettingsFragment.java index a7daa5a..9ce565c 100644 --- a/app/src/main/java/com/doplgangr/secrecy/settings/SettingsFragment.java +++ b/app/src/main/java/com/doplgangr/secrecy/settings/SettingsFragment.java @@ -32,10 +32,10 @@ import android.os.Bundle; import android.preference.CheckBoxPreference; import android.preference.Preference; +import android.preference.PreferenceFragment; import android.preference.PreferenceGroup; import android.preference.PreferenceManager; import android.support.v4.content.IntentCompat; -import android.support.v4.preference.PreferenceFragment; import android.support.v7.app.ActionBarActivity; import android.util.Log; import android.view.LayoutInflater; @@ -48,12 +48,12 @@ import com.doplgangr.secrecy.Config; import com.doplgangr.secrecy.CustomApp; +import com.doplgangr.secrecy.R; +import com.doplgangr.secrecy.Util; import com.doplgangr.secrecy.filesystem.Storage; import com.doplgangr.secrecy.premium.PremiumFragment; import com.doplgangr.secrecy.premium.PremiumStateHelper; import com.doplgangr.secrecy.premium.StealthMode; -import com.doplgangr.secrecy.R; -import com.doplgangr.secrecy.Util; import com.doplgangr.secrecy.views.VaultsListFragment; import com.ipaulpro.afilechooser.FileChooserActivity; import com.ipaulpro.afilechooser.utils.FileUtils; diff --git a/app/src/main/java/com/doplgangr/secrecy/updatemanager/UpdateManager.java b/app/src/main/java/com/doplgangr/secrecy/updatemanager/UpdateManager.java index a873b47..b369087 100644 --- a/app/src/main/java/com/doplgangr/secrecy/updatemanager/UpdateManager.java +++ b/app/src/main/java/com/doplgangr/secrecy/updatemanager/UpdateManager.java @@ -20,6 +20,7 @@ package com.doplgangr.secrecy.updatemanager; import android.app.Activity; +import android.app.Fragment; import android.content.Context; import android.content.DialogInterface; import android.content.SharedPreferences; @@ -28,7 +29,6 @@ import android.os.Bundle; import android.os.Environment; import android.preference.PreferenceManager; -import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -36,10 +36,10 @@ import android.widget.TextView; import com.doplgangr.secrecy.Config; -import com.doplgangr.secrecy.filesystem.Base64Coder; -import com.doplgangr.secrecy.filesystem.Storage; import com.doplgangr.secrecy.R; import com.doplgangr.secrecy.Util; +import com.doplgangr.secrecy.filesystem.Base64Coder; +import com.doplgangr.secrecy.filesystem.Storage; import com.doplgangr.secrecy.views.VaultsListFragment; import org.apache.commons.io.FileUtils; diff --git a/app/src/main/java/com/doplgangr/secrecy/views/FileImportActivity.java b/app/src/main/java/com/doplgangr/secrecy/views/FileImportActivity.java index 222da4b..003b657 100644 --- a/app/src/main/java/com/doplgangr/secrecy/views/FileImportActivity.java +++ b/app/src/main/java/com/doplgangr/secrecy/views/FileImportActivity.java @@ -1,26 +1,26 @@ package com.doplgangr.secrecy.views; +import android.app.Fragment; +import android.app.FragmentManager; +import android.app.FragmentTransaction; import android.app.NotificationManager; import android.content.Context; import android.content.Intent; import android.net.Uri; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentTransaction; import android.support.v4.app.NotificationCompat; import android.support.v7.app.ActionBarActivity; import android.support.v7.widget.Toolbar; import android.widget.Toast; import com.doplgangr.secrecy.CustomApp; +import com.doplgangr.secrecy.R; +import com.doplgangr.secrecy.Util; import com.doplgangr.secrecy.events.AddingFileDoneEvent; import com.doplgangr.secrecy.events.AddingFileEvent; import com.doplgangr.secrecy.filesystem.encryption.Vault; import com.doplgangr.secrecy.filesystem.encryption.VaultHolder; import com.doplgangr.secrecy.jobs.AddFileJob; -import com.doplgangr.secrecy.R; -import com.doplgangr.secrecy.Util; import java.util.ArrayList; @@ -50,7 +50,7 @@ protected void onCreate(Bundle savedInstanceState) { setSupportActionBar(mToolbar); FileImportFragment fragment = new FileImportFragment(); - FragmentManager fragmentManager = getSupportFragmentManager(); + FragmentManager fragmentManager = getFragmentManager(); fragmentManager.beginTransaction() .replace(R.id.drawer_layout, fragment, "mainactivitycontent") //Replace the whole drawer layout .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN) diff --git a/app/src/main/java/com/doplgangr/secrecy/views/FileViewer.java b/app/src/main/java/com/doplgangr/secrecy/views/FileViewer.java index 5b98c91..a23e1de 100644 --- a/app/src/main/java/com/doplgangr/secrecy/views/FileViewer.java +++ b/app/src/main/java/com/doplgangr/secrecy/views/FileViewer.java @@ -19,6 +19,7 @@ package com.doplgangr.secrecy.views; +import android.app.Fragment; import android.content.DialogInterface; import android.content.Intent; import android.content.pm.ResolveInfo; @@ -26,7 +27,6 @@ import android.os.AsyncTask; import android.os.Bundle; import android.os.Parcelable; -import android.support.v4.app.Fragment; import android.support.v7.app.ActionBarActivity; import android.view.LayoutInflater; import android.view.View; @@ -36,15 +36,15 @@ import com.doplgangr.secrecy.Config; import com.doplgangr.secrecy.CustomApp; +import com.doplgangr.secrecy.R; +import com.doplgangr.secrecy.Util; import com.doplgangr.secrecy.filesystem.CryptStateListener; +import com.doplgangr.secrecy.filesystem.OurFileProvider; +import com.doplgangr.secrecy.filesystem.Storage; import com.doplgangr.secrecy.filesystem.encryption.Vault; import com.doplgangr.secrecy.filesystem.files.EncryptedFile; import com.doplgangr.secrecy.filesystem.files.SecrecyFile; -import com.doplgangr.secrecy.filesystem.OurFileProvider; -import com.doplgangr.secrecy.filesystem.Storage; import com.doplgangr.secrecy.jobs.AddFileJob; -import com.doplgangr.secrecy.R; -import com.doplgangr.secrecy.Util; import java.io.File; import java.util.ArrayList; diff --git a/app/src/main/java/com/doplgangr/secrecy/views/FilesActivity.java b/app/src/main/java/com/doplgangr/secrecy/views/FilesActivity.java index 66c5e94..a332c37 100644 --- a/app/src/main/java/com/doplgangr/secrecy/views/FilesActivity.java +++ b/app/src/main/java/com/doplgangr/secrecy/views/FilesActivity.java @@ -1,19 +1,22 @@ package com.doplgangr.secrecy.views; +import android.app.Fragment; +import android.app.FragmentManager; +import android.app.FragmentTransaction; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentTransaction; import android.support.v7.app.ActionBarActivity; import android.support.v7.widget.Toolbar; import android.view.WindowManager; import com.doplgangr.secrecy.Config; -import com.doplgangr.secrecy.filesystem.Storage; import com.doplgangr.secrecy.R; import de.greenrobot.event.EventBus; +//import android.support.v4.app.Fragment; +//import android.support.v4.app.FragmentManager; +//import android.support.v4.app.FragmentTransaction; + public class FilesActivity extends ActionBarActivity implements VaultsListFragment.OnFragmentFinishListener { @@ -33,7 +36,7 @@ protected void onCreate(Bundle savedInstanceState) { String password = extras.getString(Config.password_extra); overridePendingTransition(R.anim.slide_in_right, R.anim.fadeout); - fragmentManager = getSupportFragmentManager(); + fragmentManager = getFragmentManager(); if (fragmentManager.findFragmentByTag(FilesListFragment.class.getName()) == null) { FilesListFragment fragment = new FilesListFragment(); Bundle bundle = new Bundle(); diff --git a/app/src/main/java/com/doplgangr/secrecy/views/MainActivity.java b/app/src/main/java/com/doplgangr/secrecy/views/MainActivity.java index 72dc2b0..21304d3 100644 --- a/app/src/main/java/com/doplgangr/secrecy/views/MainActivity.java +++ b/app/src/main/java/com/doplgangr/secrecy/views/MainActivity.java @@ -20,6 +20,9 @@ package com.doplgangr.secrecy.views; import android.app.AlertDialog; +import android.app.Fragment; +import android.app.FragmentManager; +import android.app.FragmentTransaction; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; @@ -28,9 +31,6 @@ import android.content.pm.PackageManager; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentTransaction; import android.support.v7.app.ActionBarActivity; import android.support.v7.app.ActionBarDrawerToggle; import android.support.v7.widget.Toolbar; @@ -85,7 +85,7 @@ public void onCreate(Bundle savedInstanceState) { Storage.deleteTemp(); //Start clean VaultHolder.getInstance().clear(); - fragmentManager = getSupportFragmentManager(); + fragmentManager = getFragmentManager(); switchFragment(0); setSupportActionBar(mToolbar); if (PreferenceManager.getDefaultSharedPreferences(context) @@ -243,21 +243,20 @@ void addFragment(final Fragment fragment, int transition1, int transition2) { mNavigation.setSelectedItem(mFragmentNameList.indexOf(fragment.getClass())); } String tag = fragment.getClass().getName(); - FragmentManager manager = getSupportFragmentManager(); - if (manager.getBackStackEntryCount() >= 1) { + if (fragmentManager.getBackStackEntryCount() >= 1) { - String activeFragmentTag = getSupportFragmentManager() - .getBackStackEntryAt(getSupportFragmentManager() + String activeFragmentTag = fragmentManager + .getBackStackEntryAt(fragmentManager .getBackStackEntryCount() - 1).getName(); - Fragment activeFragment = getSupportFragmentManager() + Fragment activeFragment = fragmentManager .findFragmentByTag(activeFragmentTag); // Don't switch fragment if already active if (activeFragment.getClass().equals(fragment.getClass())){ return; } //clear all except lowest - FragmentManager.BackStackEntry first = manager.getBackStackEntryAt(0); - manager.popBackStackImmediate(first.getId(), FragmentManager.POP_BACK_STACK_INCLUSIVE); + FragmentManager.BackStackEntry first = fragmentManager.getBackStackEntryAt(0); + fragmentManager.popBackStackImmediate(first.getId(), FragmentManager.POP_BACK_STACK_INCLUSIVE); } FragmentTransaction transaction = fragmentManager.beginTransaction() .setCustomAnimations(transition1, transition2) diff --git a/app/src/main/java/com/doplgangr/secrecy/views/VaultsListFragment.java b/app/src/main/java/com/doplgangr/secrecy/views/VaultsListFragment.java index de3d340..c1ecbf8 100644 --- a/app/src/main/java/com/doplgangr/secrecy/views/VaultsListFragment.java +++ b/app/src/main/java/com/doplgangr/secrecy/views/VaultsListFragment.java @@ -21,6 +21,7 @@ import android.app.Activity; import android.app.AlertDialog; +import android.app.Fragment; import android.app.NotificationManager; import android.app.ProgressDialog; import android.content.Context; @@ -30,7 +31,6 @@ import android.net.Uri; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.v4.app.Fragment; import android.support.v4.app.NotificationCompat; import android.support.v7.app.ActionBarActivity; import android.text.InputType; @@ -48,15 +48,15 @@ import android.widget.ViewAnimator; import com.doplgangr.secrecy.CustomApp; +import com.doplgangr.secrecy.R; +import com.doplgangr.secrecy.Util; import com.doplgangr.secrecy.events.RestoreDoneEvent; import com.doplgangr.secrecy.events.RestoringFileEvent; +import com.doplgangr.secrecy.filesystem.Storage; import com.doplgangr.secrecy.filesystem.encryption.Vault; import com.doplgangr.secrecy.filesystem.encryption.VaultHolder; -import com.doplgangr.secrecy.filesystem.Storage; import com.doplgangr.secrecy.jobs.RestoreJob; -import com.doplgangr.secrecy.R; import com.doplgangr.secrecy.settings.SettingsFragment; -import com.doplgangr.secrecy.Util; import com.ipaulpro.afilechooser.FileChooserActivity; import com.ipaulpro.afilechooser.utils.FileUtils; diff --git a/libraries/Preferencefragment/.gitignore b/libraries/Preferencefragment/.gitignore deleted file mode 100644 index 10ba002..0000000 --- a/libraries/Preferencefragment/.gitignore +++ /dev/null @@ -1,12 +0,0 @@ -#Android Studio -.idea -*.iml -*.ipr -*.iws -classes -gen-external-apklibs - -#Gradle -.gradle -local.properties -build \ No newline at end of file diff --git a/libraries/Preferencefragment/AndroidManifest.xml b/libraries/Preferencefragment/AndroidManifest.xml deleted file mode 100644 index 787f5c5..0000000 --- a/libraries/Preferencefragment/AndroidManifest.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - diff --git a/libraries/Preferencefragment/LICENSE b/libraries/Preferencefragment/LICENSE deleted file mode 100644 index 37ec93a..0000000 --- a/libraries/Preferencefragment/LICENSE +++ /dev/null @@ -1,191 +0,0 @@ -Apache License -Version 2.0, January 2004 -http://www.apache.org/licenses/ - -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - -1. Definitions. - -"License" shall mean the terms and conditions for use, reproduction, and -distribution as defined by Sections 1 through 9 of this document. - -"Licensor" shall mean the copyright owner or entity authorized by the copyright -owner that is granting the License. - -"Legal Entity" shall mean the union of the acting entity and all other entities -that control, are controlled by, or are under common control with that entity. -For the purposes of this definition, "control" means (i) the power, direct or -indirect, to cause the direction or management of such entity, whether by -contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the -outstanding shares, or (iii) beneficial ownership of such entity. - -"You" (or "Your") shall mean an individual or Legal Entity exercising -permissions granted by this License. - -"Source" form shall mean the preferred form for making modifications, including -but not limited to software source code, documentation source, and configuration -files. - -"Object" form shall mean any form resulting from mechanical transformation or -translation of a Source form, including but not limited to compiled object code, -generated documentation, and conversions to other media types. - -"Work" shall mean the work of authorship, whether in Source or Object form, made -available under the License, as indicated by a copyright notice that is included -in or attached to the work (an example is provided in the Appendix below). - -"Derivative Works" shall mean any work, whether in Source or Object form, that -is based on (or derived from) the Work and for which the editorial revisions, -annotations, elaborations, or other modifications represent, as a whole, an -original work of authorship. For the purposes of this License, Derivative Works -shall not include works that remain separable from, or merely link (or bind by -name) to the interfaces of, the Work and Derivative Works thereof. - -"Contribution" shall mean any work of authorship, including the original version -of the Work and any modifications or additions to that Work or Derivative Works -thereof, that is intentionally submitted to Licensor for inclusion in the Work -by the copyright owner or by an individual or Legal Entity authorized to submit -on behalf of the copyright owner. For the purposes of this definition, -"submitted" means any form of electronic, verbal, or written communication sent -to the Licensor or its representatives, including but not limited to -communication on electronic mailing lists, source code control systems, and -issue tracking systems that are managed by, or on behalf of, the Licensor for -the purpose of discussing and improving the Work, but excluding communication -that is conspicuously marked or otherwise designated in writing by the copyright -owner as "Not a Contribution." - -"Contributor" shall mean Licensor and any individual or Legal Entity on behalf -of whom a Contribution has been received by Licensor and subsequently -incorporated within the Work. - -2. Grant of Copyright License. - -Subject to the terms and conditions of this License, each Contributor hereby -grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, -irrevocable copyright license to reproduce, prepare Derivative Works of, -publicly display, publicly perform, sublicense, and distribute the Work and such -Derivative Works in Source or Object form. - -3. Grant of Patent License. - -Subject to the terms and conditions of this License, each Contributor hereby -grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, -irrevocable (except as stated in this section) patent license to make, have -made, use, offer to sell, sell, import, and otherwise transfer the Work, where -such license applies only to those patent claims licensable by such Contributor -that are necessarily infringed by their Contribution(s) alone or by combination -of their Contribution(s) with the Work to which such Contribution(s) was -submitted. If You institute patent litigation against any entity (including a -cross-claim or counterclaim in a lawsuit) alleging that the Work or a -Contribution incorporated within the Work constitutes direct or contributory -patent infringement, then any patent licenses granted to You under this License -for that Work shall terminate as of the date such litigation is filed. - -4. Redistribution. - -You may reproduce and distribute copies of the Work or Derivative Works thereof -in any medium, with or without modifications, and in Source or Object form, -provided that You meet the following conditions: - -You must give any other recipients of the Work or Derivative Works a copy of -this License; and -You must cause any modified files to carry prominent notices stating that You -changed the files; and -You must retain, in the Source form of any Derivative Works that You distribute, -all copyright, patent, trademark, and attribution notices from the Source form -of the Work, excluding those notices that do not pertain to any part of the -Derivative Works; and -If the Work includes a "NOTICE" text file as part of its distribution, then any -Derivative Works that You distribute must include a readable copy of the -attribution notices contained within such NOTICE file, excluding those notices -that do not pertain to any part of the Derivative Works, in at least one of the -following places: within a NOTICE text file distributed as part of the -Derivative Works; within the Source form or documentation, if provided along -with the Derivative Works; or, within a display generated by the Derivative -Works, if and wherever such third-party notices normally appear. The contents of -the NOTICE file are for informational purposes only and do not modify the -License. You may add Your own attribution notices within Derivative Works that -You distribute, alongside or as an addendum to the NOTICE text from the Work, -provided that such additional attribution notices cannot be construed as -modifying the License. -You may add Your own copyright statement to Your modifications and may provide -additional or different license terms and conditions for use, reproduction, or -distribution of Your modifications, or for any such Derivative Works as a whole, -provided Your use, reproduction, and distribution of the Work otherwise complies -with the conditions stated in this License. - -5. Submission of Contributions. - -Unless You explicitly state otherwise, any Contribution intentionally submitted -for inclusion in the Work by You to the Licensor shall be under the terms and -conditions of this License, without any additional terms or conditions. -Notwithstanding the above, nothing herein shall supersede or modify the terms of -any separate license agreement you may have executed with Licensor regarding -such Contributions. - -6. Trademarks. - -This License does not grant permission to use the trade names, trademarks, -service marks, or product names of the Licensor, except as required for -reasonable and customary use in describing the origin of the Work and -reproducing the content of the NOTICE file. - -7. Disclaimer of Warranty. - -Unless required by applicable law or agreed to in writing, Licensor provides the -Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, -including, without limitation, any warranties or conditions of TITLE, -NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are -solely responsible for determining the appropriateness of using or -redistributing the Work and assume any risks associated with Your exercise of -permissions under this License. - -8. Limitation of Liability. - -In no event and under no legal theory, whether in tort (including negligence), -contract, or otherwise, unless required by applicable law (such as deliberate -and grossly negligent acts) or agreed to in writing, shall any Contributor be -liable to You for damages, including any direct, indirect, special, incidental, -or consequential damages of any character arising as a result of this License or -out of the use or inability to use the Work (including but not limited to -damages for loss of goodwill, work stoppage, computer failure or malfunction, or -any and all other commercial damages or losses), even if such Contributor has -been advised of the possibility of such damages. - -9. Accepting Warranty or Additional Liability. - -While redistributing the Work or Derivative Works thereof, You may choose to -offer, and charge a fee for, acceptance of support, warranty, indemnity, or -other liability obligations and/or rights consistent with this License. However, -in accepting such obligations, You may act only on Your own behalf and on Your -sole responsibility, not on behalf of any other Contributor, and only if You -agree to indemnify, defend, and hold each Contributor harmless for any liability -incurred by, or claims asserted against, such Contributor by reason of your -accepting any such warranty or additional liability. - -END OF TERMS AND CONDITIONS - -APPENDIX: How to apply the Apache License to your work - -To apply the Apache License to your work, attach the following boilerplate -notice, with the fields enclosed by brackets "[]" replaced with your own -identifying information. (Don't include the brackets!) The text should be -enclosed in the appropriate comment syntax for the file format. We also -recommend that a file or class name and description of purpose be included on -the same "printed page" as the copyright notice for easier identification within -third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/libraries/Preferencefragment/README.md b/libraries/Preferencefragment/README.md deleted file mode 100644 index c765325..0000000 --- a/libraries/Preferencefragment/README.md +++ /dev/null @@ -1,4 +0,0 @@ -android-support-v4-preferencefragment -===================================== - -Unofficial PreferenceFragment compatibility layer for Android 1.6 and up. Includes resources so add this as a library project to your project. \ No newline at end of file diff --git a/libraries/Preferencefragment/build.gradle b/libraries/Preferencefragment/build.gradle deleted file mode 100644 index 85f01b6..0000000 --- a/libraries/Preferencefragment/build.gradle +++ /dev/null @@ -1,43 +0,0 @@ -buildscript { - repositories { - mavenCentral() - mavenLocal() - } - - dependencies { - classpath 'com.android.tools.build:gradle:1.0.0' - } -} - -apply plugin: 'android-library' -apply plugin: 'maven' -apply from: '../../android_commons.gradle' - -dependencies { - compile 'com.android.support:support-v4:21.0.3' -} - -android { - - sourceSets { - main { - manifest.srcFile 'AndroidManifest.xml' - java.srcDirs = ['src'] - resources.srcDirs = ['src'] - aidl.srcDirs = ['src'] - renderscript.srcDirs = ['src'] - res.srcDirs = ['res'] - assets.srcDirs = ['assets'] - } - } -} - -uploadArchives { - repositories.mavenDeployer { - repository(url: "file:maven-repository/") - - pom.groupId = GROUP - pom.artifactId = ARTIFACT_ID - pom.version = VERSION - } -} \ No newline at end of file diff --git a/libraries/Preferencefragment/gradle.properties b/libraries/Preferencefragment/gradle.properties deleted file mode 100644 index 0be8f0a..0000000 --- a/libraries/Preferencefragment/gradle.properties +++ /dev/null @@ -1,22 +0,0 @@ -# Project-wide Gradle settings. - -# IDE (e.g. Android Studio) users: -# Settings specified in this file will override any Gradle settings -# configured through the IDE. - -# For more details on how to configure your build environment visit -# http://www.gradle.org/docs/current/userguide/build_environment.html - -# Specifies the JVM arguments used for the daemon process. -# The setting is particularly useful for tweaking memory settings. -# Default value: -Xmx10248m -XX:MaxPermSize=256m -# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 - -# When configured, Gradle will run in incubating parallel mode. -# This option should only be used with decoupled projects. More details, visit -# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true - -GROUP=com.android.support -VERSION=1.0.0 -ARTIFACT_ID=support-v4-preferencefragment \ No newline at end of file diff --git a/libraries/Preferencefragment/maven-repository/com/android/support/support-v4-preferencefragment/1.0.0/support-v4-preferencefragment-1.0.0.aar b/libraries/Preferencefragment/maven-repository/com/android/support/support-v4-preferencefragment/1.0.0/support-v4-preferencefragment-1.0.0.aar deleted file mode 100644 index 8b3474f..0000000 Binary files a/libraries/Preferencefragment/maven-repository/com/android/support/support-v4-preferencefragment/1.0.0/support-v4-preferencefragment-1.0.0.aar and /dev/null differ diff --git a/libraries/Preferencefragment/maven-repository/com/android/support/support-v4-preferencefragment/1.0.0/support-v4-preferencefragment-1.0.0.aar.md5 b/libraries/Preferencefragment/maven-repository/com/android/support/support-v4-preferencefragment/1.0.0/support-v4-preferencefragment-1.0.0.aar.md5 deleted file mode 100644 index 632029d..0000000 --- a/libraries/Preferencefragment/maven-repository/com/android/support/support-v4-preferencefragment/1.0.0/support-v4-preferencefragment-1.0.0.aar.md5 +++ /dev/null @@ -1 +0,0 @@ -52aa41f18c28e014b1e1e224af5bc48c \ No newline at end of file diff --git a/libraries/Preferencefragment/maven-repository/com/android/support/support-v4-preferencefragment/1.0.0/support-v4-preferencefragment-1.0.0.aar.sha1 b/libraries/Preferencefragment/maven-repository/com/android/support/support-v4-preferencefragment/1.0.0/support-v4-preferencefragment-1.0.0.aar.sha1 deleted file mode 100644 index 89b193d..0000000 --- a/libraries/Preferencefragment/maven-repository/com/android/support/support-v4-preferencefragment/1.0.0/support-v4-preferencefragment-1.0.0.aar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1367c0de641c3a0523d1d7d58f9c8e6d35ea1208 \ No newline at end of file diff --git a/libraries/Preferencefragment/maven-repository/com/android/support/support-v4-preferencefragment/1.0.0/support-v4-preferencefragment-1.0.0.pom b/libraries/Preferencefragment/maven-repository/com/android/support/support-v4-preferencefragment/1.0.0/support-v4-preferencefragment-1.0.0.pom deleted file mode 100644 index eff950b..0000000 --- a/libraries/Preferencefragment/maven-repository/com/android/support/support-v4-preferencefragment/1.0.0/support-v4-preferencefragment-1.0.0.pom +++ /dev/null @@ -1,9 +0,0 @@ - - - 4.0.0 - com.android.support - support-v4-preferencefragment - 1.0.0 - aar - diff --git a/libraries/Preferencefragment/maven-repository/com/android/support/support-v4-preferencefragment/1.0.0/support-v4-preferencefragment-1.0.0.pom.md5 b/libraries/Preferencefragment/maven-repository/com/android/support/support-v4-preferencefragment/1.0.0/support-v4-preferencefragment-1.0.0.pom.md5 deleted file mode 100644 index 6325ff0..0000000 --- a/libraries/Preferencefragment/maven-repository/com/android/support/support-v4-preferencefragment/1.0.0/support-v4-preferencefragment-1.0.0.pom.md5 +++ /dev/null @@ -1 +0,0 @@ -e46a4f996b20205627670b39042427c7 \ No newline at end of file diff --git a/libraries/Preferencefragment/maven-repository/com/android/support/support-v4-preferencefragment/1.0.0/support-v4-preferencefragment-1.0.0.pom.sha1 b/libraries/Preferencefragment/maven-repository/com/android/support/support-v4-preferencefragment/1.0.0/support-v4-preferencefragment-1.0.0.pom.sha1 deleted file mode 100644 index 8f38983..0000000 --- a/libraries/Preferencefragment/maven-repository/com/android/support/support-v4-preferencefragment/1.0.0/support-v4-preferencefragment-1.0.0.pom.sha1 +++ /dev/null @@ -1 +0,0 @@ -1b77418eed6e95bb14a52484976bcb884221f696 \ No newline at end of file diff --git a/libraries/Preferencefragment/maven-repository/com/android/support/support-v4-preferencefragment/maven-metadata.xml b/libraries/Preferencefragment/maven-repository/com/android/support/support-v4-preferencefragment/maven-metadata.xml deleted file mode 100644 index 31f2f0d..0000000 --- a/libraries/Preferencefragment/maven-repository/com/android/support/support-v4-preferencefragment/maven-metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - com.android.support - support-v4-preferencefragment - 1.0.0 - - - 1.0.0 - - 20140314191206 - - diff --git a/libraries/Preferencefragment/maven-repository/com/android/support/support-v4-preferencefragment/maven-metadata.xml.md5 b/libraries/Preferencefragment/maven-repository/com/android/support/support-v4-preferencefragment/maven-metadata.xml.md5 deleted file mode 100644 index db31260..0000000 --- a/libraries/Preferencefragment/maven-repository/com/android/support/support-v4-preferencefragment/maven-metadata.xml.md5 +++ /dev/null @@ -1 +0,0 @@ -fb78c6dc716e3329bf0f31db1c312401 \ No newline at end of file diff --git a/libraries/Preferencefragment/maven-repository/com/android/support/support-v4-preferencefragment/maven-metadata.xml.sha1 b/libraries/Preferencefragment/maven-repository/com/android/support/support-v4-preferencefragment/maven-metadata.xml.sha1 deleted file mode 100644 index 12c8b5d..0000000 --- a/libraries/Preferencefragment/maven-repository/com/android/support/support-v4-preferencefragment/maven-metadata.xml.sha1 +++ /dev/null @@ -1 +0,0 @@ -bd0b01bfebb69db5ab58b9a4b848975eb08e3ca1 \ No newline at end of file diff --git a/libraries/Preferencefragment/proguard-rules.txt b/libraries/Preferencefragment/proguard-rules.txt deleted file mode 100644 index 30fe883..0000000 --- a/libraries/Preferencefragment/proguard-rules.txt +++ /dev/null @@ -1,10 +0,0 @@ - --dontwarn org.androidannotations.** --optimizations !code/simplification/arithmetic,!code/simplification/cast,!field/*,!class/merging/* --optimizationpasses 5 --allowaccessmodification --dontpreverify --dontusemixedcaseclassnames --dontskipnonpubliclibraryclasses - --keepattributes SourceFile,LineNumberTable diff --git a/libraries/Preferencefragment/project.properties b/libraries/Preferencefragment/project.properties deleted file mode 100644 index 36f1594..0000000 --- a/libraries/Preferencefragment/project.properties +++ /dev/null @@ -1,15 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system edit -# "ant.properties", and override values to adapt the script to your -# project structure. -# -# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): -#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt - -# Project target. -target=android-15 -android.library=true diff --git a/libraries/Preferencefragment/res/layout/preference_list_fragment.xml b/libraries/Preferencefragment/res/layout/preference_list_fragment.xml deleted file mode 100644 index 30688c8..0000000 --- a/libraries/Preferencefragment/res/layout/preference_list_fragment.xml +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - -