Snap for 7379850 from 0c291946eecd203591375184f4da1f126679a9d5 to sc-v2-release
Change-Id: If9532115e89eebb6b2f299afa74d7375ea31374f
This commit is contained in:
android-build-team Robot
commit
721e17de30
10 changed files with 111 additions and 38 deletions
|
|
@ -26,10 +26,17 @@ $(call inherit-product-if-exists, vendor/google/camera/devices/raviole/oriole/de
|
|||
DEVICE_PACKAGE_OVERLAYS += device/google/raviole/oriole/overlay
|
||||
|
||||
include device/google/gs101/device-shipping-common.mk
|
||||
include device/google/gs101/fingerprint/udfps.mk
|
||||
include device/google/gs101/fingerprint/udfps_common.mk
|
||||
include device/google/raviole/audio/oriole/audio-tables.mk
|
||||
include hardware/google/pixel/vibrator/cs40l25/device.mk
|
||||
|
||||
ifeq ($(filter factory_oriole, $(TARGET_PRODUCT)),)
|
||||
include device/google/gs101/fingerprint/udfps_shipping.mk
|
||||
else
|
||||
include device/google/gs101/fingerprint/udfps_factory.mk
|
||||
endif
|
||||
|
||||
|
||||
# Init files
|
||||
PRODUCT_COPY_FILES += \
|
||||
device/google/raviole/conf/init.raviole.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.raviole.rc \
|
||||
|
|
|
|||
|
|
@ -26,10 +26,18 @@ $(call inherit-product-if-exists, vendor/google/camera/devices/raviole/raven/dev
|
|||
DEVICE_PACKAGE_OVERLAYS += device/google/raviole/raven/overlay
|
||||
|
||||
include device/google/gs101/device-shipping-common.mk
|
||||
include device/google/gs101/fingerprint/udfps.mk
|
||||
include device/google/gs101/fingerprint/udfps_common.mk
|
||||
|
||||
ifeq ($(filter factory_raven, $(TARGET_PRODUCT)),)
|
||||
include device/google/gs101/fingerprint/udfps_shipping.mk
|
||||
else
|
||||
include device/google/gs101/fingerprint/udfps_factory.mk
|
||||
endif
|
||||
|
||||
ifeq ($(filter factory_raven, $(TARGET_PRODUCT)),)
|
||||
include device/google/gs101/uwb/uwb.mk
|
||||
endif
|
||||
|
||||
include device/google/raviole/audio/raven/audio-tables.mk
|
||||
include hardware/google/pixel/vibrator/cs40l25/device.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -24,12 +24,11 @@ PRODUCT_MODEL := Factory build on Oriole
|
|||
PRODUCT_BRAND := Android
|
||||
PRODUCT_MANUFACTURER := Google
|
||||
|
||||
DEVICE_PACKAGE_OVERLAYS += device/google/raviole/factory_oriole/overlay
|
||||
|
||||
# default BDADDR for EVB only
|
||||
PRODUCT_PROPERTY_OVERRIDES += \
|
||||
ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55"
|
||||
|
||||
# Fingerprint
|
||||
include device/google/gs101/fingerprint/udfps_factory.mk
|
||||
|
||||
# Factory binary of camera
|
||||
PRODUCT_PACKAGES += fatp_gn1_hat_tool
|
||||
|
|
|
|||
|
|
@ -0,0 +1,36 @@
|
|||
<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<!-- List of biometric sensors on the device, in decreasing strength. Consumed by AuthService
|
||||
when registering authenticators with BiometricService. Format must be ID:Modality:Strength,
|
||||
where: IDs are unique per device, Modality as defined in BiometricAuthenticator.java,
|
||||
and Strength as defined in Authenticators.java -->
|
||||
<string-array name="config_biometric_sensors" translatable="false" >
|
||||
<item>0:2:15</item> <!-- ID0:Fingerprint:Strong -->
|
||||
</string-array>
|
||||
|
||||
<!-- The properties of a UDFPS sensor in pixels -->
|
||||
<integer-array name="config_udfps_sensor_props">
|
||||
<item>540</item> <!-- sensorLocationX -->
|
||||
<item>1769</item> <!-- sensorLocationY -->
|
||||
<item>113</item> <!-- sensorRadius -->
|
||||
</integer-array>
|
||||
|
||||
</resources>
|
||||
|
|
@ -24,12 +24,11 @@ PRODUCT_MODEL := Factory build on Raven
|
|||
PRODUCT_BRAND := Android
|
||||
PRODUCT_MANUFACTURER := Google
|
||||
|
||||
DEVICE_PACKAGE_OVERLAYS += device/google/raviole/factory_raven/overlay
|
||||
|
||||
# default BDADDR for EVB only
|
||||
PRODUCT_PROPERTY_OVERRIDES += \
|
||||
ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55"
|
||||
|
||||
# Fingerprint
|
||||
include device/google/gs101/fingerprint/udfps_factory.mk
|
||||
|
||||
# Factory binaries of camera
|
||||
PRODUCT_PACKAGES += fatp_gn1_hat_tool fatp_imx586_hat_tool
|
||||
|
|
|
|||
|
|
@ -0,0 +1,36 @@
|
|||
<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<!-- List of biometric sensors on the device, in decreasing strength. Consumed by AuthService
|
||||
when registering authenticators with BiometricService. Format must be ID:Modality:Strength,
|
||||
where: IDs are unique per device, Modality as defined in BiometricAuthenticator.java,
|
||||
and Strength as defined in Authenticators.java -->
|
||||
<string-array name="config_biometric_sensors" translatable="false" >
|
||||
<item>0:2:15</item> <!-- ID0:Fingerprint:Strong -->
|
||||
</string-array>
|
||||
|
||||
<!-- The properties of a UDFPS sensor in pixels -->
|
||||
<integer-array name="config_udfps_sensor_props">
|
||||
<item>720</item> <!-- sensorLocationX -->
|
||||
<item>2364</item> <!-- sensorLocationY -->
|
||||
<item>142</item> <!-- sensorRadius -->
|
||||
</integer-array>
|
||||
|
||||
</resources>
|
||||
|
|
@ -58,14 +58,6 @@
|
|||
<!-- y-intercept --> <item>1.0</item>
|
||||
</string-array>
|
||||
|
||||
<!-- List of biometric sensors on the device, in decreasing strength. Consumed by AuthService
|
||||
when registering authenticators with BiometricService. Format must be ID:Modality:Strength,
|
||||
where: IDs are unique per device, Modality as defined in BiometricAuthenticator.java,
|
||||
and Strength as defined in Authenticators.java -->
|
||||
<string-array name="config_biometric_sensors" translatable="false" >
|
||||
<item>0:2:15</item> <!-- ID0:Fingerprint:Strong -->
|
||||
</string-array>
|
||||
|
||||
<!-- Whether the display cutout region of the main built-in display should be forced to
|
||||
black in software (to avoid aliasing or emulate a cutout that is not physically existent).
|
||||
-->
|
||||
|
|
@ -169,13 +161,6 @@
|
|||
<item>900.0</item> <!-- 20000+ -->
|
||||
</array>
|
||||
|
||||
<!-- The properties of a UDFPS sensor in pixels -->
|
||||
<integer-array name="config_udfps_sensor_props">
|
||||
<item>540</item> <!-- sensorLocationX -->
|
||||
<item>1769</item> <!-- sensorLocationY -->
|
||||
<item>113</item> <!-- sensorRadius -->
|
||||
</integer-array>
|
||||
|
||||
<!-- Type of the udfps long press sensor. Empty if long press is not supported. -->
|
||||
<string name="config_dozeUdfpsLongPressSensorType" translatable="false">com.google.sensor.long_press</string>
|
||||
|
||||
|
|
|
|||
|
|
@ -18,14 +18,6 @@
|
|||
-->
|
||||
|
||||
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<!-- List of biometric sensors on the device, in decreasing strength. Consumed by AuthService
|
||||
when registering authenticators with BiometricService. Format must be ID:Modality:Strength,
|
||||
where: IDs are unique per device, Modality as defined in BiometricAuthenticator.java,
|
||||
and Strength as defined in Authenticators.java -->
|
||||
<string-array name="config_biometric_sensors" translatable="false" >
|
||||
<item>0:2:15</item> <!-- ID0:Fingerprint:Strong -->
|
||||
</string-array>
|
||||
|
||||
<!-- Whether the display cutout region of the main built-in display should be forced to
|
||||
black in software (to avoid aliasing or emulate a cutout that is not physically existent).
|
||||
-->
|
||||
|
|
@ -56,13 +48,6 @@
|
|||
<!-- Adjustment for software rounded corners since corners aren't perfectly round. -->
|
||||
<dimen name="rounded_corner_radius_adjustment">5px</dimen>
|
||||
|
||||
<!-- The properties of a UDFPS sensor in pixels -->
|
||||
<integer-array name="config_udfps_sensor_props">
|
||||
<item>720</item> <!-- sensorLocationX -->
|
||||
<item>2364</item> <!-- sensorLocationY -->
|
||||
<item>142</item> <!-- sensorRadius -->
|
||||
</integer-array>
|
||||
|
||||
<!-- Type of the udfps long press sensor. Empty if long press is not supported. -->
|
||||
<string name="config_dozeUdfpsLongPressSensorType" translatable="false">com.google.sensor.long_press</string>
|
||||
|
||||
|
|
|
|||
|
|
@ -18,6 +18,15 @@
|
|||
-->
|
||||
|
||||
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
|
||||
<!-- List of biometric sensors on the device, in decreasing strength. Consumed by AuthService
|
||||
when registering authenticators with BiometricService. Format must be ID:Modality:Strength,
|
||||
where: IDs are unique per device, Modality as defined in BiometricAuthenticator.java,
|
||||
and Strength as defined in Authenticators.java -->
|
||||
<string-array name="config_biometric_sensors" translatable="false" >
|
||||
<item>0:2:15</item> <!-- ID0:Fingerprint:Strong -->
|
||||
</string-array>
|
||||
|
||||
<!-- Minimum screen brightness setting allowed by power manager.
|
||||
The user is forbidden from setting the brightness below this level. -->
|
||||
<item name="config_screenBrightnessSettingMinimumFloat" format="float" type="dimen">0.0</item>
|
||||
|
|
|
|||
|
|
@ -18,6 +18,15 @@
|
|||
-->
|
||||
|
||||
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
|
||||
<!-- List of biometric sensors on the device, in decreasing strength. Consumed by AuthService
|
||||
when registering authenticators with BiometricService. Format must be ID:Modality:Strength,
|
||||
where: IDs are unique per device, Modality as defined in BiometricAuthenticator.java,
|
||||
and Strength as defined in Authenticators.java -->
|
||||
<string-array name="config_biometric_sensors" translatable="false" >
|
||||
<item>0:2:15</item> <!-- ID0:Fingerprint:Strong -->
|
||||
</string-array>
|
||||
|
||||
<!-- Minimum screen brightness setting allowed by power manager.
|
||||
The user is forbidden from setting the brightness below this level. -->
|
||||
<item name="config_screenBrightnessSettingMinimumFloat" format="float" type="dimen">0.0</item>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue