DO NOT MERGE - Merge ab/7272582

Bug: 190855093
Merged-In: I910b59ef87bb833dd7d46a615dd073a35db710a3
Change-Id: I632162c432d02911b151498f5d9f64bade6651e6
This commit is contained in:
Xin Li
2021-06-14 21:51:49 -07:00
20 changed files with 10 additions and 2 deletions

View File

@@ -213,4 +213,12 @@
<dimen name="status_bar_height_landscape">28dp</dimen>
<!-- Height of area above QQS where battery/time go (equal to status bar) -->
<dimen name="quick_qs_offset_height">145px</dimen>
<!-- 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>
</resources>

View File

@@ -161,8 +161,8 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
endif
# GPS ANTENNA_INFO configuration file
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/gnss_antenna_info.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss_antenna_info.conf
#PRODUCT_COPY_FILES += \
# $(LOCAL_PATH)/gnss_antenna_info.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss_antenna_info.conf
# Audio effects
PRODUCT_PACKAGES += \