Snap for 5834835 from e7fd6c4c37b39cbfffeae4adc12c6a1838979589 to qt-qpr1-release
Change-Id: Iac0300163044fd46b8c03cb2b20c03b880496eb7
diff --git a/res/drawable/direction_continue_left.xml b/res/drawable/direction_continue_left.xml
index faa7027..91ffc9c 100644
--- a/res/drawable/direction_continue_left.xml
+++ b/res/drawable/direction_continue_left.xml
@@ -1,5 +1,5 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="20dp"
android:height="20dp" android:viewportWidth="20" android:viewportHeight="20">
<path android:fillColor="#FF000000"
- android:pathData="M10,5.97986l.011.00183a6.06019,6.06019,0,0,1,5.989000000000001,6.07324v3.9450699999999994h-.003109999999999502l.002,1.50317a.49614.49614,0,0,1-.49620000000000175.4968299999999992h-1.0064700000000002a.49622.49622,0,0,1-.4962199999999992-.496220000000001v-5.448849999999998a4.05782,4.05782,0,0,0-3.98877-4.07324h-1.99878a.3576.3576,0,0,0-.37738.54248l1.3437500000000009,2.951830000000001a.38659.38659,0,0,1-.62354.40942l-6.34698-4.885420000000002l6.347-4.922a.38659.38659,0,0,1,.62354.40942l-1.3437700000000001,2.9518499999999994a.35757.35757,0,0,0,.37738.54242h1.9875500000000006"/>
+ android:pathData="M14.5029,2.2a.29744.29744,0,0,1,.29710000000000036.2971199999999996v15.005760000000002a.29744.29744,0,0,1-.29710000000000036.2971199999999996h-1.0058000000000007a.29744.29744,0,0,1-.29710000000000036-.2971199999999996v-15.005760000000002a.29744.29744,0,0,1,.29710000000000036-.2971199999999987h1.0058m0-.2h-1.0058000000000007a.49711.49711,0,0,0-.49709999999999965.4971199999999998v15.005760000000002a.49711.49711,0,0,0,.49709999999999965.4971199999999989h1.0058a.49711.49711,0,0,0,.49709999999999965-.4971199999999989v-15.005760000000002a.49711.49711,0,0,0-.49709999999999965-.4971199999999989h0Zm-1.85684,6.24854l-2.457460000000001-2.07386a.3576.3576,0,0,1,.07019-.6571l2.9489100000000015-1.3501600000000007a.38658.38658,0,0,0-.20294-.71777l-8.004760000000001-.4496500000000001l1.58044,7.86a.38663.38663,0,0,0,.73938.09912l.9181799999999996-3.1106099999999985a.35758.35758,0,0,1,.6405-.16266l2.44818,2.06561a5.21819,5.21819,0,0,1,1.665,4.144l-.0047,3.60767a.49614.49614,0,0,0,.49624000000000024.49687000000000126h1.00653a.49621.49621,0,0,0,.49615-.49622v-3.4607799999999997a7.25157,7.25157,0,0,0-2.339839999999999-5.794459999999999Z"/>
</vector>
\ No newline at end of file
diff --git a/res/drawable/direction_continue_right.xml b/res/drawable/direction_continue_right.xml
index 6ef4749..b549937 100644
--- a/res/drawable/direction_continue_right.xml
+++ b/res/drawable/direction_continue_right.xml
@@ -1,5 +1,5 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="20dp"
android:height="20dp" android:viewportWidth="20" android:viewportHeight="20">
<path android:fillColor="#FF000000"
- android:pathData="M9.98877,7.98169a4.05782,4.05782,0,0,0-3.9887700000000006,4.07324v5.44885a.49622.49622,0,0,1-.4962200000000001.496220000000001h-1.0064700000000002a.49614.49614,0,0,1-.49615-.49683l.0019500000000007844-1.5031700000000008h-.0031100000000003902v-3.9450699999999994a6.06019,6.06019,0,0,1,5.989000000000001-6.07324l.010999999999999233-.0018299999999999983v.0018299999999999983h1.98755a.35757.35757,0,0,0,.37738-.54242l-1.3437500000000018-2.9518400000000007a.38659.38659,0,0,1,.6235300000000006-.40942999999999996l6.346990000000002,4.922000000000001l-6.347,4.88544a.38659.38659,0,0,1-.62354-.40942l1.34375-2.95184a.3576.3576,0,0,0-.37738-.54248h-1.998759999999999Z"/>
+ android:pathData="M8.5029,2.2a.29744.29744,0,0,1,.29710000000000036.2971199999999996v15.005760000000002a.29744.29744,0,0,1-.29710000000000036.2971199999999996h-1.0058000000000007a.29744.29744,0,0,1-.2970999999999995-.2971199999999996v-15.005760000000002a.29744.29744,0,0,1,.2970999999999995-.2971199999999987h1.0058000000000007m0-.2h-1.0058000000000007a.49711.49711,0,0,0-.49709999999999965.4971199999999998v15.005760000000002a.49711.49711,0,0,0,.49709999999999965.4971199999999989h1.0058000000000007a.49711.49711,0,0,0,.49709999999999965-.4971199999999989v-15.005760000000002a.49711.49711,0,0,0-.49709999999999965-.4971199999999989h0Zm-1.4888000000000003,12.043v3.46082a.49621.49621,0,0,0,.4961500000000001.4961800000000025h1.0065300000000006a.49614.49614,0,0,0,.49615-.49683l-.0047-3.60767a5.21819,5.21819,0,0,1,1.665-4.144l2.44818-2.06561a.35758.35758,0,0,1,.6405.16266l.91821,3.1106a.38663.38663,0,0,0,.7394400000000001-.09915000000000163l1.5804399999999994-7.859999999999999l-8.00476.44965a.38658.38658,0,0,0-.20294.71777l2.94891,1.35016a.3576.3576,0,0,1,.07019.6571l-2.457460000000001,2.0738600000000007a7.25157,7.25157,0,0,0-2.3398399999999997,5.794459999999999Z"/>
</vector>
\ No newline at end of file
diff --git a/res/drawable/direction_merge_unspecified.xml b/res/drawable/direction_merge_unspecified.xml
new file mode 100644
index 0000000..a1184a9
--- /dev/null
+++ b/res/drawable/direction_merge_unspecified.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="20dp"
+ android:height="20dp"
+ android:viewportWidth="20"
+ android:viewportHeight="20">
+
+ <path
+ android:strokeWidth="1"
+ android:pathData="M 0 0 H 20 V 20 H 0 V 0 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M10.97740511915273,7.2L10.97740511915273,17.503C10.97740511915273,17.581,10.946405119152729,17.657,10.890405119152726,17.713C10.834405119152725,17.769,10.758405119152725,17.8,10.680405119152722,17.8L9.674405119152697,17.8C9.596405119152696,17.8,9.520405119152693,17.769,9.46440511915269,17.713C9.40840511915269,17.657,9.377405119152689,17.581,9.377405119152689,17.503L9.377405119152689,7.2L10.97740511915273,7.2M11.177405119152734,7L9.177405119152684,7L9.177405119152684,17.503C9.177405119152684,17.59,9.200405119152684,17.676000000000002,9.244405119152686,17.751C9.287405119152687,17.827,9.350405119152688,17.89,9.42640511915269,17.933C9.501405119152691,17.977,9.587405119152693,18,9.674405119152697,18L10.680405119152722,18C10.767405119152723,18,10.853405119152725,17.977,10.928405119152728,17.933C11.00440511915273,17.89,11.067405119152731,17.827,11.110405119152732,17.751C11.154405119152734,17.676000000000002,11.177405119152734,17.59,11.177405119152734,17.503L11.177405119152734,7L11.177405119152734,7ZM11.159405119152733,10L11.159405119152733,8.012C11.144405119152735,7.943,11.149405119152734,7.871,11.175405119152733,7.805C11.201405119152733,7.74,11.246405119152735,7.683,11.304405119152735,7.642C11.362405119152735,7.602,11.431405119152734,7.58,11.501405119152734,7.578C11.572405119152734,7.577,11.642405119152734,7.597,11.701405119152735,7.635L14.653405119152735,8.979C14.734405119152735,9.005,14.821405119152734,9.004,14.901405119152734,8.975999999999999C14.981405119152734,8.948,15.049405119152734,8.894,15.096405119152735,8.823C15.142405119152734,8.753,15.164405119152734,8.668,15.158405119152734,8.584C15.152405119152734,8.499,15.119405119152734,8.419,15.062405119152734,8.355L10.17740511915271,2.008L5.2554051191526785,8.355C5.199405119152679,8.419,5.1654051191526795,8.499,5.159405119152679,8.584C5.15340511915268,8.668,5.175405119152679,8.753,5.222405119152679,8.823C5.268405119152678,8.894,5.3374051191526775,8.948,5.417405119152677,8.975999999999999C5.497405119152676,9.004,5.584405119152675,9.005,5.664405119152673,8.979L8.61640511915267,7.635C8.67640511915267,7.597,8.745405119152673,7.577,8.816405119152675,7.578C8.887405119152676,7.58,8.956405119152679,7.602,9.014405119152679,7.642C9.072405119152682,7.683,9.116405119152683,7.74,9.142405119152683,7.805C9.168405119152684,7.871,9.174405119152684,7.943,9.159405119152684,8.012L9.159405119152684,10L9.157405119152683,10L9.159405119152684,10.011C9.177405119152684,11.608,9.8264051191527,13.134,10.963405119152728,14.255C12.100405119152734,15.376,13.635405119152734,16.004,15.232405119152734,16L19.177405119152574,16L19.177405119152574,15.997L20.680405119152574,15.999C20.767405119152574,15.999,20.853405119152576,15.975999999999999,20.929405119152573,15.933C21.004405119152576,15.889,21.067405119152575,15.826,21.110405119152574,15.751C21.154405119152575,15.676,21.177405119152574,15.59,21.177405119152574,15.503L21.177405119152574,14.496C21.177405119152574,14.365,21.125405119152575,14.238,21.032405119152575,14.145C20.939405119152575,14.052,20.812405119152576,14,20.681405119152576,14L15.232405119152734,14C14.165405119152734,14.004,13.139405119152734,13.588000000000001,12.377405119152733,12.841C11.615405119152735,12.095,11.177405119152734,11.078,11.159405119152733,10.011L11.159405119152733,10Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M10.97563989408646,7.2L10.97563989408646,17.499C10.97563989408646,17.579,10.94363989408646,17.655,10.887639894086458,17.712C10.830639894086458,17.768,10.75463989408646,17.8,10.674639894086459,17.8L9.676639894086458,17.8C9.596639894086458,17.8,9.52063989408646,17.768,9.463639894086459,17.712C9.407639894086458,17.655,9.375639894086458,17.579,9.375639894086458,17.499L9.375639894086458,7.2L10.97563989408646,7.2M11.175639894086459,7L9.175639894086459,7L9.175639894086459,17.499C9.175639894086459,17.632,9.22863989408646,17.759,9.322639894086459,17.853C9.416639894086458,17.947,9.543639894086459,18,9.676639894086458,18L10.674639894086459,18C10.762639894086458,18,10.848639894086459,17.977,10.925639894086459,17.933C11.001639894086459,17.889,11.064639894086458,17.826,11.108639894086458,17.75C11.152639894086459,17.673000000000002,11.175639894086459,17.587,11.175639894086459,17.499L11.175639894086459,7L11.175639894086459,7ZM11.19363989408646,10L11.19363989408646,8.012C11.178639894086459,7.943,11.184639894086459,7.871,11.210639894086459,7.805C11.236639894086458,7.74,11.280639894086459,7.683,11.338639894086459,7.642C11.396639894086459,7.602,11.465639894086458,7.58,11.53663989408646,7.578C11.607639894086459,7.577,11.676639894086458,7.597,11.736639894086458,7.635L14.688639894086535,8.979C14.768639894086538,9.005,14.855639894086542,9.004,14.935639894086547,8.975999999999999C15.01563989408655,8.948,15.084639894086553,8.894,15.130639894086555,8.823C15.177639894086557,8.753,15.19963989408656,8.668,15.19363989408656,8.584C15.187639894086558,8.499,15.15363989408656,8.419,15.097639894086555,8.355L10.175639894086459,2.008L5.290639894086527,8.355C5.2336398940865285,8.419,5.20063989408653,8.499,5.19463989408653,8.584C5.1886398940865295,8.668,5.21063989408653,8.753,5.256639894086527,8.823C5.303639894086527,8.894,5.371639894086525,8.948,5.451639894086523,8.975999999999999C5.531639894086521,9.004,5.6186398940865185,9.005,5.699639894086518,8.979L8.65163989408646,7.635C8.710639894086459,7.597,8.780639894086459,7.577,8.851639894086459,7.579C8.921639894086459,7.58,8.990639894086458,7.602,9.048639894086458,7.642C9.10663989408646,7.683,9.151639894086458,7.74,9.17763989408646,7.805C9.203639894086459,7.871,9.208639894086458,7.943,9.19363989408646,8.012L9.19363989408646,10.011C9.175639894086459,11.078,8.737639894086458,12.095,7.97563989408646,12.841C7.213639894086479,13.588000000000001,6.187639894086505,14.004,5.12063989408653,14L-0.32836010591350556,14C-0.45936010591350535,14,-0.5863601059135055,14.052,-0.6793601059135055,14.145C-0.7723601059135055,14.238,-0.8243601059135055,14.365,-0.8243601059135055,14.496L-0.8243601059135055,15.503C-0.8243601059135055,15.59,-0.8013601059135054,15.675,-0.7573601059135053,15.751C-0.7143601059135056,15.826,-0.6513601059135055,15.889,-0.5763601059135053,15.933C-0.5003601059135057,15.975999999999999,-0.4143601059135054,15.999,-0.3273601059135057,15.999L1.175639894086494,15.997L1.175639894086494,16L5.12063989408653,16C6.717639894086491,16.004,8.252639894086458,15.376,9.389639894086459,14.255C10.52663989408646,13.134,11.175639894086459,11.608,11.19363989408646,10.011L11.195639894086458,10" />
+</vector>
\ No newline at end of file
diff --git a/src/android/car/cluster/NavStateController.java b/src/android/car/cluster/NavStateController.java
index a793032..7ac32ac 100644
--- a/src/android/car/cluster/NavStateController.java
+++ b/src/android/car/cluster/NavStateController.java
@@ -240,6 +240,8 @@
return mContext.getDrawable(R.drawable.direction_merge_left);
case MERGE_RIGHT:
return mContext.getDrawable(R.drawable.direction_merge_right);
+ case MERGE_SIDE_UNSPECIFIED:
+ return mContext.getDrawable(R.drawable.direction_merge_unspecified);
case ROUNDABOUT_ENTER:
return mContext.getDrawable(R.drawable.direction_roundabout);
case ROUNDABOUT_EXIT:
