@@ -19,6 +19,7 @@ package androidx.navigation
 import android.content.pm.ActivityInfo
 import android.graphics.Bitmap
 import android.os.Bundle
+import androidx.navigation.common.test.R
 import androidx.test.filters.SmallTest
 import com.google.common.truth.Truth.assertThat
 import org.junit.Test
@@ -42,6 +43,8 @@ class NavTypeTest {
         private val booleans = booleanArrayOf(b, false)
         private val s = "a_string"
         private val strings = arrayOf("aa", "bb")
+        private val reference = R.id.nav_id_reference
+        private val referenceHex = "0x" + R.id.nav_id_reference.toString(16)
         private val parcelable = ActivityInfo()
         private val parcelables = arrayOf(parcelable)
         private val en = Bitmap.Config.ALPHA_8
@@ -78,6 +81,8 @@ class NavTypeTest {
             .isEqualTo(NavType.StringType)
         assertThat(NavType.fromArgType("string[]", null))
             .isEqualTo(NavType.StringArrayType)
+        assertThat(NavType.fromArgType("reference", null))
+            .isEqualTo(NavType.ReferenceType)
         assertThat(NavType.fromArgType("android.content.pm.ActivityInfo", null))
             .isEqualTo(parcelableNavType)
         assertThat(NavType.fromArgType("android.content.pm.ActivityInfo[]", null))
@@ -98,6 +103,8 @@ class NavTypeTest {
             .isEqualTo(NavType.StringType)
         assertThat(NavType.inferFromValue("123"))
             .isEqualTo(NavType.IntType)
+        assertThat(NavType.inferFromValue("0xFF"))
+            .isEqualTo(NavType.IntType)
         assertThat(NavType.inferFromValue("123L"))
             .isEqualTo(NavType.LongType)
         assertThat(NavType.inferFromValue("1.5"))
@@ -196,6 +203,11 @@ class NavTypeTest {
             .isEqualTo(strings)
         bundle.clear()
 
+        NavType.ReferenceType.put(bundle, key, reference)
+        assertThat(NavType.ReferenceType.get(bundle, key))
+            .isEqualTo(reference)
+        bundle.clear()
+
         parcelableNavType.put(bundle, key, parcelable)
         assertThat(parcelableNavType.get(bundle, key))
             .isEqualTo(parcelable)
@@ -221,4 +233,13 @@ class NavTypeTest {
             .isEqualTo(serializables)
         bundle.clear()
     }
+
+    @Test
+    fun parseValueWithHex() {
+        assertThat(NavType.IntType.parseValue(referenceHex))
+            .isEqualTo(reference)
+
+        assertThat(NavType.ReferenceType.parseValue(referenceHex))
+            .isEqualTo(reference)
+    }
 }
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2021 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<resources>
+    <item type="id" name="nav_id_reference" />
+</resources>
@@ -317,8 +317,11 @@ public Integer get(@NonNull Bundle bundle, @NonNull String key) {
         @NonNull
         @Override
         public Integer parseValue(@NonNull String value) {
-            throw new UnsupportedOperationException(
-                    "References don't support parsing string values.");
+            if (value.startsWith("0x")) {
+                return Integer.parseInt(value.substring(2), 16);
+            } else {
+                return Integer.parseInt(value);
+            }
         }
 
         @NonNull