Merge branch '3.5.0'
authorStephane Delcroix <stephane@delcroix.org>
Mon, 14 Jan 2019 08:32:43 +0000 (09:32 +0100)
committerStephane Delcroix <stephane@delcroix.org>
Mon, 14 Jan 2019 08:32:43 +0000 (09:32 +0100)
20 files changed:
1  2 
Xamarin.Forms.Build.Tasks/TypeReferenceExtensions.cs
Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj
Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj
Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
Xamarin.Forms.Core/ListView.cs
Xamarin.Forms.Core/NavigationPage.cs
Xamarin.Forms.Core/TypedBinding.cs
Xamarin.Forms.Platform.Android/AppCompat/PickerRenderer.cs
Xamarin.Forms.Platform.Android/Renderers/DatePickerRenderer.cs
Xamarin.Forms.Platform.Android/Renderers/EditorRenderer.cs
Xamarin.Forms.Platform.Android/Renderers/EntryRenderer.cs
Xamarin.Forms.Platform.Android/Renderers/ListViewRenderer.cs
Xamarin.Forms.Platform.Android/Renderers/PickerRenderer.cs
Xamarin.Forms.Platform.Android/Renderers/SearchBarRenderer.cs
Xamarin.Forms.Platform.Android/Renderers/SliderRenderer.cs
Xamarin.Forms.Platform.Android/Renderers/TimePickerRenderer.cs
Xamarin.Forms.Platform.Android/ViewRenderer.cs
Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj
Xamarin.Forms.Platform.iOS/Renderers/EntryRenderer.cs
Xamarin.Forms.Platform.iOS/Renderers/SliderRenderer.cs

Simple merge
Simple merge
Simple merge
@@@ -94,14 -96,20 +121,18 @@@ namespace Xamarin.Forms.Platform.Androi
                {
                        base.OnElementChanged(e);
  
 -                      HandleKeyboardOnFocus = true;
 -
                        if (e.OldElement == null)
                        {
-                               var textView = CreateNativeControl();
+                               SetNativeControl(CreateNativeControl());
  
-                               textView.AddTextChangedListener(this);
-                               textView.SetOnEditorActionListener(this);
-                               textView.OnKeyboardBackPressed += OnKeyboardBackPressed;
-                               textView.SelectionChanged += SelectionChanged;
+                               EditText.AddTextChangedListener(this);
+                               EditText.SetOnEditorActionListener(this);
+                               if (EditText is IFormsEditText formsEditText)
+                               {
+                                       formsEditText.OnKeyboardBackPressed += OnKeyboardBackPressed;
+                                       formsEditText.SelectionChanged += SelectionChanged;
+                               }
  
                                var useLegacyColorManagement = e.NewElement.UseLegacyColorManagement();
  
                                _nativeSelectionIsUpdating = false;
                        }
                }
 +
 +              void UpdateIsReadOnly()
 +              {
 +                      bool isReadOnly = !Element.IsReadOnly;
 +
 +                      Control.FocusableInTouchMode = isReadOnly;
 +                      Control.Focusable = isReadOnly;
 +                      Control.SetCursorVisible(isReadOnly);
 +              }
        }
- }
+ }
      <Compile Include="Material\MaterialProgressBarRenderer.cs" />
      <Compile Include="IPickerRenderer.cs" />
      <Compile Include="Renderers\PickerEditText.cs" />
 +    <Compile Include="Renderers\FontImageSourceHandler.cs" />
      <Compile Include="Renderers\FormsWebViewClient.cs" />
+     <Compile Include="Renderers\IFormsEditText.cs" />
      <Compile Include="Renderers\IImageViewHandler.cs" />
      <Compile Include="InnerGestureListener.cs" />
      <Compile Include="InnerScaleListener.cs" />