diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml
index 9205839bce80f..1129647780534 100644
--- a/core/res/res/values/dimens.xml
+++ b/core/res/res/values/dimens.xml
@@ -530,9 +530,4 @@
     <dimen name="item_touch_helper_max_drag_scroll_per_frame">20dp</dimen>
     <dimen name="item_touch_helper_swipe_escape_velocity">120dp</dimen>
     <dimen name="item_touch_helper_swipe_escape_max_velocity">800dp</dimen>
-
-    <!-- The elevation of AutoFill fill window-->
-    <dimen name="autofill_fill_elevation">4dp</dimen>
-    <dimen name="autofill_fill_item_height">64dp</dimen>
-    <dimen name="autofill_fill_min_margin">16dp</dimen>
 </resources>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 11cde7a573ed1..f4d490aa0a52c 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -2848,9 +2848,8 @@
   <java-symbol type="dimen" name="item_touch_helper_swipe_escape_max_velocity"/>
 
   <!-- com.android.server.autofill -->
-  <java-symbol type="dimen" name="autofill_fill_elevation" />
-  <java-symbol type="dimen" name="autofill_fill_item_height" />
-  <java-symbol type="dimen" name="autofill_fill_min_margin" />
+  <!-- TODO: floating_window_z temporary exposed until Autofill UI uses a ContextThemeWrapper -->
+  <java-symbol type="dimen" name="floating_window_z" />
   <java-symbol type="layout" name="autofill_save"/>
   <java-symbol type="layout" name="autofill_dataset_picker"/>
   <java-symbol type="id" name="autofill" />
diff --git a/services/autofill/java/com/android/server/autofill/ui/FillUi.java b/services/autofill/java/com/android/server/autofill/ui/FillUi.java
index 85eecdf722434..99014a5432b60 100644
--- a/services/autofill/java/com/android/server/autofill/ui/FillUi.java
+++ b/services/autofill/java/com/android/server/autofill/ui/FillUi.java
@@ -100,6 +100,7 @@ final class FillUi {
             final int heightMeasureSpec = MeasureSpec.makeMeasureSpec(MeasureSpec.UNSPECIFIED, 0);
             content.measure(widthMeasureSpec, heightMeasureSpec);
             content.setOnClickListener(v -> mCallback.onResponsePicked(response));
+            content.setElevation(context.getResources().getDimension(R.dimen.floating_window_z));
             mContentWidth = content.getMeasuredWidth();
             mContentHeight = content.getMeasuredHeight();
 
@@ -138,8 +139,7 @@ final class FillUi {
             };
 
             final LayoutInflater inflater = LayoutInflater.from(context);
-            mListView = (ListView) inflater.inflate(
-                    com.android.internal.R.layout.autofill_dataset_picker, null);
+            mListView = (ListView) inflater.inflate(R.layout.autofill_dataset_picker, null);
             mListView.setAdapter(mAdapter);
             mListView.setOnItemClickListener((adapter, view, position, id) -> {
                 final ViewItem vi = mAdapter.getItem(position);