From 6159013b36e47fb7979f1fdd67df56a54c96c24c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Wed, 1 Apr 2015 11:24:09 +0200 Subject: [PATCH] Replace support-v4-preferencefragment submodule with checked in code --- .gitmodules | 4 - extern/android-support-v4-preferencefragment | 1 - .../AndroidManifest.xml | 20 + extern/support-v4-preferencefragment/LICENSE | 191 ++++++++++ .../build.gradle | 52 +++ .../gradle.properties | 22 ++ .../project.properties | 15 + .../res/layout/preference_list_fragment.xml | 82 ++++ .../res/values-sw320dp/dimens.xml | 9 + .../res/values-v21/dimens.xml | 7 + .../res/values-w720dp/dimens.xml | 7 + .../res/values/dimens.xml | 29 ++ .../res/values/strings.xml | 29 ++ .../support-v4-preferencefragment/src/.readme | 2 + .../v4/preference/PreferenceFragment.java | 349 ++++++++++++++++++ .../preference/PreferenceManagerCompat.java | 230 ++++++++++++ 16 files changed, 1044 insertions(+), 5 deletions(-) delete mode 160000 extern/android-support-v4-preferencefragment create mode 100644 extern/support-v4-preferencefragment/AndroidManifest.xml create mode 100644 extern/support-v4-preferencefragment/LICENSE create mode 100644 extern/support-v4-preferencefragment/build.gradle create mode 100644 extern/support-v4-preferencefragment/gradle.properties create mode 100644 extern/support-v4-preferencefragment/project.properties create mode 100644 extern/support-v4-preferencefragment/res/layout/preference_list_fragment.xml create mode 100644 extern/support-v4-preferencefragment/res/values-sw320dp/dimens.xml create mode 100644 extern/support-v4-preferencefragment/res/values-v21/dimens.xml create mode 100644 extern/support-v4-preferencefragment/res/values-w720dp/dimens.xml create mode 100644 extern/support-v4-preferencefragment/res/values/dimens.xml create mode 100644 extern/support-v4-preferencefragment/res/values/strings.xml create mode 100644 extern/support-v4-preferencefragment/src/.readme create mode 100644 extern/support-v4-preferencefragment/src/android/support/v4/preference/PreferenceFragment.java create mode 100644 extern/support-v4-preferencefragment/src/android/support/v4/preference/PreferenceManagerCompat.java diff --git a/.gitmodules b/.gitmodules index 2076aad51..d113d3511 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,7 +2,3 @@ path = extern/Support url = https://android.googlesource.com/platform/frameworks/support ignore = dirty -[submodule "extern/android-support-v4-preferencefragment"] - path = extern/android-support-v4-preferencefragment - url = https://github.com/kolavar/android-support-v4-preferencefragment.git - ignore = dirty diff --git a/extern/android-support-v4-preferencefragment b/extern/android-support-v4-preferencefragment deleted file mode 160000 index 717a45433..000000000 --- a/extern/android-support-v4-preferencefragment +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 717a45433b927d2f0dfc5328f79e77c9682c37bc diff --git a/extern/support-v4-preferencefragment/AndroidManifest.xml b/extern/support-v4-preferencefragment/AndroidManifest.xml new file mode 100644 index 000000000..87f0fef14 --- /dev/null +++ b/extern/support-v4-preferencefragment/AndroidManifest.xml @@ -0,0 +1,20 @@ + + + + + + diff --git a/extern/support-v4-preferencefragment/LICENSE b/extern/support-v4-preferencefragment/LICENSE new file mode 100644 index 000000000..37ec93a14 --- /dev/null +++ b/extern/support-v4-preferencefragment/LICENSE @@ -0,0 +1,191 @@ +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/extern/support-v4-preferencefragment/build.gradle b/extern/support-v4-preferencefragment/build.gradle new file mode 100644 index 000000000..54aa7fb54 --- /dev/null +++ b/extern/support-v4-preferencefragment/build.gradle @@ -0,0 +1,52 @@ +buildscript { + repositories { + mavenCentral() + mavenLocal() + } + + dependencies { + classpath 'com.android.tools.build:gradle:0.10.+' + } +} + +apply plugin: 'android-library' +apply plugin: 'maven' + +version = VERSION +group = GROUP + +dependencies { + compile 'com.android.support:support-v4:19.0.+' +} + +android { + compileSdkVersion 19 + buildToolsVersion '20.0.0' + + defaultConfig { + minSdkVersion 7 + targetSdkVersion 19 + } + + 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 + } +} diff --git a/extern/support-v4-preferencefragment/gradle.properties b/extern/support-v4-preferencefragment/gradle.properties new file mode 100644 index 000000000..0be8f0a84 --- /dev/null +++ b/extern/support-v4-preferencefragment/gradle.properties @@ -0,0 +1,22 @@ +# 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/extern/support-v4-preferencefragment/project.properties b/extern/support-v4-preferencefragment/project.properties new file mode 100644 index 000000000..36f15941e --- /dev/null +++ b/extern/support-v4-preferencefragment/project.properties @@ -0,0 +1,15 @@ +# 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/extern/support-v4-preferencefragment/res/layout/preference_list_fragment.xml b/extern/support-v4-preferencefragment/res/layout/preference_list_fragment.xml new file mode 100644 index 000000000..30688c8e1 --- /dev/null +++ b/extern/support-v4-preferencefragment/res/layout/preference_list_fragment.xml @@ -0,0 +1,82 @@ + + + + + + + + + + + +