Snap for 8564071 from c0a9a4d43cb626ffb43aa4d60f80bd4c6235d93f to mainline-sdkext-release

Change-Id: Iba5d435b87f99fde2dcbd89de1b528f420c81a76
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index 1dbdbe0..58b45c5 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,5 +1,5 @@
 {
   "git": {
-    "sha1": "e325417f8b5515cd400a8a337b4f949aa81cd6a9"
+    "sha1": "47289e89a1078f330fcb6a3886b0ae34dc3f69e2"
   }
 }
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..5cde165
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,7 @@
+version: 2
+updates:
+- package-ecosystem: cargo
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10
diff --git a/Android.bp b/Android.bp
index 1522f1a..3df1865 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --device --dependencies.
+// This file is generated by cargo2android.py --config cargo2android.json.
 // Do not modify this file as changes will be overridden on upgrade.
 
 package {
@@ -22,12 +22,11 @@
     name: "libplotters_svg",
     host_supported: true,
     crate_name: "plotters_svg",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.3.1",
     srcs: ["src/lib.rs"],
     edition: "2018",
     rustlibs: [
         "libplotters_backend",
     ],
 }
-
-// dependent_library ["feature_list"]
-//   plotters-backend-0.3.0
diff --git a/Cargo.toml b/Cargo.toml
index 91ebbb7..c4a7dbb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "plotters-svg"
-version = "0.3.0"
+version = "0.3.1"
 authors = ["Hao Hou <[email protected]>"]
 description = "Plotters SVG backend"
 homepage = "https://plotters-rs.github.io"
@@ -22,6 +22,10 @@
 repository = "https://github.com/plotters-rs/plotters-svg.git"
 [dependencies.plotters-backend]
 version = "^0.3.*"
+[dev-dependencies.plotters]
+version = "^0.3.0"
+features = ["ttf"]
+default_features = false
 
 [features]
 debug = []
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index 1da099c..516f314 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,6 +1,6 @@
 [package]
 name = "plotters-svg"
-version = "0.3.0"
+version = "0.3.1"
 authors = ["Hao Hou <[email protected]>"]
 edition = "2018"
 license = "MIT"
@@ -16,3 +16,6 @@
 
 [features]
 debug = []
+
+[dev-dependencies]
+plotters = {version = "^0.3.0", default_features = false, features = ["ttf"]}
diff --git a/METADATA b/METADATA
index 5a12bf0..c2d4460 100644
--- a/METADATA
+++ b/METADATA
@@ -7,13 +7,13 @@
   }
   url {
     type: ARCHIVE
-    value: "https://static.crates.io/crates/plotters-svg/plotters-svg-0.3.0.crate"
+    value: "https://static.crates.io/crates/plotters-svg/plotters-svg-0.3.1.crate"
   }
-  version: "0.3.0"
+  version: "0.3.1"
   license_type: NOTICE
   last_upgrade_date {
     year: 2021
-    month: 4
-    day: 1
+    month: 8
+    day: 9
   }
 }
diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..3cbd48d
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,17 @@
+// Generated by update_crate_tests.py for tests that depend on this crate.
+{
+  "imports": [
+    {
+      "path": "external/rust/crates/base64"
+    },
+    {
+      "path": "external/rust/crates/tinytemplate"
+    },
+    {
+      "path": "external/rust/crates/tinyvec"
+    },
+    {
+      "path": "external/rust/crates/unicode-xid"
+    }
+  ]
+}
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..bf78496
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,4 @@
+{
+  "device": true,
+  "run": true
+}
\ No newline at end of file
diff --git a/src/lib.rs b/src/lib.rs
index 243117f..d4bdbe7 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,8 +1,8 @@
 /*!
-   The Plotters SVG backend. 
-   
-   The plotters bitmap backend allows you to render images by Plotters into SVG vector graphs. 
-   
+   The Plotters SVG backend.
+
+   The plotters bitmap backend allows you to render images by Plotters into SVG vector graphs.
+
    See the documentation for [SVGBackend](struct.SVGBackend.html) for more details.
 */
 mod svg;
diff --git a/src/svg.rs b/src/svg.rs
index e6499e0..02bba02 100644
--- a/src/svg.rs
+++ b/src/svg.rs
@@ -605,7 +605,7 @@
             let mut chart = ChartBuilder::on(&root)
                 .caption("This is a test", ("sans-serif", 20))
                 .set_all_label_area_size(40)
-                .build_ranged(0..10, 0..10)
+                .build_cartesian_2d(0..10, 0..10)
                 .unwrap();
 
             chart
@@ -676,7 +676,7 @@
             let mut chart = ChartBuilder::on(&root)
                 .caption("All anchor point positions", ("sans-serif", 20))
                 .set_all_label_area_size(40)
-                .build_ranged(0..100, 0..50)
+                .build_cartesian_2d(0..100, 0..50)
                 .unwrap();
 
             chart
@@ -765,7 +765,7 @@
             let mut chart = ChartBuilder::on(&root)
                 .caption("All series label positions", ("sans-serif", 20))
                 .set_all_label_area_size(40)
-                .build_ranged(0..50, 0..50)
+                .build_cartesian_2d(0..50, 0..50)
                 .unwrap();
 
             chart