This commit is contained in:
Redth 2017-06-27 10:30:55 -04:00
Родитель 7ebf65274a
Коммит a2ad14a6bb
12 изменённых файлов: 125 добавлений и 124 удалений

Просмотреть файл

@ -9,7 +9,7 @@
<OutputType>Library</OutputType>
<RootNamespace>VectorDrawableSample</RootNamespace>
<AssemblyName>VectorDrawableSample</AssemblyName>
<TargetFrameworkVersion>v7.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
<AndroidApplication>True</AndroidApplication>
<AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
<AndroidResgenClass>Resource</AndroidResgenClass>
@ -69,18 +69,10 @@
</ItemGroup>
<ItemGroup />
<ItemGroup>
<ProjectReference Include="..\..\..\v7-appcompat\source\V7-AppCompat.csproj">
<Project>{B4ED245B-BBD8-4549-9990-476A36AAD381}</Project>
<Name>V7-AppCompat</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\animated-vector-drawable\source\Animated-Vector-Drawable.csproj">
<ProjectReference Include="..\..\source\Animated-Vector-Drawable.csproj">
<Project>{75CB848E-6EE8-4DAF-8AD4-1782641F69D3}</Project>
<Name>Animated-Vector-Drawable</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\vector-drawable\source\Vector-Drawable.csproj">
<Project>{418B64BA-2BAC-4B92-8888-CAFEAAF7E860}</Project>
<Name>Vector-Drawable</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\support-compat\source\Compat.csproj">
<Project>{CA4194B2-8B2D-4C37-8790-C79C5803357A}</Project>
<Name>Compat</Name>
@ -101,6 +93,14 @@
<Project>{BD8BB4A9-5ACD-47FB-923C-0DC858E1A42D}</Project>
<Name>Media-Compat</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\appcompat-v7\source\V7-AppCompat.csproj">
<Project>{B4ED245B-BBD8-4549-9990-476A36AAD381}</Project>
<Name>V7-AppCompat</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\support-vector-drawable\source\Vector-Drawable.csproj">
<Project>{418B64BA-2BAC-4B92-8888-CAFEAAF7E860}</Project>
<Name>Vector-Drawable</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<Import Project="..\packages\Xamarin.Build.Download.0.4.3\build\Xamarin.Build.Download.targets" Condition="Exists('..\packages\Xamarin.Build.Download.0.4.3\build\Xamarin.Build.Download.targets')" />

Просмотреть файл

@ -95,12 +95,7 @@
<Folder Include="Resources\menu\" />
<Folder Include="Resources\layout\" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<ItemGroup>
<ProjectReference Include="..\..\source\V7-AppCompat.csproj">
<Project>{B4ED245B-BBD8-4549-9990-476A36AAD381}</Project>
<Name>V7-AppCompat</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\animated-vector-drawable\source\Animated-Vector-Drawable.csproj">
<Project>{75CB848E-6EE8-4DAF-8AD4-1782641F69D3}</Project>
<Name>Animated-Vector-Drawable</Name>
@ -125,10 +120,15 @@
<Project>{BD8BB4A9-5ACD-47FB-923C-0DC858E1A42D}</Project>
<Name>Media-Compat</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\vector-drawable\source\Vector-Drawable.csproj">
<ProjectReference Include="..\..\source\V7-AppCompat.csproj">
<Project>{B4ED245B-BBD8-4549-9990-476A36AAD381}</Project>
<Name>V7-AppCompat</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\support-vector-drawable\source\Vector-Drawable.csproj">
<Project>{418B64BA-2BAC-4B92-8888-CAFEAAF7E860}</Project>
<Name>Vector-Drawable</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<Import Project="..\packages\Xamarin.Build.Download.0.4.3\build\Xamarin.Build.Download.targets" Condition="Exists('..\packages\Xamarin.Build.Download.0.4.3\build\Xamarin.Build.Download.targets')" />
</Project>

Просмотреть файл

@ -46,11 +46,11 @@ namespace AndroidSupportSample
var searchView = MenuItemCompat.GetActionView (arg1);
var searchView2 = searchView as Android.Support.V7.Widget.SearchView;
searchView2.QueryTextChange += (sender, e) => {
e.Handled = OnQueryTextChange (e.NewText);
e.Handled = OnQueryTextChange (e.P0);
};
searchView2.QueryTextSubmit += (sender, e) => {
e.Handled = OnQueryTextSubmit (e.Query);
e.Handled = OnQueryTextSubmit (e.P0);
};
return true;

Просмотреть файл

@ -5,8 +5,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AndroidSupportSample", "And
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AndroidSupportSample.UITests", "AndroidSupportSample.UITests\AndroidSupportSample.UITests.csproj", "{A03D5BFA-CDDE-48BA-A53A-B6E901FBB7F2}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "V7-RecyclerView", "..\..\v7-recyclerview\source\V7-RecyclerView.csproj", "{514ED7A8-0F25-4F61-B7B3-A4A652FD7192}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "V17-Leanback", "..\source\V17-Leanback.csproj", "{DA26C0C2-286A-4B41-9DF7-84D7E5D00C68}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Compat", "..\..\support-compat\source\Compat.csproj", "{CA4194B2-8B2D-4C37-8790-C79C5803357A}"
@ -19,16 +17,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fragment", "..\..\support-f
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Media-Compat", "..\..\support-media-compat\source\Media-Compat.csproj", "{BD8BB4A9-5ACD-47FB-923C-0DC858E1A42D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "V7-RecyclerView", "..\..\recyclerview-v7\source\V7-RecyclerView.csproj", "{514ED7A8-0F25-4F61-B7B3-A4A652FD7192}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{514ED7A8-0F25-4F61-B7B3-A4A652FD7192}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{514ED7A8-0F25-4F61-B7B3-A4A652FD7192}.Debug|Any CPU.Build.0 = Debug|Any CPU
{514ED7A8-0F25-4F61-B7B3-A4A652FD7192}.Release|Any CPU.ActiveCfg = Release|Any CPU
{514ED7A8-0F25-4F61-B7B3-A4A652FD7192}.Release|Any CPU.Build.0 = Release|Any CPU
{A03D5BFA-CDDE-48BA-A53A-B6E901FBB7F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A03D5BFA-CDDE-48BA-A53A-B6E901FBB7F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A03D5BFA-CDDE-48BA-A53A-B6E901FBB7F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
@ -61,5 +57,9 @@ Global
{BD8BB4A9-5ACD-47FB-923C-0DC858E1A42D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BD8BB4A9-5ACD-47FB-923C-0DC858E1A42D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BD8BB4A9-5ACD-47FB-923C-0DC858E1A42D}.Release|Any CPU.Build.0 = Release|Any CPU
{514ED7A8-0F25-4F61-B7B3-A4A652FD7192}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{514ED7A8-0F25-4F61-B7B3-A4A652FD7192}.Debug|Any CPU.Build.0 = Debug|Any CPU
{514ED7A8-0F25-4F61-B7B3-A4A652FD7192}.Release|Any CPU.ActiveCfg = Release|Any CPU
{514ED7A8-0F25-4F61-B7B3-A4A652FD7192}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
EndGlobal

Просмотреть файл

@ -18,7 +18,7 @@
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
<AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
<TargetFrameworkVersion>v7.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
<AndroidSupportedAbis>armeabi;armeabi-v7a;x86;arm64-v8a;x86_64</AndroidSupportedAbis>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@ -82,14 +82,6 @@
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<ItemGroup>
<ProjectReference Include="..\..\source\V17-Leanback.csproj">
<Project>{DA26C0C2-286A-4B41-9DF7-84D7E5D00C68}</Project>
<Name>V17-Leanback</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\v7-recyclerview\source\V7-RecyclerView.csproj">
<Project>{514ED7A8-0F25-4F61-B7B3-A4A652FD7192}</Project>
<Name>V7-RecyclerView</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\support-core-ui\source\Core-UI.csproj">
<Project>{071EAE48-7BCE-4D68-8098-745B923A122F}</Project>
<Name>Core-UI</Name>
@ -110,6 +102,14 @@
<Project>{BD8BB4A9-5ACD-47FB-923C-0DC858E1A42D}</Project>
<Name>Media-Compat</Name>
</ProjectReference>
<ProjectReference Include="..\..\source\V17-Leanback.csproj">
<Project>{DA26C0C2-286A-4B41-9DF7-84D7E5D00C68}</Project>
<Name>V17-Leanback</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\recyclerview-v7\source\V7-RecyclerView.csproj">
<Project>{514ED7A8-0F25-4F61-B7B3-A4A652FD7192}</Project>
<Name>V7-RecyclerView</Name>
</ProjectReference>
</ItemGroup>
<Import Project="..\packages\Xamarin.Build.Download.0.4.3\build\Xamarin.Build.Download.targets" Condition="Exists('..\packages\Xamarin.Build.Download.0.4.3\build\Xamarin.Build.Download.targets')" />
</Project>

Просмотреть файл

@ -5,12 +5,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AndroidSupportSample", "And
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AndroidSupportSample.UITests", "AndroidSupportSample.UITests\AndroidSupportSample.UITests.csproj", "{DE6E7007-8D75-4BB3-9F1E-1F1E73B90F5D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "V7-AppCompat", "..\..\v7-appcompat\source\V7-AppCompat.csproj", "{B4ED245B-BBD8-4549-9990-476A36AAD381}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "V7-MediaRouter", "..\source\V7-MediaRouter.csproj", "{9E11B536-73E2-4BC6-9921-92889CF089CB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vector-Drawable", "..\..\vector-drawable\source\Vector-Drawable.csproj", "{418B64BA-2BAC-4B92-8888-CAFEAAF7E860}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Animated-Vector-Drawable", "..\..\animated-vector-drawable\source\Animated-Vector-Drawable.csproj", "{75CB848E-6EE8-4DAF-8AD4-1782641F69D3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Compat", "..\..\support-compat\source\Compat.csproj", "{CA4194B2-8B2D-4C37-8790-C79C5803357A}"
@ -23,7 +19,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fragment", "..\..\support-f
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Media-Compat", "..\..\support-media-compat\source\Media-Compat.csproj", "{BD8BB4A9-5ACD-47FB-923C-0DC858E1A42D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "V7-Palette", "..\..\v7-palette\source\V7-Palette.csproj", "{D9C9670F-8B06-4083-9EEF-42E4D1DE22C1}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vector-Drawable", "..\..\support-vector-drawable\source\Vector-Drawable.csproj", "{418B64BA-2BAC-4B92-8888-CAFEAAF7E860}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "V7-Palette", "..\..\palette-v7\source\V7-Palette.csproj", "{D9C9670F-8B06-4083-9EEF-42E4D1DE22C1}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "V7-AppCompat", "..\..\appcompat-v7\source\V7-AppCompat.csproj", "{B4ED245B-BBD8-4549-9990-476A36AAD381}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -39,18 +39,10 @@ Global
{9E11B536-73E2-4BC6-9921-92889CF089CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9E11B536-73E2-4BC6-9921-92889CF089CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9E11B536-73E2-4BC6-9921-92889CF089CB}.Release|Any CPU.Build.0 = Release|Any CPU
{B4ED245B-BBD8-4549-9990-476A36AAD381}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B4ED245B-BBD8-4549-9990-476A36AAD381}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B4ED245B-BBD8-4549-9990-476A36AAD381}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B4ED245B-BBD8-4549-9990-476A36AAD381}.Release|Any CPU.Build.0 = Release|Any CPU
{DE6E7007-8D75-4BB3-9F1E-1F1E73B90F5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DE6E7007-8D75-4BB3-9F1E-1F1E73B90F5D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DE6E7007-8D75-4BB3-9F1E-1F1E73B90F5D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DE6E7007-8D75-4BB3-9F1E-1F1E73B90F5D}.Release|Any CPU.Build.0 = Release|Any CPU
{418B64BA-2BAC-4B92-8888-CAFEAAF7E860}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{418B64BA-2BAC-4B92-8888-CAFEAAF7E860}.Debug|Any CPU.Build.0 = Debug|Any CPU
{418B64BA-2BAC-4B92-8888-CAFEAAF7E860}.Release|Any CPU.ActiveCfg = Release|Any CPU
{418B64BA-2BAC-4B92-8888-CAFEAAF7E860}.Release|Any CPU.Build.0 = Release|Any CPU
{75CB848E-6EE8-4DAF-8AD4-1782641F69D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{75CB848E-6EE8-4DAF-8AD4-1782641F69D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{75CB848E-6EE8-4DAF-8AD4-1782641F69D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
@ -75,9 +67,17 @@ Global
{BD8BB4A9-5ACD-47FB-923C-0DC858E1A42D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BD8BB4A9-5ACD-47FB-923C-0DC858E1A42D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BD8BB4A9-5ACD-47FB-923C-0DC858E1A42D}.Release|Any CPU.Build.0 = Release|Any CPU
{418B64BA-2BAC-4B92-8888-CAFEAAF7E860}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{418B64BA-2BAC-4B92-8888-CAFEAAF7E860}.Debug|Any CPU.Build.0 = Debug|Any CPU
{418B64BA-2BAC-4B92-8888-CAFEAAF7E860}.Release|Any CPU.ActiveCfg = Release|Any CPU
{418B64BA-2BAC-4B92-8888-CAFEAAF7E860}.Release|Any CPU.Build.0 = Release|Any CPU
{D9C9670F-8B06-4083-9EEF-42E4D1DE22C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D9C9670F-8B06-4083-9EEF-42E4D1DE22C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D9C9670F-8B06-4083-9EEF-42E4D1DE22C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D9C9670F-8B06-4083-9EEF-42E4D1DE22C1}.Release|Any CPU.Build.0 = Release|Any CPU
{B4ED245B-BBD8-4549-9990-476A36AAD381}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B4ED245B-BBD8-4549-9990-476A36AAD381}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B4ED245B-BBD8-4549-9990-476A36AAD381}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B4ED245B-BBD8-4549-9990-476A36AAD381}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
EndGlobal

Просмотреть файл

@ -5,20 +5,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AndroidSupportSample", "And
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AndroidSupportSample.UITests", "AndroidSupportSample.UITests\AndroidSupportSample.UITests.csproj", "{FD1AA1A6-F38E-414E-B25F-A57A3DE3BF75}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "V7-AppCompat", "..\..\v7-appcompat\source\V7-AppCompat.csproj", "{B4ED245B-BBD8-4549-9990-476A36AAD381}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "V7-RecyclerView", "..\..\v7-recyclerview\source\V7-RecyclerView.csproj", "{514ED7A8-0F25-4F61-B7B3-A4A652FD7192}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "V17-Leanback", "..\..\v17-leanback\source\V17-Leanback.csproj", "{DA26C0C2-286A-4B41-9DF7-84D7E5D00C68}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "V7-Preference", "..\source\V7-Preference.csproj", "{A419C738-BD3D-4460-97E9-B8E44FC26896}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "V14-Preference", "..\..\v14-preference\source\V14-Preference.csproj", "{E2ACB402-B348-4CD9-9686-9F029DCB3277}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "V17-Preference-Leanback", "..\..\v17-preference-leanback\source\V17-Preference-Leanback.csproj", "{6948B25E-4A71-4F31-B042-D21B0B99ADA1}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vector-Drawable", "..\..\vector-drawable\source\Vector-Drawable.csproj", "{418B64BA-2BAC-4B92-8888-CAFEAAF7E860}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Animated-Vector-Drawable", "..\..\animated-vector-drawable\source\Animated-Vector-Drawable.csproj", "{75CB848E-6EE8-4DAF-8AD4-1782641F69D3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Compat", "..\..\support-compat\source\Compat.csproj", "{CA4194B2-8B2D-4C37-8790-C79C5803357A}"
@ -31,20 +19,24 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fragment", "..\..\support-f
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Media-Compat", "..\..\support-media-compat\source\Media-Compat.csproj", "{BD8BB4A9-5ACD-47FB-923C-0DC858E1A42D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vector-Drawable", "..\..\support-vector-drawable\source\Vector-Drawable.csproj", "{418B64BA-2BAC-4B92-8888-CAFEAAF7E860}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "V7-RecyclerView", "..\..\recyclerview-v7\source\V7-RecyclerView.csproj", "{514ED7A8-0F25-4F61-B7B3-A4A652FD7192}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "V7-AppCompat", "..\..\appcompat-v7\source\V7-AppCompat.csproj", "{B4ED245B-BBD8-4549-9990-476A36AAD381}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "V14-Preference", "..\..\preference-v14\source\V14-Preference.csproj", "{E2ACB402-B348-4CD9-9686-9F029DCB3277}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "V17-Leanback", "..\..\leanback-v17\source\V17-Leanback.csproj", "{DA26C0C2-286A-4B41-9DF7-84D7E5D00C68}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "V17-Preference-Leanback", "..\..\preference-leanback-v17\source\V17-Preference-Leanback.csproj", "{6948B25E-4A71-4F31-B042-D21B0B99ADA1}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{514ED7A8-0F25-4F61-B7B3-A4A652FD7192}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{514ED7A8-0F25-4F61-B7B3-A4A652FD7192}.Debug|Any CPU.Build.0 = Debug|Any CPU
{514ED7A8-0F25-4F61-B7B3-A4A652FD7192}.Release|Any CPU.ActiveCfg = Release|Any CPU
{514ED7A8-0F25-4F61-B7B3-A4A652FD7192}.Release|Any CPU.Build.0 = Release|Any CPU
{6948B25E-4A71-4F31-B042-D21B0B99ADA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6948B25E-4A71-4F31-B042-D21B0B99ADA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6948B25E-4A71-4F31-B042-D21B0B99ADA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6948B25E-4A71-4F31-B042-D21B0B99ADA1}.Release|Any CPU.Build.0 = Release|Any CPU
{A419C738-BD3D-4460-97E9-B8E44FC26896}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A419C738-BD3D-4460-97E9-B8E44FC26896}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A419C738-BD3D-4460-97E9-B8E44FC26896}.Release|Any CPU.ActiveCfg = Release|Any CPU
@ -53,26 +45,10 @@ Global
{B353D4CB-7461-4462-99BB-D49D78D5D27E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B353D4CB-7461-4462-99BB-D49D78D5D27E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B353D4CB-7461-4462-99BB-D49D78D5D27E}.Release|Any CPU.Build.0 = Release|Any CPU
{B4ED245B-BBD8-4549-9990-476A36AAD381}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B4ED245B-BBD8-4549-9990-476A36AAD381}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B4ED245B-BBD8-4549-9990-476A36AAD381}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B4ED245B-BBD8-4549-9990-476A36AAD381}.Release|Any CPU.Build.0 = Release|Any CPU
{DA26C0C2-286A-4B41-9DF7-84D7E5D00C68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DA26C0C2-286A-4B41-9DF7-84D7E5D00C68}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DA26C0C2-286A-4B41-9DF7-84D7E5D00C68}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DA26C0C2-286A-4B41-9DF7-84D7E5D00C68}.Release|Any CPU.Build.0 = Release|Any CPU
{E2ACB402-B348-4CD9-9686-9F029DCB3277}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E2ACB402-B348-4CD9-9686-9F029DCB3277}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E2ACB402-B348-4CD9-9686-9F029DCB3277}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E2ACB402-B348-4CD9-9686-9F029DCB3277}.Release|Any CPU.Build.0 = Release|Any CPU
{FD1AA1A6-F38E-414E-B25F-A57A3DE3BF75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FD1AA1A6-F38E-414E-B25F-A57A3DE3BF75}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FD1AA1A6-F38E-414E-B25F-A57A3DE3BF75}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FD1AA1A6-F38E-414E-B25F-A57A3DE3BF75}.Release|Any CPU.Build.0 = Release|Any CPU
{418B64BA-2BAC-4B92-8888-CAFEAAF7E860}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{418B64BA-2BAC-4B92-8888-CAFEAAF7E860}.Debug|Any CPU.Build.0 = Debug|Any CPU
{418B64BA-2BAC-4B92-8888-CAFEAAF7E860}.Release|Any CPU.ActiveCfg = Release|Any CPU
{418B64BA-2BAC-4B92-8888-CAFEAAF7E860}.Release|Any CPU.Build.0 = Release|Any CPU
{75CB848E-6EE8-4DAF-8AD4-1782641F69D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{75CB848E-6EE8-4DAF-8AD4-1782641F69D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{75CB848E-6EE8-4DAF-8AD4-1782641F69D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
@ -97,5 +73,29 @@ Global
{BD8BB4A9-5ACD-47FB-923C-0DC858E1A42D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BD8BB4A9-5ACD-47FB-923C-0DC858E1A42D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BD8BB4A9-5ACD-47FB-923C-0DC858E1A42D}.Release|Any CPU.Build.0 = Release|Any CPU
{418B64BA-2BAC-4B92-8888-CAFEAAF7E860}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{418B64BA-2BAC-4B92-8888-CAFEAAF7E860}.Debug|Any CPU.Build.0 = Debug|Any CPU
{418B64BA-2BAC-4B92-8888-CAFEAAF7E860}.Release|Any CPU.ActiveCfg = Release|Any CPU
{418B64BA-2BAC-4B92-8888-CAFEAAF7E860}.Release|Any CPU.Build.0 = Release|Any CPU
{514ED7A8-0F25-4F61-B7B3-A4A652FD7192}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{514ED7A8-0F25-4F61-B7B3-A4A652FD7192}.Debug|Any CPU.Build.0 = Debug|Any CPU
{514ED7A8-0F25-4F61-B7B3-A4A652FD7192}.Release|Any CPU.ActiveCfg = Release|Any CPU
{514ED7A8-0F25-4F61-B7B3-A4A652FD7192}.Release|Any CPU.Build.0 = Release|Any CPU
{B4ED245B-BBD8-4549-9990-476A36AAD381}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B4ED245B-BBD8-4549-9990-476A36AAD381}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B4ED245B-BBD8-4549-9990-476A36AAD381}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B4ED245B-BBD8-4549-9990-476A36AAD381}.Release|Any CPU.Build.0 = Release|Any CPU
{E2ACB402-B348-4CD9-9686-9F029DCB3277}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E2ACB402-B348-4CD9-9686-9F029DCB3277}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E2ACB402-B348-4CD9-9686-9F029DCB3277}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E2ACB402-B348-4CD9-9686-9F029DCB3277}.Release|Any CPU.Build.0 = Release|Any CPU
{DA26C0C2-286A-4B41-9DF7-84D7E5D00C68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DA26C0C2-286A-4B41-9DF7-84D7E5D00C68}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DA26C0C2-286A-4B41-9DF7-84D7E5D00C68}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DA26C0C2-286A-4B41-9DF7-84D7E5D00C68}.Release|Any CPU.Build.0 = Release|Any CPU
{6948B25E-4A71-4F31-B042-D21B0B99ADA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6948B25E-4A71-4F31-B042-D21B0B99ADA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6948B25E-4A71-4F31-B042-D21B0B99ADA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6948B25E-4A71-4F31-B042-D21B0B99ADA1}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
EndGlobal

Просмотреть файл

@ -77,30 +77,6 @@
<Folder Include="Resources\values-television\" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\v14-preference\source\V14-Preference.csproj">
<Project>{E2ACB402-B348-4CD9-9686-9F029DCB3277}</Project>
<Name>V14-Preference</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\v17-leanback\source\V17-Leanback.csproj">
<Project>{DA26C0C2-286A-4B41-9DF7-84D7E5D00C68}</Project>
<Name>V17-Leanback</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\v17-preference-leanback\source\V17-Preference-Leanback.csproj">
<Project>{6948B25E-4A71-4F31-B042-D21B0B99ADA1}</Project>
<Name>V17-Preference-Leanback</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\v7-appcompat\source\V7-AppCompat.csproj">
<Project>{B4ED245B-BBD8-4549-9990-476A36AAD381}</Project>
<Name>V7-AppCompat</Name>
</ProjectReference>
<ProjectReference Include="..\..\source\V7-Preference.csproj">
<Project>{A419C738-BD3D-4460-97E9-B8E44FC26896}</Project>
<Name>V7-Preference</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\v7-recyclerview\source\V7-RecyclerView.csproj">
<Project>{514ED7A8-0F25-4F61-B7B3-A4A652FD7192}</Project>
<Name>V7-RecyclerView</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\animated-vector-drawable\source\Animated-Vector-Drawable.csproj">
<Project>{75CB848E-6EE8-4DAF-8AD4-1782641F69D3}</Project>
<Name>Animated-Vector-Drawable</Name>
@ -125,7 +101,31 @@
<Project>{BD8BB4A9-5ACD-47FB-923C-0DC858E1A42D}</Project>
<Name>Media-Compat</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\vector-drawable\source\Vector-Drawable.csproj">
<ProjectReference Include="..\..\..\preference-v14\source\V14-Preference.csproj">
<Project>{E2ACB402-B348-4CD9-9686-9F029DCB3277}</Project>
<Name>V14-Preference</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\leanback-v17\source\V17-Leanback.csproj">
<Project>{DA26C0C2-286A-4B41-9DF7-84D7E5D00C68}</Project>
<Name>V17-Leanback</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\preference-leanback-v17\source\V17-Preference-Leanback.csproj">
<Project>{6948B25E-4A71-4F31-B042-D21B0B99ADA1}</Project>
<Name>V17-Preference-Leanback</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\appcompat-v7\source\V7-AppCompat.csproj">
<Project>{B4ED245B-BBD8-4549-9990-476A36AAD381}</Project>
<Name>V7-AppCompat</Name>
</ProjectReference>
<ProjectReference Include="..\..\source\V7-Preference.csproj">
<Project>{A419C738-BD3D-4460-97E9-B8E44FC26896}</Project>
<Name>V7-Preference</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\recyclerview-v7\source\V7-RecyclerView.csproj">
<Project>{514ED7A8-0F25-4F61-B7B3-A4A652FD7192}</Project>
<Name>V7-RecyclerView</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\support-vector-drawable\source\Vector-Drawable.csproj">
<Project>{418B64BA-2BAC-4B92-8888-CAFEAAF7E860}</Project>
<Name>Vector-Drawable</Name>
</ProjectReference>

Просмотреть файл

@ -5,11 +5,12 @@ using Android.Views;
using Android.Widget;
using Android.OS;
using Android.App;
using Android.Support.V7.App;
namespace AndroidSupportSample
{
[Activity (Label = "Support Preferences", MainLauncher = true, Theme = "@style/AppTheme")]
public class MainActivity : Activity
public class MainActivity : AppCompatActivity
{
protected override void OnCreate (Bundle bundle)
{

Просмотреть файл

@ -16,7 +16,7 @@ namespace AndroidSupportSample
}
}
public class SamplePreferencesFragment : PreferenceFragment
public class SamplePreferencesFragment : PreferenceFragmentCompat
{
public override void OnCreatePreferences (Bundle savedInstanceState, String rootKey)
{

Просмотреть файл

@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VectorDrawableSample", "VectorDrawableSample\VectorDrawableSample.csproj", "{05B87270-652B-438E-BCFF-AC65BC4C892F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "V7-AppCompat", "..\..\v7-appcompat\source\V7-AppCompat.csproj", "{B4ED245B-BBD8-4549-9990-476A36AAD381}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vector-Drawable", "..\source\Vector-Drawable.csproj", "{418B64BA-2BAC-4B92-8888-CAFEAAF7E860}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Animated-Vector-Drawable", "..\..\animated-vector-drawable\source\Animated-Vector-Drawable.csproj", "{75CB848E-6EE8-4DAF-8AD4-1782641F69D3}"
@ -19,6 +17,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fragment", "..\..\support-f
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Media-Compat", "..\..\support-media-compat\source\Media-Compat.csproj", "{BD8BB4A9-5ACD-47FB-923C-0DC858E1A42D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "V7-AppCompat", "..\..\appcompat-v7\source\V7-AppCompat.csproj", "{B4ED245B-BBD8-4549-9990-476A36AAD381}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -29,10 +29,6 @@ Global
{05B87270-652B-438E-BCFF-AC65BC4C892F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{05B87270-652B-438E-BCFF-AC65BC4C892F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{05B87270-652B-438E-BCFF-AC65BC4C892F}.Release|Any CPU.Build.0 = Release|Any CPU
{B4ED245B-BBD8-4549-9990-476A36AAD381}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B4ED245B-BBD8-4549-9990-476A36AAD381}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B4ED245B-BBD8-4549-9990-476A36AAD381}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B4ED245B-BBD8-4549-9990-476A36AAD381}.Release|Any CPU.Build.0 = Release|Any CPU
{418B64BA-2BAC-4B92-8888-CAFEAAF7E860}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{418B64BA-2BAC-4B92-8888-CAFEAAF7E860}.Debug|Any CPU.Build.0 = Debug|Any CPU
{418B64BA-2BAC-4B92-8888-CAFEAAF7E860}.Release|Any CPU.ActiveCfg = Release|Any CPU
@ -61,5 +57,9 @@ Global
{BD8BB4A9-5ACD-47FB-923C-0DC858E1A42D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BD8BB4A9-5ACD-47FB-923C-0DC858E1A42D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BD8BB4A9-5ACD-47FB-923C-0DC858E1A42D}.Release|Any CPU.Build.0 = Release|Any CPU
{B4ED245B-BBD8-4549-9990-476A36AAD381}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B4ED245B-BBD8-4549-9990-476A36AAD381}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B4ED245B-BBD8-4549-9990-476A36AAD381}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B4ED245B-BBD8-4549-9990-476A36AAD381}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
EndGlobal

Просмотреть файл

@ -9,7 +9,7 @@
<OutputType>Library</OutputType>
<RootNamespace>VectorDrawableSample</RootNamespace>
<AssemblyName>VectorDrawableSample</AssemblyName>
<TargetFrameworkVersion>v7.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
<AndroidApplication>True</AndroidApplication>
<AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
<AndroidResgenClass>Resource</AndroidResgenClass>
@ -68,18 +68,10 @@
<Folder Include="Resources\drawable\" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\v7-appcompat\source\V7-AppCompat.csproj">
<Project>{B4ED245B-BBD8-4549-9990-476A36AAD381}</Project>
<Name>V7-AppCompat</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\animated-vector-drawable\source\Animated-Vector-Drawable.csproj">
<Project>{75CB848E-6EE8-4DAF-8AD4-1782641F69D3}</Project>
<Name>Animated-Vector-Drawable</Name>
</ProjectReference>
<ProjectReference Include="..\..\source\Vector-Drawable.csproj">
<Project>{418B64BA-2BAC-4B92-8888-CAFEAAF7E860}</Project>
<Name>Vector-Drawable</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\support-compat\source\Compat.csproj">
<Project>{CA4194B2-8B2D-4C37-8790-C79C5803357A}</Project>
<Name>Compat</Name>
@ -100,6 +92,14 @@
<Project>{BD8BB4A9-5ACD-47FB-923C-0DC858E1A42D}</Project>
<Name>Media-Compat</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\appcompat-v7\source\V7-AppCompat.csproj">
<Project>{B4ED245B-BBD8-4549-9990-476A36AAD381}</Project>
<Name>V7-AppCompat</Name>
</ProjectReference>
<ProjectReference Include="..\..\source\Vector-Drawable.csproj">
<Project>{418B64BA-2BAC-4B92-8888-CAFEAAF7E860}</Project>
<Name>Vector-Drawable</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<Import Project="..\packages\Xamarin.Build.Download.0.4.3\build\Xamarin.Build.Download.targets" Condition="Exists('..\packages\Xamarin.Build.Download.0.4.3\build\Xamarin.Build.Download.targets')" />