diff options
author | Trevor Johns <trevorjohns@google.com> | 2016-06-15 18:45:15 -0700 |
---|---|---|
committer | Trevor Johns <trevorjohns@google.com> | 2016-06-15 18:45:15 -0700 |
commit | 671a3a0d4c4be1151833ffdbabd130432a2d0b94 (patch) | |
tree | 53ec085f272b6bb27498d4704d3cfcd968232e4d | |
parent | 00dbd3e4a519fc87189ecb3e41ddff6be6765ba9 (diff) | |
download | android-671a3a0d4c4be1151833ffdbabd130432a2d0b94.tar.gz |
samples: Remove duplicate appcompat-v7 declarations
Some samples were manually declaring appcompat-v7 as a dependency,
even though this often gets injected automatically due to a template.
Remove this dependency as needed.
Change-Id: Idac1969032624da9df9acf53c4de8f1eed3e69fc
12 files changed, 1 insertions, 16 deletions
diff --git a/content/documentsUi/ScopedDirectoryAccess/template-params.xml b/content/documentsUi/ScopedDirectoryAccess/template-params.xml index d008782b..4ac5a3f5 100644 --- a/content/documentsUi/ScopedDirectoryAccess/template-params.xml +++ b/content/documentsUi/ScopedDirectoryAccess/template-params.xml @@ -26,7 +26,6 @@ <targetSdkVersion>24</targetSdkVersion> <!-- Include additional dependencies here.--> - <dependency>com.android.support:appcompat-v7:24.0.0-beta1</dependency> <dependency>com.android.support:recyclerview-v7:24.0.0-beta1</dependency> <dependency>com.android.support:support-v4:24.0.0-beta1</dependency> diff --git a/media/Camera2Basic/template-params.xml b/media/Camera2Basic/template-params.xml index 7b42427a..905ba7f3 100644 --- a/media/Camera2Basic/template-params.xml +++ b/media/Camera2Basic/template-params.xml @@ -22,7 +22,6 @@ <group>Media</group> <package>com.example.android.camera2basic</package> - <dependency>com.android.support:appcompat-v7:24.0.0-beta1</dependency> <minSdk>21</minSdk> <strings> <intro> diff --git a/media/Camera2Raw/template-params.xml b/media/Camera2Raw/template-params.xml index b33ebf1f..e0072c76 100644 --- a/media/Camera2Raw/template-params.xml +++ b/media/Camera2Raw/template-params.xml @@ -20,7 +20,6 @@ <group>Media</group> <package>com.example.android.camera2raw</package> - <dependency>com.android.support:appcompat-v7:24.0.0-beta1</dependency> <minSdk>21</minSdk> <strings> diff --git a/media/Camera2Video/template-params.xml b/media/Camera2Video/template-params.xml index 19e34703..6b769002 100644 --- a/media/Camera2Video/template-params.xml +++ b/media/Camera2Video/template-params.xml @@ -20,7 +20,6 @@ <group>Media</group> <package>com.example.android.camera2video</package> - <dependency>com.android.support:appcompat-v7:24.0.0-beta1</dependency> <minSdk>21</minSdk> <strings> diff --git a/media/MediaRouter/template-params.xml b/media/MediaRouter/template-params.xml index 5f2a5632..1e5c1ac0 100644 --- a/media/MediaRouter/template-params.xml +++ b/media/MediaRouter/template-params.xml @@ -27,7 +27,6 @@ <!-- change minSdk if needed--> <minSdk>13</minSdk> - <dependency>com.android.support:appcompat-v7:24.0.0-beta1</dependency> <dependency>com.android.support:mediarouter-v7:24.0.0-beta1</dependency> diff --git a/security/DirectBoot/template-params.xml b/security/DirectBoot/template-params.xml index ec45fcfd..e400ed21 100644 --- a/security/DirectBoot/template-params.xml +++ b/security/DirectBoot/template-params.xml @@ -27,7 +27,6 @@ <!-- Include additional dependencies here.--> <!-- dependency>com.google.android.gms:play-services:5.0.+</dependency --> - <dependency>com.android.support:appcompat-v7:24.0.0-beta1</dependency> <dependency>com.android.support:support-v4:24.0.0-beta1</dependency> <dependency>com.android.support:support-v13:24.0.0-beta1</dependency> <dependency>com.android.support:recyclerview-v7:24.0.0-beta1</dependency> diff --git a/system/RuntimePermissions/template-params.xml b/system/RuntimePermissions/template-params.xml index a12be33e..ef69abca 100644 --- a/system/RuntimePermissions/template-params.xml +++ b/system/RuntimePermissions/template-params.xml @@ -21,7 +21,6 @@ <minSdk>15</minSdk> - <dependency>com.android.support:appcompat-v7:24.0.0-beta1</dependency> <dependency>com.android.support:support-v4:24.0.0-beta1</dependency> <dependency>com.android.support:design:24.0.0-beta1</dependency> diff --git a/system/RuntimePermissionsBasic/template-params.xml b/system/RuntimePermissionsBasic/template-params.xml index 89000913..e5c64ca3 100644 --- a/system/RuntimePermissionsBasic/template-params.xml +++ b/system/RuntimePermissionsBasic/template-params.xml @@ -21,7 +21,6 @@ <minSdk>15</minSdk> - <dependency>com.android.support:appcompat-v7:24.0.0-beta1</dependency> <dependency>com.android.support:support-v4:24.0.0-beta1</dependency> <dependency>com.android.support:design:24.0.0-beta1</dependency> diff --git a/ui/actionbarcompat/ActionBarCompat-Basic/template-params.xml b/ui/actionbarcompat/ActionBarCompat-Basic/template-params.xml index 5c655952..ffb0de54 100644 --- a/ui/actionbarcompat/ActionBarCompat-Basic/template-params.xml +++ b/ui/actionbarcompat/ActionBarCompat-Basic/template-params.xml @@ -19,8 +19,6 @@ <group>UI</group> <package>com.example.android.actionbarcompat.basic</package> - <dependency>com.android.support:appcompat-v7:24.0.0-beta1</dependency> - <!-- change minSdk if needed--> <minSdk>7</minSdk> diff --git a/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/template-params.xml b/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/template-params.xml index acb2c3ac..930a2936 100644 --- a/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/template-params.xml +++ b/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/template-params.xml @@ -19,8 +19,6 @@ <group>UI</group> <package>com.example.android.actionbarcompat.listpopupmenu</package> - <dependency>com.android.support:appcompat-v7:24.0.0-beta1</dependency> - <!-- change minSdk if needed--> <minSdk>7</minSdk> diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/template-params.xml b/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/template-params.xml index 4d95c7b2..6c051403 100644 --- a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/template-params.xml +++ b/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/template-params.xml @@ -19,8 +19,7 @@ <group>UI</group> <package>com.example.android.actionbarcompat.shareactionprovider</package> - <dependency>com.android.support:appcompat-v7:24.0.0-beta1</dependency> - + <!-- change minSdk if needed--> <!-- change minSdk if needed--> <minSdk>7</minSdk> diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/template-params.xml b/ui/actionbarcompat/ActionBarCompat-Styled/template-params.xml index 7952b5f9..4e0c8e7e 100644 --- a/ui/actionbarcompat/ActionBarCompat-Styled/template-params.xml +++ b/ui/actionbarcompat/ActionBarCompat-Styled/template-params.xml @@ -19,8 +19,6 @@ <group>UI</group> <package>com.example.android.actionbarcompat.styled</package> - <dependency>com.android.support:appcompat-v7:24.0.0-beta1</dependency> - <!-- change minSdk if needed--> <minSdk>7</minSdk> |