diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/etc/com.android.settings.intelligence.xml | 1 | ||||
| -rw-r--r-- | data/etc/com.android.settings.xml | 2 | ||||
| -rw-r--r-- | data/etc/com.android.systemui.xml | 7 | ||||
| -rw-r--r-- | data/etc/framework-sysconfig.xml | 2 | ||||
| -rw-r--r-- | data/etc/hiddenapi-package-whitelist.xml | 2 | ||||
| -rw-r--r-- | data/etc/platform.xml | 51 | ||||
| -rw-r--r-- | data/etc/privapp-permissions-platform.xml | 30 | ||||
| -rw-r--r-- | data/fonts/Android.mk | 18 | ||||
| -rw-r--r-- | data/fonts/fonts.xml | 125 | ||||
| -rw-r--r-- | data/keyboards/Vendor_18d1_Product_2c40.kl | 15 |
10 files changed, 187 insertions, 66 deletions
diff --git a/data/etc/com.android.settings.intelligence.xml b/data/etc/com.android.settings.intelligence.xml index f06ae86eb55c..6ca30c1e82fb 100644 --- a/data/etc/com.android.settings.intelligence.xml +++ b/data/etc/com.android.settings.intelligence.xml @@ -19,5 +19,6 @@ <permission name="android.permission.MANAGE_FINGERPRINT"/> <permission name="android.permission.MODIFY_PHONE_STATE"/> <permission name="android.permission.READ_SEARCH_INDEXABLES"/> + <permission name="android.permission.WRITE_SETTINGS_HOMEPAGE_DATA"/> </privapp-permissions> </permissions> diff --git a/data/etc/com.android.settings.xml b/data/etc/com.android.settings.xml index 2ba8075534b9..2110a8fa7e3d 100644 --- a/data/etc/com.android.settings.xml +++ b/data/etc/com.android.settings.xml @@ -26,6 +26,7 @@ <permission name="android.permission.DELETE_PACKAGES"/> <permission name="android.permission.FORCE_STOP_PACKAGES"/> <permission name="android.permission.LOCAL_MAC_ADDRESS"/> + <permission name="android.permission.MANAGE_DEBUGGING"/> <permission name="android.permission.MANAGE_DEVICE_ADMINS"/> <permission name="android.permission.MANAGE_FINGERPRINT"/> <permission name="android.permission.MANAGE_USB"/> @@ -47,5 +48,6 @@ <permission name="android.permission.WRITE_APN_SETTINGS"/> <permission name="android.permission.WRITE_MEDIA_STORAGE"/> <permission name="android.permission.WRITE_SECURE_SETTINGS"/> + <permission name="android.permission.CONTROL_DISPLAY_COLOR_TRANSFORMS" /> </privapp-permissions> </permissions> diff --git a/data/etc/com.android.systemui.xml b/data/etc/com.android.systemui.xml index 724a617aac42..3562a8f81408 100644 --- a/data/etc/com.android.systemui.xml +++ b/data/etc/com.android.systemui.xml @@ -23,12 +23,14 @@ <permission name="android.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST"/> <permission name="android.permission.CHANGE_OVERLAY_PACKAGES"/> <permission name="android.permission.CONNECTIVITY_INTERNAL"/> + <permission name="android.permission.CONTROL_KEYGUARD_SECURE_NOTIFICATIONS"/> <permission name="android.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS"/> <permission name="android.permission.CONTROL_VPN"/> <permission name="android.permission.DUMP"/> <permission name="android.permission.GET_APP_OPS_STATS"/> <permission name="android.permission.INTERACT_ACROSS_USERS"/> - <permission name="android.permission.MANAGE_ACTIVITY_STACKS"/> + <permission name="android.permission.MANAGE_DEBUGGING"/> + <permission name="android.permission.MANAGE_SENSOR_PRIVACY"/> <permission name="android.permission.MANAGE_USB"/> <permission name="android.permission.MANAGE_USERS"/> <permission name="android.permission.MASTER_CLEAR"/> @@ -42,6 +44,8 @@ <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/> <permission name="android.permission.REAL_GET_TASKS"/> <permission name="android.permission.RECEIVE_MEDIA_RESOURCE_USAGE"/> + <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND" /> + <permission name="android.permission.START_ACTIVITY_AS_CALLER"/> <permission name="android.permission.START_TASKS_FROM_RECENTS"/> <permission name="android.permission.STATUS_BAR"/> <permission name="android.permission.STOP_APP_SWITCHES"/> @@ -53,5 +57,6 @@ <permission name="android.permission.WRITE_MEDIA_STORAGE"/> <permission name="android.permission.WRITE_SECURE_SETTINGS"/> <permission name="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"/> + <permission name="android.permission.CONTROL_DISPLAY_COLOR_TRANSFORMS" /> </privapp-permissions> </permissions> diff --git a/data/etc/framework-sysconfig.xml b/data/etc/framework-sysconfig.xml index ae6a7f6d6808..b0d2de17527d 100644 --- a/data/etc/framework-sysconfig.xml +++ b/data/etc/framework-sysconfig.xml @@ -28,7 +28,7 @@ <!-- Whitelist of what components are permitted as backup data transports. The 'service' attribute here is a flattened ComponentName string. --> <backup-transport-whitelisted-service - service="android/com.android.internal.backup.LocalTransportService" /> + service="com.android.localtransport/.LocalTransportService" /> <!-- Whitelist of bundled applications which all handle URLs to their websites by default --> <app-link package="com.android.carrierdefaultapp" /> diff --git a/data/etc/hiddenapi-package-whitelist.xml b/data/etc/hiddenapi-package-whitelist.xml index 4e09c69b6779..5cfae1170097 100644 --- a/data/etc/hiddenapi-package-whitelist.xml +++ b/data/etc/hiddenapi-package-whitelist.xml @@ -38,7 +38,7 @@ platform cert need to be included, as apps signed with the platform cert are exe <hidden-api-whitelisted-app package="com.android.launcher3" /> <hidden-api-whitelisted-app package="com.android.mtp" /> <hidden-api-whitelisted-app package="com.android.musicfx" /> - <hidden-api-whitelisted-app package="com.android.packageinstaller" /> + <hidden-api-whitelisted-app package="com.android.permissioncontroller" /> <hidden-api-whitelisted-app package="com.android.printservice.recommendation" /> <hidden-api-whitelisted-app package="com.android.printspooler" /> <hidden-api-whitelisted-app package="com.android.providers.blockednumber" /> diff --git a/data/etc/platform.xml b/data/etc/platform.xml index afe791344f7b..44d71e269a95 100644 --- a/data/etc/platform.xml +++ b/data/etc/platform.xml @@ -169,30 +169,75 @@ <assign-permission name="android.permission.DUMP" uid="incidentd" /> <assign-permission name="android.permission.PACKAGE_USAGE_STATS" uid="incidentd" /> <assign-permission name="android.permission.INTERACT_ACROSS_USERS" uid="incidentd" /> + <assign-permission name="android.permission.REQUEST_INCIDENT_REPORT_APPROVAL" uid="incidentd" /> <assign-permission name="android.permission.ACCESS_LOWPAN_STATE" uid="lowpan" /> <assign-permission name="android.permission.MANAGE_LOWPAN_INTERFACES" uid="lowpan" /> + <assign-permission name="android.permission.BATTERY_STATS" uid="statsd" /> <assign-permission name="android.permission.DUMP" uid="statsd" /> <assign-permission name="android.permission.PACKAGE_USAGE_STATS" uid="statsd" /> <assign-permission name="android.permission.STATSCOMPANION" uid="statsd" /> <assign-permission name="android.permission.UPDATE_APP_OPS_STATS" uid="statsd" /> + <split-permission name="android.permission.WRITE_EXTERNAL_STORAGE"> + <new-permission name="android.permission.READ_EXTERNAL_STORAGE" /> + </split-permission> + <split-permission name="android.permission.READ_CONTACTS" + targetSdk="16"> + <new-permission name="android.permission.READ_CALL_LOG" /> + </split-permission> + <split-permission name="android.permission.WRITE_CONTACTS" + targetSdk="16"> + <new-permission name="android.permission.WRITE_CALL_LOG" /> + </split-permission> + <!-- STOPSHIP(b/118882117): change targetSdk to Q when SDK version finalised --> + <split-permission name="android.permission.ACCESS_FINE_LOCATION" + targetSdk="10000"> + <new-permission name="android.permission.ACCESS_BACKGROUND_LOCATION" /> + </split-permission> + <!-- STOPSHIP(b/118882117): change targetSdk to Q when SDK version finalised --> + <split-permission name="android.permission.ACCESS_COARSE_LOCATION" + targetSdk="10000"> + <new-permission name="android.permission.ACCESS_BACKGROUND_LOCATION" /> + </split-permission> + + <!-- Apps holding either the legacy READ or WRITE permissions will inherit + the ability to <em>read</em> new typed permissions in the Q release; they + won't gain the ability to <em>write</em> that content. --> + <!-- STOPSHIP(b/112545973): change targetSdk to Q when SDK version finalised --> + <split-permission name="android.permission.READ_EXTERNAL_STORAGE" + targetSdk="10000"> + <new-permission name="android.permission.READ_MEDIA_AUDIO" /> + <new-permission name="android.permission.READ_MEDIA_VIDEO" /> + <new-permission name="android.permission.READ_MEDIA_IMAGES" /> + </split-permission> + <!-- STOPSHIP(b/112545973): change targetSdk to Q when SDK version finalised --> + <split-permission name="android.permission.WRITE_EXTERNAL_STORAGE" + targetSdk="10000"> + <new-permission name="android.permission.READ_MEDIA_AUDIO" /> + <new-permission name="android.permission.READ_MEDIA_VIDEO" /> + <new-permission name="android.permission.READ_MEDIA_IMAGES" /> + </split-permission> + <!-- This is a list of all the libraries available for application code to link against. --> <library name="android.test.base" file="/system/framework/android.test.base.jar" /> <library name="android.test.mock" - file="/system/framework/android.test.mock.jar" /> + file="/system/framework/android.test.mock.jar" + dependency="android.test.base" /> <library name="android.test.runner" - file="/system/framework/android.test.runner.jar" /> + file="/system/framework/android.test.runner.jar" + dependency="android.test.base:android.test.mock" /> <!-- In BOOT_JARS historically, and now added to legacy applications. --> <library name="android.hidl.base-V1.0-java" file="/system/framework/android.hidl.base-V1.0-java.jar" /> <library name="android.hidl.manager-V1.0-java" - file="/system/framework/android.hidl.manager-V1.0-java.jar" /> + file="/system/framework/android.hidl.manager-V1.0-java.jar" + dependency="android.hidl.base-V1.0-java" /> <!-- These are the standard packages that are white-listed to always have internet access while in power save mode, even if they aren't in the foreground. --> diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml index 9a148e4e7b79..4ef5adb78b6c 100644 --- a/data/etc/privapp-permissions-platform.xml +++ b/data/etc/privapp-permissions-platform.xml @@ -22,6 +22,7 @@ applications that come with the platform <permissions> <privapp-permissions package="android.ext.services"> <permission name="android.permission.PROVIDE_RESOLVER_RANKER_SERVICE" /> + <permission name="android.permission.MONITOR_DEFAULT_SMS_PACKAGE" /> </privapp-permissions> <privapp-permissions package="com.android.apps.tag"> @@ -74,7 +75,9 @@ applications that come with the platform <permission name="android.permission.MANAGE_DEVICE_ADMINS"/> <permission name="android.permission.MANAGE_USERS"/> <permission name="android.permission.MASTER_CLEAR"/> + <permission name="android.permission.NETWORK_MANAGED_PROVISIONING"/> <permission name="android.permission.PERFORM_CDMA_PROVISIONING"/> + <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/> <permission name="android.permission.SET_TIME"/> <permission name="android.permission.SET_TIME_ZONE"/> <permission name="android.permission.SHUTDOWN"/> @@ -104,6 +107,7 @@ applications that come with the platform <privapp-permissions package="com.android.omadm.service"> <permission name="android.permission.CHANGE_CONFIGURATION"/> <permission name="android.permission.CONNECTIVITY_INTERNAL"/> + <permission name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"/> <permission name="android.permission.MODIFY_PHONE_STATE"/> <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/> <permission name="android.permission.WRITE_APN_SETTINGS"/> @@ -111,13 +115,24 @@ applications that come with the platform </privapp-permissions> <privapp-permissions package="com.android.packageinstaller"> - <permission name="android.permission.CLEAR_APP_CACHE"/> <permission name="android.permission.DELETE_PACKAGES"/> <permission name="android.permission.INSTALL_PACKAGES"/> + <permission name="android.permission.USE_RESERVED_DISK"/> + <permission name="android.permission.MANAGE_USERS"/> + <permission name="android.permission.UPDATE_APP_OPS_STATS"/> + <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/> + <permission name="android.permission.CLEAR_APP_USER_DATA"/> + <permission name="android.permission.PACKAGE_USAGE_STATS"/> + </privapp-permissions> + + <privapp-permissions package="com.android.permissioncontroller"> + <permission name="android.permission.CLEAR_APP_CACHE"/> <permission name="android.permission.MANAGE_USERS"/> <permission name="android.permission.OBSERVE_GRANT_REVOKE_PERMISSIONS"/> + <permission name="android.permission.GET_APP_OPS_STATS"/> <permission name="android.permission.UPDATE_APP_OPS_STATS"/> - <permission name="android.permission.USE_RESERVED_DISK"/> + <permission name="android.permission.REQUEST_INCIDENT_REPORT_APPROVAL"/> + <permission name="android.permission.APPROVE_INCIDENT_REPORTS"/> </privapp-permissions> <privapp-permissions package="com.android.phone"> @@ -158,12 +173,15 @@ applications that come with the platform <permission name="android.permission.WRITE_APN_SETTINGS"/> <permission name="android.permission.WRITE_SECURE_SETTINGS"/> <permission name="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"/> + <permission name="android.permission.READ_PRECISE_PHONE_STATE"/> <permission name="com.android.voicemail.permission.READ_VOICEMAIL"/> <permission name="com.android.voicemail.permission.WRITE_VOICEMAIL"/> </privapp-permissions> <privapp-permissions package="com.android.providers.calendar"> <permission name="android.permission.GET_ACCOUNTS_PRIVILEGED"/> + <permission name="android.permission.INTERACT_ACROSS_USERS" /> + <permission name="android.permission.MANAGE_USERS" /> <permission name="android.permission.UPDATE_APP_OPS_STATS"/> <permission name="android.permission.USE_RESERVED_DISK"/> </privapp-permissions> @@ -264,7 +282,7 @@ applications that come with the platform <permission name="android.permission.INSTALL_PACKAGES"/> <permission name="android.permission.INTERACT_ACROSS_USERS"/> <permission name="android.permission.LOCAL_MAC_ADDRESS"/> - <permission name="android.permission.MANAGE_ACTIVITY_STACKS"/> + <permission name="android.permission.MANAGE_ACCESSIBILITY"/> <permission name="android.permission.MANAGE_DEVICE_ADMINS"/> <permission name="android.permission.MANAGE_USB"/> <permission name="android.permission.MODIFY_APPWIDGET_BIND_PERMISSIONS"/> @@ -273,10 +291,12 @@ applications that come with the platform <permission name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/> <permission name="android.permission.MOVE_PACKAGE"/> <permission name="android.permission.PACKAGE_USAGE_STATS" /> + <permission name="android.permission.POWER_SAVER" /> <permission name="android.permission.READ_FRAME_BUFFER"/> <permission name="android.permission.READ_LOWPAN_CREDENTIAL"/> <!-- Needed for test only --> <permission name="android.permission.READ_PRECISE_PHONE_STATE" /> + <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/> <permission name="android.permission.REAL_GET_TASKS"/> <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/> <permission name="android.permission.REGISTER_CALL_PROVIDER"/> @@ -290,13 +310,17 @@ applications that come with the platform <permission name="android.permission.SET_TIME"/> <permission name="android.permission.SET_TIME_ZONE"/> <permission name="android.permission.SIGNAL_PERSISTENT_PROCESSES"/> + <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND" /> <permission name="android.permission.START_TASKS_FROM_RECENTS" /> <permission name="android.permission.STOP_APP_SWITCHES"/> <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/> + <permission name="android.permission.SUSPEND_APPS" /> <permission name="android.permission.UPDATE_APP_OPS_STATS"/> <permission name="android.permission.USE_RESERVED_DISK"/> <permission name="android.permission.WRITE_MEDIA_STORAGE"/> <permission name="android.permission.WRITE_SECURE_SETTINGS"/> + <permission name="android.permission.STATUS_BAR_SERVICE"/> + <permission name="android.permission.REQUEST_INCIDENT_REPORT_APPROVAL"/> </privapp-permissions> <privapp-permissions package="com.android.statementservice"> diff --git a/data/fonts/Android.mk b/data/fonts/Android.mk index 76eb4e676923..454dceb9c82c 100644 --- a/data/fonts/Android.mk +++ b/data/fonts/Android.mk @@ -89,23 +89,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := fonts.xml LOCAL_MODULE_CLASS := ETC - -AOSP_FONTS_FILE := frameworks/base/data/fonts/fonts.xml - -ifdef ADDITIONAL_FONTS_FILE -ADDITIONAL_FONTS_SCRIPT := frameworks/base/tools/fonts/add_additional_fonts.py -ADD_ADDITIONAL_FONTS := $(local-generated-sources-dir)/fonts.xml - -$(ADD_ADDITIONAL_FONTS): PRIVATE_SCRIPT := $(ADDITIONAL_FONTS_SCRIPT) -$(ADD_ADDITIONAL_FONTS): PRIVATE_ADDITIONAL_FONTS_FILE := $(ADDITIONAL_FONTS_FILE) -$(ADD_ADDITIONAL_FONTS): $(ADDITIONAL_FONTS_SCRIPT) $(AOSP_FONTS_FILE) $(ADDITIONAL_FONTS_FILE) - rm -f $@ - python $(PRIVATE_SCRIPT) $@ $(PRIVATE_ADDITIONAL_FONTS_FILE) -else -ADD_ADDITIONAL_FONTS := $(AOSP_FONTS_FILE) -endif - -LOCAL_PREBUILT_MODULE_FILE := $(ADD_ADDITIONAL_FONTS) +LOCAL_PREBUILT_MODULE_FILE := frameworks/base/data/fonts/fonts.xml include $(BUILD_PREBUILT) diff --git a/data/fonts/fonts.xml b/data/fonts/fonts.xml index 72d9bce687ab..626bbf0001dd 100644 --- a/data/fonts/fonts.xml +++ b/data/fonts/fonts.xml @@ -65,6 +65,7 @@ <font weight="400" style="italic">NotoSerif-Italic.ttf</font> <font weight="700" style="italic">NotoSerif-BoldItalic.ttf</font> </family> + <alias name="serif-bold" to="serif" weight="700" /> <alias name="times" to="serif" /> <alias name="times new roman" to="serif" /> <alias name="palatino" to="serif" /> @@ -99,6 +100,46 @@ <font weight="400" style="normal">CarroisGothicSC-Regular.ttf</font> </family> + <family name="arbutus-slab"> + <font weight="400" style="normal">ArbutusSlab-Regular.ttf</font> + </family> + + <family name="arvo"> + <font weight="400" style="normal">Arvo-Regular.ttf</font> + <font weight="400" style="italic">Arvo-Italic.ttf</font> + <font weight="700" style="normal">Arvo-Bold.ttf</font> + <font weight="700" style="italic">Arvo-BoldItalic.ttf</font> + </family> + <alias name="arvo-bold" to="arvo" weight="700" /> + + <family name="lato"> + <font weight="400" style="normal">Lato-Regular.ttf</font> + <font weight="400" style="italic">Lato-Italic.ttf</font> + <font weight="700" style="normal">Lato-Bold.ttf</font> + <font weight="700" style="italic">Lato-BoldItalic.ttf</font> + </family> + <alias name="lato-bold" to="lato" weight="700" /> + + <family name="rubik"> + <font weight="400" style="normal">Rubik-Regular.ttf</font> + <font weight="400" style="italic">Rubik-Italic.ttf</font> + <font weight="500" style="normal">Rubik-Medium.ttf</font> + <font weight="500" style="italic">Rubik-MediumItalic.ttf</font> + <font weight="700" style="normal">Rubik-Bold.ttf</font> + <font weight="700" style="italic">Rubik-BoldItalic.ttf</font> + </family> + <alias name="rubik-medium" to="rubik" weight="500" /> + + <family name="source-sans-pro"> + <font weight="400" style="normal">SourceSansPro-Regular.ttf</font> + <font weight="400" style="italic">SourceSansPro-Italic.ttf</font> + <font weight="600" style="normal">SourceSansPro-SemiBold.ttf</font> + <font weight="600" style="italic">SourceSansPro-SemiBoldItalic.ttf</font> + <font weight="700" style="normal">SourceSansPro-Bold.ttf</font> + <font weight="700" style="italic">SourceSansPro-BoldItalic.ttf</font> + </family> + <alias name="source-sans-pro-semi-bold" to="source-sans-pro" weight="600" /> + <!-- fallback fonts --> <family lang="und-Arab" variant="elegant"> <font weight="400" style="normal">NotoNaskhArabic-Regular.ttf</font> @@ -131,26 +172,30 @@ <font weight="700" style="normal">NotoSansThaiUI-Bold.ttf</font> </family> <family lang="und-Armn"> - <font weight="400" style="normal">NotoSansArmenian-Regular.ttf</font> - <font weight="700" style="normal">NotoSansArmenian-Bold.ttf</font> - <font weight="400" style="normal" fallbackFor="serif">NotoSerifArmenian-Regular.ttf</font> - <font weight="700" style="normal" fallbackFor="serif">NotoSerifArmenian-Bold.ttf</font> - </family> - <family lang="und-Geor und-Geok"> - <font weight="400" style="normal">NotoSansGeorgian-Regular.ttf</font> - <font weight="700" style="normal">NotoSansGeorgian-Bold.ttf</font> - <font weight="400" style="normal" fallbackFor="serif">NotoSerifGeorgian-Regular.ttf</font> - <font weight="700" style="normal" fallbackFor="serif">NotoSerifGeorgian-Bold.ttf</font> + <font weight="400" style="normal">NotoSansArmenian-Regular.otf</font> + <font weight="500" style="normal">NotoSansArmenian-Medium.otf</font> + <font weight="700" style="normal">NotoSansArmenian-Bold.otf</font> + <font weight="400" style="normal" fallbackFor="serif">NotoSerifArmenian-Regular.otf</font> + <font weight="700" style="normal" fallbackFor="serif">NotoSerifArmenian-Bold.otf</font> + </family> + <family lang="und-Geor,und-Geok"> + <font weight="400" style="normal">NotoSansGeorgian-Regular.otf</font> + <font weight="500" style="normal">NotoSansGeorgian-Medium.otf</font> + <font weight="700" style="normal">NotoSansGeorgian-Bold.otf</font> + <font weight="400" style="normal" fallbackFor="serif">NotoSerifGeorgian-Regular.otf</font> + <font weight="700" style="normal" fallbackFor="serif">NotoSerifGeorgian-Bold.otf</font> </family> <family lang="und-Deva" variant="elegant"> - <font weight="400" style="normal">NotoSansDevanagari-Regular.ttf</font> - <font weight="700" style="normal">NotoSansDevanagari-Bold.ttf</font> + <font weight="400" style="normal">NotoSansDevanagari-Regular.otf</font> + <font weight="500" style="normal">NotoSansDevanagari-Medium.otf</font> + <font weight="700" style="normal">NotoSansDevanagari-Bold.otf</font> <font weight="400" style="normal" fallbackFor="serif">NotoSerifDevanagari-Regular.ttf</font> <font weight="700" style="normal" fallbackFor="serif">NotoSerifDevanagari-Bold.ttf</font> </family> <family lang="und-Deva" variant="compact"> - <font weight="400" style="normal">NotoSansDevanagariUI-Regular.ttf</font> - <font weight="700" style="normal">NotoSansDevanagariUI-Bold.ttf</font> + <font weight="400" style="normal">NotoSansDevanagariUI-Regular.otf</font> + <font weight="500" style="normal">NotoSansDevanagariUI-Medium.otf</font> + <font weight="700" style="normal">NotoSansDevanagariUI-Bold.otf</font> </family> <!-- All scripts of India should come after Devanagari, due to shared @@ -177,34 +222,40 @@ <font weight="700" style="normal">NotoSansGurmukhiUI-Bold.ttf</font> </family> <family lang="und-Taml" variant="elegant"> - <font weight="400" style="normal">NotoSansTamil-Regular.ttf</font> - <font weight="700" style="normal">NotoSansTamil-Bold.ttf</font> - <font weight="400" style="normal" fallbackFor="serif">NotoSerifTamil-Regular.ttf</font> - <font weight="700" style="normal" fallbackFor="serif">NotoSerifTamil-Bold.ttf</font> + <font weight="400" style="normal">NotoSansTamil-Regular.otf</font> + <font weight="500" style="normal">NotoSansTamil-Medium.otf</font> + <font weight="700" style="normal">NotoSansTamil-Bold.otf</font> + <font weight="400" style="normal" fallbackFor="serif">NotoSerifTamil-Regular.otf</font> + <font weight="700" style="normal" fallbackFor="serif">NotoSerifTamil-Bold.otf</font> </family> <family lang="und-Taml" variant="compact"> - <font weight="400" style="normal">NotoSansTamilUI-Regular.ttf</font> - <font weight="700" style="normal">NotoSansTamilUI-Bold.ttf</font> + <font weight="400" style="normal">NotoSansTamilUI-Regular.otf</font> + <font weight="500" style="normal">NotoSansTamilUI-Medium.otf</font> + <font weight="700" style="normal">NotoSansTamilUI-Bold.otf</font> </family> <family lang="und-Mlym" variant="elegant"> - <font weight="400" style="normal">NotoSansMalayalam-Regular.ttf</font> - <font weight="700" style="normal">NotoSansMalayalam-Bold.ttf</font> + <font weight="400" style="normal">NotoSansMalayalam-Regular.otf</font> + <font weight="500" style="normal">NotoSansMalayalam-Medium.otf</font> + <font weight="700" style="normal">NotoSansMalayalam-Bold.otf</font> <font weight="400" style="normal" fallbackFor="serif">NotoSerifMalayalam-Regular.ttf</font> <font weight="700" style="normal" fallbackFor="serif">NotoSerifMalayalam-Bold.ttf</font> </family> <family lang="und-Mlym" variant="compact"> - <font weight="400" style="normal">NotoSansMalayalamUI-Regular.ttf</font> - <font weight="700" style="normal">NotoSansMalayalamUI-Bold.ttf</font> + <font weight="400" style="normal">NotoSansMalayalamUI-Regular.otf</font> + <font weight="500" style="normal">NotoSansMalayalamUI-Medium.otf</font> + <font weight="700" style="normal">NotoSansMalayalamUI-Bold.otf</font> </family> <family lang="und-Beng" variant="elegant"> - <font weight="400" style="normal">NotoSansBengali-Regular.ttf</font> - <font weight="700" style="normal">NotoSansBengali-Bold.ttf</font> + <font weight="400" style="normal">NotoSansBengali-Regular.otf</font> + <font weight="500" style="normal">NotoSansBengali-Medium.otf</font> + <font weight="700" style="normal">NotoSansBengali-Bold.otf</font> <font weight="400" style="normal" fallbackFor="serif">NotoSerifBengali-Regular.ttf</font> <font weight="700" style="normal" fallbackFor="serif">NotoSerifBengali-Bold.ttf</font> </family> <family lang="und-Beng" variant="compact"> - <font weight="400" style="normal">NotoSansBengaliUI-Regular.ttf</font> - <font weight="700" style="normal">NotoSansBengaliUI-Bold.ttf</font> + <font weight="400" style="normal">NotoSansBengaliUI-Regular.otf</font> + <font weight="500" style="normal">NotoSansBengaliUI-Medium.otf</font> + <font weight="700" style="normal">NotoSansBengaliUI-Bold.otf</font> </family> <family lang="und-Telu" variant="elegant"> <font weight="400" style="normal">NotoSansTelugu-Regular.ttf</font> @@ -236,13 +287,15 @@ </family> <family lang="und-Sinh" variant="elegant"> - <font weight="400" style="normal">NotoSansSinhala-Regular.ttf</font> - <font weight="700" style="normal">NotoSansSinhala-Bold.ttf</font> + <font weight="400" style="normal">NotoSansSinhala-Regular.otf</font> + <font weight="500" style="normal">NotoSansSinhala-Medium.otf</font> + <font weight="700" style="normal">NotoSansSinhala-Bold.otf</font> <font weight="400" style="normal" fallbackFor="serif">NotoSerifSinhala-Regular.otf</font> <font weight="700" style="normal" fallbackFor="serif">NotoSerifSinhala-Bold.otf</font> </family> <family lang="und-Sinh" variant="compact"> <font weight="400" style="normal">NotoSansSinhalaUI-Regular.otf</font> + <font weight="500" style="normal">NotoSansSinhalaUI-Medium.otf</font> <font weight="700" style="normal">NotoSansSinhalaUI-Bold.otf</font> </family> <family lang="und-Khmr" variant="elegant"> @@ -300,14 +353,14 @@ <font weight="700" style="normal">NotoSansLaoUI-Bold.ttf</font> </family> <family lang="und-Mymr" variant="elegant"> - <font weight="400" style="normal">NotoSansMyanmar-Regular.ttf</font> - <font weight="700" style="normal">NotoSansMyanmar-Bold.ttf</font> + <font weight="400" style="normal">NotoSansMyanmar-Regular-ZawDecode.ttf</font> + <font weight="700" style="normal">NotoSansMyanmar-Bold-ZawDecode.ttf</font> <font weight="400" style="normal" fallbackFor="serif">NotoSerifMyanmar-Regular.otf</font> <font weight="700" style="normal" fallbackFor="serif">NotoSerifMyanmar-Bold.otf</font> </family> <family lang="und-Mymr" variant="compact"> - <font weight="400" style="normal">NotoSansMyanmarUI-Regular.ttf</font> - <font weight="700" style="normal">NotoSansMyanmarUI-Bold.ttf</font> + <font weight="400" style="normal">NotoSansMyanmarUI-Regular-ZawDecode.ttf</font> + <font weight="700" style="normal">NotoSansMyanmarUI-Bold-ZawDecode.ttf</font> </family> <family lang="und-Thaa"> <font weight="400" style="normal">NotoSansThaana-Regular.ttf</font> @@ -351,7 +404,7 @@ <font weight="400" style="normal">NotoSansCarian-Regular.ttf</font> </family> <family lang="und-Cakm"> - <font weight="400" style="normal">NotoSansChakma-Regular.ttf</font> + <font weight="400" style="normal">NotoSansChakma-Regular.otf</font> </family> <family lang="und-Cher"> <font weight="400" style="normal">NotoSansCherokee-Regular.ttf</font> @@ -524,7 +577,7 @@ <font weight="400" style="normal" index="2">NotoSansCJK-Regular.ttc</font> <font weight="400" style="normal" index="2" fallbackFor="serif">NotoSerifCJK-Regular.ttc</font> </family> - <family lang="zh-Hant zh-Bopo"> + <family lang="zh-Hant,zh-Bopo"> <font weight="400" style="normal" index="3">NotoSansCJK-Regular.ttc</font> <font weight="400" style="normal" index="3" fallbackFor="serif">NotoSerifCJK-Regular.ttc</font> </family> diff --git a/data/keyboards/Vendor_18d1_Product_2c40.kl b/data/keyboards/Vendor_18d1_Product_2c40.kl index 6efde4fa2cbc..2b42f871b0a2 100644 --- a/data/keyboards/Vendor_18d1_Product_2c40.kl +++ b/data/keyboards/Vendor_18d1_Product_2c40.kl @@ -20,13 +20,9 @@ key 307 BUTTON_X key 308 BUTTON_Y key 310 BUTTON_L1 key 311 BUTTON_R1 -key 316 BUTTON_MODE key 317 BUTTON_THUMBL key 318 BUTTON_THUMBR -key 158 BACK -key 172 HOME - axis 0x00 X axis 0x01 Y axis 0x02 Z @@ -40,3 +36,14 @@ led 0x00 CONTROLLER_1 led 0x01 CONTROLLER_2 led 0x02 CONTROLLER_3 led 0x03 CONTROLLER_4 + +# The next 2 buttons do not follow Linux standard because this behaviour was specified by the UX +# Left arrow to the immediate left of the power button +key 158 BACK +# Circle to the immediate right of the power button +key 172 HOME + + +# Mapping according to https://www.kernel.org/doc/Documentation/input/gamepad.txt +# Power button +key 316 BUTTON_MODE |