diff --git a/utils/omni_emulator/overlay/packages/apps/Settings/res/values/config.xml b/utils/omni_emulator/overlay/packages/apps/Settings/res/values/config.xml
new file mode 100644
index 0000000..95b14cf
--- /dev/null
+++ b/utils/omni_emulator/overlay/packages/apps/Settings/res/values/config.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- When true enable gesture setting. -->
+    <bool name="config_gesture_settings_enabled">true</bool>
+
+</resources>
diff --git a/utils/omni_emulator/skins/pixel_3a/hardware.ini b/utils/omni_emulator/skins/pixel_3a/hardware.ini
new file mode 100644
index 0000000..1da85a2
--- /dev/null
+++ b/utils/omni_emulator/skins/pixel_3a/hardware.ini
@@ -0,0 +1,94 @@
+hw.cpu.arch = x86_64
+hw.cpu.ncore = 4
+hw.ramSize = 2048
+hw.screen = multi-touch
+hw.mainKeys = false
+hw.trackBall = false
+hw.keyboard = true
+hw.keyboard.lid = false
+hw.keyboard.charmap = qwerty2
+hw.dPad = false
+hw.rotaryInput = false
+hw.gsmModem = true
+hw.gps = true
+hw.battery = true
+hw.accelerometer = true
+hw.gyroscope = true
+hw.audioInput = true
+hw.audioOutput = true
+hw.sdCard = false
+test.quitAfterBootTimeOut = -1
+test.delayAdbTillBootComplete = 0
+test.monitorAdb = 0
+hw.lcd.width = 1080
+hw.lcd.height = 2220
+hw.lcd.depth = 16
+hw.lcd.density = 440
+hw.lcd.backlight = true
+hw.lcd.vsync = 60
+hw.gltransport = pipe
+hw.gltransport.asg.writeBufferSize = 1048576
+hw.gltransport.asg.writeStepSize = 4096
+hw.gltransport.asg.dataRingSize = 32768
+hw.gltransport.drawFlushInterval = 800
+hw.displayRegion.0.1.xOffset = -1
+hw.displayRegion.0.1.yOffset = -1
+hw.displayRegion.0.1.width = 0
+hw.displayRegion.0.1.height = 0
+hw.displayRegion.0.2.xOffset = -1
+hw.displayRegion.0.2.yOffset = -1
+hw.displayRegion.0.2.width = 0
+hw.displayRegion.0.2.height = 0
+hw.displayRegion.0.3.xOffset = -1
+hw.displayRegion.0.3.yOffset = -1
+hw.displayRegion.0.3.width = 0
+hw.displayRegion.0.3.height = 0
+hw.display1.width = 0
+hw.display1.height = 0
+hw.display1.density = 0
+hw.display1.xOffset = -1
+hw.display1.yOffset = -1
+hw.display1.flag = 0
+hw.display2.width = 0
+hw.display2.height = 0
+hw.display2.density = 0
+hw.display2.xOffset = -1
+hw.display2.yOffset = -1
+hw.display2.flag = 0
+hw.display3.width = 0
+hw.display3.height = 0
+hw.display3.density = 0
+hw.display3.xOffset = -1
+hw.display3.yOffset = -1
+hw.display3.flag = 0
+hw.gpu.enabled = true
+hw.gpu.mode = host
+hw.initialOrientation = Portrait
+hw.camera.back = virtualscene
+hw.camera.front = emulated
+vm.heapSize = 512
+hw.sensors.light = true
+hw.sensors.pressure = true
+hw.sensors.humidity = true
+hw.sensors.proximity = true
+hw.sensors.magnetic_field = true
+hw.sensors.magnetic_field_uncalibrated = true
+hw.sensors.gyroscope_uncalibrated = true
+hw.sensors.orientation = true
+hw.sensors.temperature = true
+hw.sensors.rgbclight = false
+hw.sensor.hinge = true
+hw.sensor.hinge.count = 0
+hw.sensor.hinge.type = 0
+hw.sensor.hinge.sub_type = 0
+hw.sensor.hinge.fold_to_displayRegion.0.1_at_posture = 1
+hw.sensor.roll = false
+hw.sensor.roll.count = 0
+hw.sensor.roll.resize_to_displayRegion.0.1_at_posture = 6
+hw.sensor.roll.resize_to_displayRegion.0.2_at_posture = 6
+hw.sensor.roll.resize_to_displayRegion.0.3_at_posture = 6
+hw.sensors.heart_rate = false
+hw.useext4 = true
+hw.arc = false
+hw.arc.autologin = false
+hw.device.name = pixel_3a
\ No newline at end of file
diff --git a/utils/omni_emulator/skins/pixel_3a/land_back.webp b/utils/omni_emulator/skins/pixel_3a/land_back.webp
new file mode 100644
index 0000000..31cafb2
--- /dev/null
+++ b/utils/omni_emulator/skins/pixel_3a/land_back.webp
Binary files differ
diff --git a/utils/omni_emulator/skins/pixel_3a/land_fore.webp b/utils/omni_emulator/skins/pixel_3a/land_fore.webp
new file mode 100644
index 0000000..3716f8f
--- /dev/null
+++ b/utils/omni_emulator/skins/pixel_3a/land_fore.webp
Binary files differ
diff --git a/utils/omni_emulator/skins/pixel_3a/layout b/utils/omni_emulator/skins/pixel_3a/layout
new file mode 100644
index 0000000..05d01bd
--- /dev/null
+++ b/utils/omni_emulator/skins/pixel_3a/layout
@@ -0,0 +1,35 @@
+parts {
+  device {
+    display {
+      width 1080
+      height 2220
+      x 0
+      y 0
+    }
+  }
+  portrait {
+    background {
+      image port_back.webp
+    }
+    foreground {
+      mask rounded_corners.webp
+    }
+  }
+}
+layouts {
+  portrait {
+    width 1235
+    height 2646
+    event EV_SW:0:1
+    part1 {
+      name portrait
+      x 0
+      y 0
+    }
+    part2 {
+      name device
+      x 70
+      y 220
+    }
+  }
+}
diff --git a/utils/omni_emulator/skins/pixel_3a/port_back.webp b/utils/omni_emulator/skins/pixel_3a/port_back.webp
new file mode 100644
index 0000000..8a031d6
--- /dev/null
+++ b/utils/omni_emulator/skins/pixel_3a/port_back.webp
Binary files differ
diff --git a/utils/omni_emulator/skins/pixel_3a/port_fore.webp b/utils/omni_emulator/skins/pixel_3a/port_fore.webp
new file mode 100644
index 0000000..e8d1b0c
--- /dev/null
+++ b/utils/omni_emulator/skins/pixel_3a/port_fore.webp
Binary files differ
diff --git a/utils/omni_emulator/skins/pixel_3a/rounded_corners.webp b/utils/omni_emulator/skins/pixel_3a/rounded_corners.webp
new file mode 100644
index 0000000..731017a
--- /dev/null
+++ b/utils/omni_emulator/skins/pixel_3a/rounded_corners.webp
Binary files differ
diff --git a/utils/omni_emulator/start_emulator_image.sh b/utils/omni_emulator/start_emulator_image.sh
index fc63b0c..fb976d7 100755
--- a/utils/omni_emulator/start_emulator_image.sh
+++ b/utils/omni_emulator/start_emulator_image.sh
@@ -5,4 +5,4 @@
 
 # -show-kernel
 
-$HOME/Android/Sdk/emulator/emulator -show-kernel -verbose -skindir $ANDROID_BUILD_TOP/skins/ -skin pixel_2_xl -gpu host -writable-system -qemu -cpu qemu64 -append "vbmeta"
+$HOME/Android/Sdk/emulator/emulator -show-kernel -verbose -skindir $ANDROID_BUILD_TOP/skins/ -skin pixel_3a -gpu host -writable-system -qemu -cpu qemu64 -append "vbmeta"