Merge branch 'master' into google-maps-traffic

Author: josh-burton

packages/google_maps_flutter/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 * Adds support for toggling the traffic layer
 
+## 0.5.19+1
+
+* Fix polyline width according to device density
+
 ## 0.5.19
 
 

packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java

@@ -106,7 +106,7 @@ final class GoogleMapController
     this.registrarActivityHashCode = registrar.activity().hashCode();
     this.markersController = new MarkersController(methodChannel);
     this.polygonsController = new PolygonsController(methodChannel);
-    this.polylinesController = new PolylinesController(methodChannel);
+    this.polylinesController = new PolylinesController(methodChannel, density);
     this.circlesController = new CirclesController(methodChannel);
   }
 

packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/PolylineController.java

@@ -11,10 +11,12 @@ class PolylineController implements PolylineOptionsSink {
   private final Polyline polyline;
   private final String googleMapsPolylineId;
   private boolean consumeTapEvents;
+  private final float density;
 
-  PolylineController(Polyline polyline, boolean consumeTapEvents) {
+  PolylineController(Polyline polyline, boolean consumeTapEvents, float density) {
     this.polyline = polyline;
     this.consumeTapEvents = consumeTapEvents;
+    this.density = density;
     this.googleMapsPolylineId = polyline.getId();
   }
 
@@ -70,7 +72,7 @@ public void setVisible(boolean visible) {
 
   @Override
   public void setWidth(float width) {
-    polyline.setWidth(width);
+    polyline.setWidth(width * density);
   }
 
   @Override

packages/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/PolylinesController.java

@@ -18,11 +18,13 @@ class PolylinesController {
   private final Map<String, String> googleMapsPolylineIdToDartPolylineId;
   private final MethodChannel methodChannel;
   private GoogleMap googleMap;
+  private final float density;
 
-  PolylinesController(MethodChannel methodChannel) {
+  PolylinesController(MethodChannel methodChannel, float density) {
     this.polylineIdToController = new HashMap<>();
     this.googleMapsPolylineIdToDartPolylineId = new HashMap<>();
     this.methodChannel = methodChannel;
+    this.density = density;
   }
 
   void setGoogleMap(GoogleMap googleMap) {
@@ -88,7 +90,7 @@ private void addPolyline(Object polyline) {
   private void addPolyline(
       String polylineId, PolylineOptions polylineOptions, boolean consumeTapEvents) {
     final Polyline polyline = googleMap.addPolyline(polylineOptions);
-    PolylineController controller = new PolylineController(polyline, consumeTapEvents);
+    PolylineController controller = new PolylineController(polyline, consumeTapEvents, density);
     polylineIdToController.put(polylineId, controller);
     googleMapsPolylineIdToDartPolylineId.put(polyline.getId(), polylineId);
   }

packages/google_maps_flutter/pubspec.yaml

@@ -2,7 +2,7 @@ name: google_maps_flutter
 description: A Flutter plugin for integrating Google Maps in iOS and Android applications.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter
-version: 0.5.19
+version: 0.5.19+1
 
 dependencies:
   flutter:

packages/local_auth/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.5.2+3
+* Update documentation to clarify the need for FragmentActivity.
+
 ## 0.5.2+2
 
 * Add missing template type parameter to `invokeMethod` calls.

packages/local_auth/README.md

@@ -127,6 +127,11 @@ app has not been updated to use TouchID.
 
 ## Android Integration
 
+Note that local_auth plugin requires the use of a FragmentActivity as
+opposed to Activity. This can be easily done by switching to use
+`FlutterFragmentActivity` as opposed to `FlutterActivity` in your
+manifest (or your own Activity class if you are extending the base class).
+
 Update your project's `AndroidManifest.xml` file to include the
 `USE_FINGERPRINT` permissions:
 

packages/local_auth/pubspec.yaml

@@ -3,7 +3,7 @@ description: Flutter plugin for Android and iOS device authentication sensors
   such as Fingerprint Reader and Touch ID.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/local_auth
-version: 0.5.2+2
+version: 0.5.2+3
 
 flutter:
   plugin:

script/incremental_build.sh

@@ -21,8 +21,7 @@ else
   check_changed_packages
 
   if [[ "$CHANGED_PACKAGES" == "" ]]; then
-    echo "Running for all packages"
-    (cd "$REPO_DIR" && pub global run flutter_plugin_tools "${ACTIONS[@]}" $PLUGIN_SHARDING)
+    echo "No changes detected in packages."
   else
     (cd "$REPO_DIR" && pub global run flutter_plugin_tools "${ACTIONS[@]}" --plugins="$CHANGED_PACKAGES" $PLUGIN_SHARDING)
   fi