diff options
| author | 2024-01-30 10:36:03 -0800 | |
|---|---|---|
| committer | 2024-01-30 10:36:03 -0800 | |
| commit | 7b647e4ea0e92f33c19b315eaed364ee067ba0aa (patch) | |
| tree | 47c285aa18cf79476d615f8e169ebd823bee6d38 /data | |
| parent | 46deec9f696f850efdd4427e10db145d68cbb5bd (diff) | |
| parent | efd99108901ae47b085f96c841214f6f416dd86f (diff) | |
Merge Android 24Q1 Release (ab/11220357)
Bug: 319669529
Merged-In: I46c7859ff042ee7aa9193757e5df8269f4892362
Change-Id: I0c7b5036c0b0f5f2caad551edb063350f6eb87e7
Diffstat (limited to 'data')
| -rw-r--r-- | data/etc/Android.bp | 6 | ||||
| -rw-r--r-- | data/etc/preinstalled-packages-strict-signature.xml | 27 | ||||
| -rw-r--r-- | data/etc/privapp-permissions-platform.xml | 11 | ||||
| -rw-r--r-- | data/etc/services.core.protolog.json | 280 | ||||
| -rw-r--r-- | data/fonts/font_fallback.xml | 907 | ||||
| -rw-r--r-- | data/keyboards/Generic.kcm | 2 | ||||
| -rw-r--r-- | data/keyboards/Generic.kl | 2 | ||||
| -rw-r--r-- | data/keyboards/Vendor_0957_Product_0001.kl | 6 | ||||
| -rw-r--r-- | data/keyboards/Vendor_18d1_Product_9451.idc | 5 | ||||
| -rw-r--r-- | data/keyboards/Vendor_18d1_Product_9451.kl | 39 |
10 files changed, 393 insertions, 892 deletions
diff --git a/data/etc/Android.bp b/data/etc/Android.bp index 6a1f3f959185..ade20d282acc 100644 --- a/data/etc/Android.bp +++ b/data/etc/Android.bp @@ -60,6 +60,12 @@ prebuilt_etc { src: "preinstalled-packages-asl-files.xml", } +prebuilt_etc { + name: "preinstalled-packages-strict-signature.xml", + sub_dir: "sysconfig", + src: "preinstalled-packages-strict-signature.xml", +} + // Privapp permission whitelist files prebuilt_etc { diff --git a/data/etc/preinstalled-packages-strict-signature.xml b/data/etc/preinstalled-packages-strict-signature.xml new file mode 100644 index 000000000000..3cbfa8c4dbe9 --- /dev/null +++ b/data/etc/preinstalled-packages-strict-signature.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2023 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. + --> + +<!-- +This XML file declares which preinstalled apps, after updated, need to have strict signature check +in boot time and avoid the cached results. This is to ensure the updated version still verifies +against the preinstalled version. + +Example usage: + <require-strict-signature package="com.foo.bar"/> +--> + +<config></config> diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml index c1018f59ffb5..69a6e6d998a4 100644 --- a/data/etc/privapp-permissions-platform.xml +++ b/data/etc/privapp-permissions-platform.xml @@ -235,6 +235,7 @@ applications that come with the platform <privapp-permissions package="com.android.shell"> <!-- Needed for test only --> + <permission name="android.permission.CAMERA_HEADLESS_SYSTEM_USER"/> <permission name="android.permission.MANAGE_HEALTH_DATA"/> <permission name="android.permission.LAUNCH_DEVICE_MANAGER_SETUP"/> <permission name="android.permission.MODIFY_DAY_NIGHT_MODE"/> @@ -382,6 +383,8 @@ applications that come with the platform <!-- Permission required for ShortcutManagerUsageTest CTS test. --> <permission name="android.permission.ACCESS_SHORTCUTS"/> <permission name="android.permission.REBOOT"/> + <!-- Permission required for NfcResolverActivity CTS tests. --> + <permission name="android.permission.SHOW_CUSTOMIZED_RESOLVER"/> <!-- Permission required for access VIBRATOR_STATE. --> <permission name="android.permission.ACCESS_VIBRATOR_STATE"/> <!-- Permission required for UsageStatsTest CTS test. --> @@ -466,6 +469,7 @@ applications that come with the platform <permission name="android.permission.BIND_HOTWORD_DETECTION_SERVICE" /> <permission name="android.permission.BIND_VISUAL_QUERY_DETECTION_SERVICE" /> <permission name="android.permission.MANAGE_APP_HIBERNATION"/> + <permission name="android.permission.RECEIVE_SANDBOX_TRIGGER_AUDIO" /> <!-- Permission required for CTS test - ResourceObserverNativeTest --> <permission name="android.permission.REGISTER_MEDIA_RESOURCE_OBSERVER" /> <!-- Permission required for CTS test - MediaCodecResourceTest --> @@ -530,6 +534,9 @@ applications that come with the platform <permission name="android.permission.LAUNCH_CREDENTIAL_SELECTOR"/> <!-- Permission required for CTS test IntentRedirectionTest --> <permission name="android.permission.QUERY_CLONED_APPS"/> + <permission name="android.permission.GET_BINDING_UID_IMPORTANCE"/> + <!-- Permission required for CTS test NotificationManagerZenTest --> + <permission name="android.permission.CONTROL_DISPLAY_COLOR_TRANSFORMS" /> </privapp-permissions> <privapp-permissions package="com.android.statementservice"> @@ -538,6 +545,10 @@ applications that come with the platform <permission name="android.permission.INTERACT_ACROSS_USERS"/> </privapp-permissions> + <privapp-permissions package="com.android.soundpicker"> + <permission name="android.permission.INTERACT_ACROSS_USERS" /> + </privapp-permissions> + <privapp-permissions package="com.android.tv"> <permission name="android.permission.CHANGE_HDMI_CEC_ACTIVE_SOURCE"/> <permission name="android.permission.DVB_DEVICE"/> diff --git a/data/etc/services.core.protolog.json b/data/etc/services.core.protolog.json index 13cf82e51b22..aaddf0e50ddd 100644 --- a/data/etc/services.core.protolog.json +++ b/data/etc/services.core.protolog.json @@ -169,6 +169,12 @@ "group": "WM_DEBUG_WINDOW_ORGANIZER", "at": "com\/android\/server\/wm\/TaskOrganizerController.java" }, + "-1961637874": { + "message": "DeferredDisplayUpdater: applying DisplayInfo immediately", + "level": "DEBUG", + "group": "WM_DEBUG_WINDOW_TRANSITIONS", + "at": "com\/android\/server\/wm\/DeferredDisplayUpdater.java" + }, "-1949279037": { "message": "Attempted to add input method window with bad token %s. Aborting.", "level": "WARN", @@ -313,6 +319,12 @@ "group": "WM_DEBUG_RESIZE", "at": "com\/android\/server\/wm\/WindowState.java" }, + "-1818910559": { + "message": "DeferredDisplayUpdater: applied DisplayInfo after deferring", + "level": "DEBUG", + "group": "WM_DEBUG_WINDOW_TRANSITIONS", + "at": "com\/android\/server\/wm\/DeferredDisplayUpdater.java" + }, "-1814361639": { "message": "Set IME snapshot position: (%d, %d)", "level": "INFO", @@ -415,12 +427,6 @@ "group": "WM_DEBUG_WINDOW_TRANSITIONS", "at": "com\/android\/server\/wm\/Transition.java" }, - "-1717147904": { - "message": "Current focused window is embeddedWindow. Dispatch KEYCODE_BACK.", - "level": "DEBUG", - "group": "WM_DEBUG_BACK_PREVIEW", - "at": "com\/android\/server\/wm\/BackNavigationController.java" - }, "-1710206702": { "message": "Display id=%d is frozen while keyguard locked, return %d", "level": "VERBOSE", @@ -457,6 +463,12 @@ "group": "WM_DEBUG_TASKS", "at": "com\/android\/server\/wm\/ActivityTaskManagerService.java" }, + "-1671601441": { + "message": "attachWindowContextToDisplayContent: calling from non-existing process pid=%d uid=%d", + "level": "WARN", + "group": "WM_ERROR", + "at": "com\/android\/server\/wm\/WindowManagerService.java" + }, "-1670695197": { "message": "Attempted to add presentation window to a non-suitable display. Aborting.", "level": "WARN", @@ -529,6 +541,12 @@ "group": "WM_DEBUG_TASKS", "at": "com\/android\/server\/wm\/ActivityStarter.java" }, + "-1582845629": { + "message": "Starting animation on %s", + "level": "VERBOSE", + "group": "WM_DEBUG_DIMMER", + "at": "com\/android\/server\/wm\/DimmerAnimationHelper.java" + }, "-1575977269": { "message": "Skipping %s: mismatch root %s", "level": "DEBUG", @@ -589,6 +607,12 @@ "group": "WM_ERROR", "at": "com\/android\/server\/wm\/WindowManagerService.java" }, + "-1518132958": { + "message": "fractionRendered boundsOverSource=%f", + "level": "VERBOSE", + "group": "WM_DEBUG_TPL", + "at": "com\/android\/server\/wm\/TrustedPresentationListenerController.java" + }, "-1517908912": { "message": "requestScrollCapture: caught exception dispatching to window.token=%s", "level": "WARN", @@ -811,6 +835,12 @@ "group": "WM_DEBUG_STARTING_WINDOW", "at": "com\/android\/server\/wm\/ActivityRecord.java" }, + "-1325565952": { + "message": "Attempted to get home support flag of a display that does not exist: %d", + "level": "WARN", + "group": "WM_ERROR", + "at": "com\/android\/server\/wm\/WindowManagerService.java" + }, "-1323783276": { "message": "performEnableScreen: bootFinished() failed.", "level": "WARN", @@ -919,6 +949,12 @@ "group": "WM_DEBUG_REMOTE_ANIMATIONS", "at": "com\/android\/server\/wm\/RemoteAnimationController.java" }, + "-1243510456": { + "message": "Dim animation requested: %s", + "level": "VERBOSE", + "group": "WM_DEBUG_DIMMER", + "at": "com\/android\/server\/wm\/DimmerAnimationHelper.java" + }, "-1237827119": { "message": "Schedule remove starting %s startingWindow=%s animate=%b Callers=%s", "level": "VERBOSE", @@ -943,6 +979,12 @@ "group": "WM_DEBUG_CONTENT_RECORDING", "at": "com\/android\/server\/wm\/ContentRecorder.java" }, + "-1209762265": { + "message": "Registering listener=%s with id=%d for window=%s with %s", + "level": "DEBUG", + "group": "WM_DEBUG_TPL", + "at": "com\/android\/server\/wm\/TrustedPresentationListenerController.java" + }, "-1209252064": { "message": "Clear animatingExit: reason=clearAnimatingFlags win=%s", "level": "DEBUG", @@ -955,6 +997,12 @@ "group": "WM_DEBUG_RECENTS_ANIMATIONS", "at": "com\/android\/server\/wm\/RecentsAnimationController.java" }, + "-1204565480": { + "message": "Adding display switch to existing collecting transition", + "level": "DEBUG", + "group": "WM_DEBUG_WINDOW_TRANSITIONS", + "at": "com\/android\/server\/wm\/PhysicalDisplaySwitchTransitionLauncher.java" + }, "-1198579104": { "message": "Pushing next activity %s out to target's task %s", "level": "VERBOSE", @@ -979,12 +1027,6 @@ "group": "WM_DEBUG_WINDOW_INSETS", "at": "com\/android\/server\/wm\/InsetsSourceProvider.java" }, - "-1176488860": { - "message": "SURFACE isSecure=%b: %s", - "level": "INFO", - "group": "WM_SHOW_TRANSACTIONS", - "at": "com\/android\/server\/wm\/WindowSurfaceController.java" - }, "-1164930508": { "message": "Moving to RESUMED: %s (starting new instance) callers=%s", "level": "VERBOSE", @@ -1117,12 +1159,6 @@ "group": "WM_SHOW_TRANSACTIONS", "at": "com\/android\/server\/wm\/WindowSurfaceController.java" }, - "-1076978367": { - "message": "thawRotation: mRotation=%d", - "level": "VERBOSE", - "group": "WM_DEBUG_ORIENTATION", - "at": "com\/android\/server\/wm\/WindowManagerService.java" - }, "-1075136930": { "message": "startLockTaskMode: Can't lock due to auth", "level": "WARN", @@ -1171,6 +1207,12 @@ "group": "WM_DEBUG_BACK_PREVIEW", "at": "com\/android\/server\/wm\/BackNavigationController.java" }, + "-1028213464": { + "message": "%s skipping animation and directly setting alpha=%f, blur=%d", + "level": "DEBUG", + "group": "WM_DEBUG_DIMMER", + "at": "com\/android\/server\/wm\/DimmerAnimationHelper.java" + }, "-1022146708": { "message": "Skipping %s: mismatch activity type", "level": "DEBUG", @@ -1207,12 +1249,6 @@ "group": "WM_DEBUG_STATES", "at": "com\/android\/server\/wm\/ActivityRecord.java" }, - "-997565097": { - "message": "Focused window found using getFocusedWindowToken", - "level": "DEBUG", - "group": "WM_DEBUG_BACK_PREVIEW", - "at": "com\/android\/server\/wm\/BackNavigationController.java" - }, "-993378225": { "message": "finishDrawingLocked: mDrawState=COMMIT_DRAW_PENDING %s in %s", "level": "VERBOSE", @@ -1225,6 +1261,18 @@ "group": "WM_DEBUG_STARTING_WINDOW", "at": "com\/android\/server\/wm\/WindowState.java" }, + "-962760979": { + "message": "thawRotation: mRotation=%d, caller=%s", + "level": "VERBOSE", + "group": "WM_DEBUG_ORIENTATION", + "at": "com\/android\/server\/wm\/WindowManagerService.java" + }, + "-961053385": { + "message": "attachWindowContextToDisplayArea: calling from non-existing process pid=%d uid=%d", + "level": "WARN", + "group": "WM_ERROR", + "at": "com\/android\/server\/wm\/WindowManagerService.java" + }, "-957060823": { "message": "Moving to PAUSING: %s", "level": "VERBOSE", @@ -1309,6 +1357,12 @@ "group": "WM_DEBUG_WINDOW_TRANSITIONS", "at": "com\/android\/server\/wm\/Transition.java" }, + "-888703350": { + "message": "Skipping %s", + "level": "VERBOSE", + "group": "WM_DEBUG_TPL", + "at": "com\/android\/server\/wm\/TrustedPresentationListenerController.java" + }, "-883738232": { "message": "Adding more than one toast window for UID at a time.", "level": "WARN", @@ -1885,6 +1939,12 @@ "group": "WM_DEBUG_FOCUS_LIGHT", "at": "com\/android\/server\/wm\/DisplayContent.java" }, + "-415346336": { + "message": "DeferredDisplayUpdater: partially applying DisplayInfo immediately", + "level": "DEBUG", + "group": "WM_DEBUG_WINDOW_TRANSITIONS", + "at": "com\/android\/server\/wm\/DeferredDisplayUpdater.java" + }, "-401282500": { "message": "destroyIfPossible: r=%s destroy returned removed=%s", "level": "DEBUG", @@ -1933,6 +1993,12 @@ "group": "WM_DEBUG_APP_TRANSITIONS", "at": "com\/android\/server\/wm\/AppTransitionController.java" }, + "-376950429": { + "message": "DeferredDisplayUpdater: deferring DisplayInfo update", + "level": "DEBUG", + "group": "WM_DEBUG_WINDOW_TRANSITIONS", + "at": "com\/android\/server\/wm\/DeferredDisplayUpdater.java" + }, "-374767836": { "message": "setAppVisibility(%s, visible=%b): %s visible=%b mVisibleRequested=%b Callers=%s", "level": "VERBOSE", @@ -2209,6 +2275,12 @@ "group": "WM_DEBUG_RECENTS_ANIMATIONS", "at": "com\/android\/server\/wm\/RecentsAnimation.java" }, + "-98422345": { + "message": "Focus window is closing.", + "level": "DEBUG", + "group": "WM_DEBUG_BACK_PREVIEW", + "at": "com\/android\/server\/wm\/BackNavigationController.java" + }, "-91393839": { "message": "Set animatingExit: reason=remove\/applyAnimation win=%s", "level": "VERBOSE", @@ -2347,6 +2419,12 @@ "group": "WM_DEBUG_RECENTS_ANIMATIONS", "at": "com\/android\/server\/wm\/RecentsAnimationController.java" }, + "33989965": { + "message": " Met condition %s for #%d (%d left)", + "level": "VERBOSE", + "group": "WM_DEBUG_WINDOW_TRANSITIONS", + "at": "com\/android\/server\/wm\/Transition.java" + }, "34106798": { "message": "Content Recording: Display %d state was (%d), is now (%d), so update recording?", "level": "VERBOSE", @@ -2389,6 +2467,12 @@ "group": "WM_DEBUG_TASKS", "at": "com\/android\/server\/wm\/RootWindowContainer.java" }, + "61363198": { + "message": "Auto-PIP allowed, requesting PIP mode via requestStartTransition(): %s, willAutoPip: %b", + "level": "DEBUG", + "group": "WM_DEBUG_STATES", + "at": "com\/android\/server\/wm\/TaskFragment.java" + }, "74885950": { "message": "Waiting for top state to be released by %s", "level": "VERBOSE", @@ -2401,12 +2485,6 @@ "group": "WM_DEBUG_RECENTS_ANIMATIONS", "at": "com\/android\/server\/wm\/RecentsAnimationController.java" }, - "90764070": { - "message": "Could not report token removal to the window token client.", - "level": "WARN", - "group": "WM_ERROR", - "at": "com\/android\/server\/wm\/WindowContextListenerController.java" - }, "95216706": { "message": "hideIme target: %s ", "level": "DEBUG", @@ -2623,6 +2701,12 @@ "group": "WM_DEBUG_WINDOW_TRANSITIONS", "at": "com\/android\/server\/wm\/TransitionController.java" }, + "261227010": { + "message": "Content Recording: Unable to tell log windowing mode change: %s", + "level": "ERROR", + "group": "WM_DEBUG_CONTENT_RECORDING", + "at": "com\/android\/server\/wm\/ContentRecorder.java" + }, "269576220": { "message": "Resuming rotation after drag", "level": "DEBUG", @@ -2695,12 +2779,6 @@ "group": "WM_DEBUG_STATES", "at": "com\/android\/server\/wm\/ActivityRecord.java" }, - "309039362": { - "message": "SURFACE MATRIX [%f,%f,%f,%f]: %s", - "level": "INFO", - "group": "WM_SHOW_TRANSACTIONS", - "at": "com\/android\/server\/wm\/WindowSurfaceController.java" - }, "312030608": { "message": "New topFocusedDisplayId=%d", "level": "DEBUG", @@ -2767,6 +2845,18 @@ "group": "WM_DEBUG_ORIENTATION", "at": "com\/android\/server\/wm\/WindowManagerService.java" }, + "360319850": { + "message": "fractionRendered scale=%f", + "level": "VERBOSE", + "group": "WM_DEBUG_TPL", + "at": "com\/android\/server\/wm\/TrustedPresentationListenerController.java" + }, + "364992694": { + "message": "freezeDisplayRotation: current rotation=%d, new rotation=%d, caller=%s", + "level": "VERBOSE", + "group": "WM_DEBUG_ORIENTATION", + "at": "com\/android\/server\/wm\/WindowManagerService.java" + }, "371173718": { "message": "finishSync cancel=%b for %s", "level": "VERBOSE", @@ -2863,6 +2953,12 @@ "group": "WM_DEBUG_RESIZE", "at": "com\/android\/server\/wm\/WindowState.java" }, + "419378610": { + "message": "Content Recording: Apply transformations of shift %d x %d, scale %f x %f, crop (aka recorded content size) %d x %d for display %d; display has size %d x %d; surface has size %d x %d", + "level": "VERBOSE", + "group": "WM_DEBUG_CONTENT_RECORDING", + "at": "com\/android\/server\/wm\/ContentRecorder.java" + }, "422634333": { "message": "First draw done in potential wallpaper target %s", "level": "VERBOSE", @@ -2935,6 +3031,12 @@ "group": "WM_DEBUG_BACK_PREVIEW", "at": "com\/android\/server\/wm\/BackNavigationController.java" }, + "532771960": { + "message": "Adding untrusted state listener=%s with id=%d", + "level": "DEBUG", + "group": "WM_DEBUG_TPL", + "at": "com\/android\/server\/wm\/TrustedPresentationListenerController.java" + }, "535103992": { "message": "Wallpaper may change! Adjusting", "level": "VERBOSE", @@ -3013,6 +3115,12 @@ "group": "WM_DEBUG_DREAM", "at": "com\/android\/server\/wm\/ActivityTaskManagerService.java" }, + "605179032": { + "message": "checkIfInThreshold fractionRendered=%f alpha=%f currTimeMs=%d", + "level": "VERBOSE", + "group": "WM_DEBUG_TPL", + "at": "com\/android\/server\/wm\/TrustedPresentationListenerController.java" + }, "608694300": { "message": " NEW SURFACE SESSION %s", "level": "INFO", @@ -3043,12 +3151,6 @@ "group": "WM_ERROR", "at": "com\/android\/server\/wm\/WindowManagerService.java" }, - "633654009": { - "message": "SURFACE POS (setPositionInTransaction) @ (%f,%f): %s", - "level": "INFO", - "group": "WM_SHOW_TRANSACTIONS", - "at": "com\/android\/server\/wm\/WindowSurfaceController.java" - }, "638429464": { "message": "\tRemove container=%s", "level": "DEBUG", @@ -3241,6 +3343,18 @@ "group": "WM_DEBUG_ORIENTATION", "at": "com\/android\/server\/wm\/ActivityRecord.java" }, + "810599500": { + "message": "SURFACE isSecure=%b: %s", + "level": "INFO", + "group": "WM_SHOW_TRANSACTIONS", + "at": "com\/android\/server\/wm\/WindowState.java" + }, + "824532141": { + "message": "lastState=%s newState=%s alpha=%f minAlpha=%f fractionRendered=%f minFractionRendered=%f", + "level": "VERBOSE", + "group": "WM_DEBUG_TPL", + "at": "com\/android\/server\/wm\/TrustedPresentationListenerController.java" + }, "829434921": { "message": "Draw state now committed in %s", "level": "VERBOSE", @@ -3535,6 +3649,12 @@ "group": "WM_SHOW_SURFACE_ALLOC", "at": "com\/android\/server\/wm\/ScreenRotationAnimation.java" }, + "1090378847": { + "message": "Checking %d windows", + "level": "VERBOSE", + "group": "WM_DEBUG_TPL", + "at": "com\/android\/server\/wm\/TrustedPresentationListenerController.java" + }, "1100065297": { "message": "Attempted to get IME policy of a display that does not exist: %d", "level": "WARN", @@ -3667,6 +3787,12 @@ "group": "WM_DEBUG_FOCUS", "at": "com\/android\/server\/wm\/ActivityRecord.java" }, + "1251721200": { + "message": "unregister failed, couldn't find deathRecipient for %s with id=%d", + "level": "ERROR", + "group": "WM_DEBUG_TPL", + "at": "com\/android\/server\/wm\/TrustedPresentationListenerController.java" + }, "1252594551": { "message": "Window types in WindowContext and LayoutParams.type should match! Type from LayoutParams is %d, but type from WindowContext is %d", "level": "WARN", @@ -3721,6 +3847,12 @@ "group": "WM_DEBUG_CONFIGURATION", "at": "com\/android\/server\/wm\/ActivityClientController.java" }, + "1309365288": { + "message": "Removing dim surface %s on transaction %s", + "level": "DEBUG", + "group": "WM_DEBUG_DIMMER", + "at": "com\/android\/server\/wm\/SmoothDimmer.java" + }, "1316533291": { "message": "State movement: %s from:%s to:%s reason:%s", "level": "VERBOSE", @@ -3799,6 +3931,12 @@ "group": "WM_DEBUG_ORIENTATION", "at": "com\/android\/server\/wm\/TaskDisplayArea.java" }, + "1382634842": { + "message": "Unregistering listener=%s with id=%d", + "level": "DEBUG", + "group": "WM_DEBUG_TPL", + "at": "com\/android\/server\/wm\/TrustedPresentationListenerController.java" + }, "1393721079": { "message": "Starting remote display change: from [rot = %d], to [%dx%d, rot = %d]", "level": "VERBOSE", @@ -3847,6 +3985,12 @@ "group": "WM_ERROR", "at": "com\/android\/server\/wm\/WindowManagerService.java" }, + "1445704347": { + "message": "coveredRegionsAbove updated with %s frame:%s region:%s", + "level": "VERBOSE", + "group": "WM_DEBUG_TPL", + "at": "com\/android\/server\/wm\/TrustedPresentationListenerController.java" + }, "1448683958": { "message": "Override pending remote transitionSet=%b adapter=%s", "level": "INFO", @@ -3961,12 +4105,6 @@ "group": "WM_ERROR", "at": "com\/android\/server\/wm\/WindowManagerService.java" }, - "1563836923": { - "message": "Content Recording: Unable to record task since feature is disabled %d", - "level": "VERBOSE", - "group": "WM_DEBUG_CONTENT_RECORDING", - "at": "com\/android\/server\/wm\/ContentRecorder.java" - }, "1577579529": { "message": "win=%s destroySurfaces: appStopped=%b win.mWindowRemovalAllowed=%b win.mRemoveOnExit=%b", "level": "ERROR", @@ -4153,6 +4291,12 @@ "group": "WM_DEBUG_RECENTS_ANIMATIONS", "at": "com\/android\/server\/wm\/RecentsAnimation.java" }, + "1786463281": { + "message": "Adding trusted state listener=%s with id=%d", + "level": "DEBUG", + "group": "WM_DEBUG_TPL", + "at": "com\/android\/server\/wm\/TrustedPresentationListenerController.java" + }, "1789321832": { "message": "Then token:%s is invalid. It might be removed", "level": "WARN", @@ -4273,6 +4417,12 @@ "group": "WM_DEBUG_ORIENTATION", "at": "com\/android\/server\/wm\/DisplayContent.java" }, + "1879463933": { + "message": "attachWindowContextToWindowToken: calling from non-existing process pid=%d uid=%d", + "level": "WARN", + "group": "WM_ERROR", + "at": "com\/android\/server\/wm\/WindowManagerService.java" + }, "1891501279": { "message": "cancelAnimation(): reason=%s", "level": "DEBUG", @@ -4303,12 +4453,6 @@ "group": "WM_DEBUG_REMOTE_ANIMATIONS", "at": "com\/android\/server\/wm\/RemoteAnimationController.java" }, - "1936800105": { - "message": "Content Recording: Apply transformations of shift %d x %d, scale %f, crop (aka recorded content size) %d x %d for display %d; display has size %d x %d; surface has size %d x %d", - "level": "VERBOSE", - "group": "WM_DEBUG_CONTENT_RECORDING", - "at": "com\/android\/server\/wm\/ContentRecorder.java" - }, "1945495497": { "message": "Focused window didn't have a valid surface drawn.", "level": "DEBUG", @@ -4327,11 +4471,11 @@ "group": "WM_DEBUG_TASKS", "at": "com\/android\/server\/wm\/RootWindowContainer.java" }, - "1948483534": { - "message": "Could not report config changes to the window token client.", - "level": "WARN", - "group": "WM_ERROR", - "at": "com\/android\/server\/wm\/WindowContextListenerController.java" + "1955470028": { + "message": "computeFractionRendered: visibleRegion=%s screenBounds=%s contentSize=%s scale=%f,%f", + "level": "VERBOSE", + "group": "WM_DEBUG_TPL", + "at": "com\/android\/server\/wm\/TrustedPresentationListenerController.java" }, "1964565370": { "message": "Starting remote animation", @@ -4453,6 +4597,12 @@ "group": "WM_DEBUG_APP_TRANSITIONS", "at": "com\/android\/server\/wm\/AppTransitionController.java" }, + "2053743391": { + "message": " Add condition %s for #%d", + "level": "VERBOSE", + "group": "WM_DEBUG_WINDOW_TRANSITIONS", + "at": "com\/android\/server\/wm\/Transition.java" + }, "2060978050": { "message": "moveWindowTokenToDisplay: Attempted to move token: %s to non-exiting displayId=%d", "level": "WARN", @@ -4513,6 +4663,12 @@ "group": "WM_DEBUG_IME", "at": "com\/android\/server\/wm\/DisplayContent.java" }, + "2124732293": { + "message": "#%d: Met condition: %s", + "level": "VERBOSE", + "group": "WM_DEBUG_WINDOW_TRANSITIONS", + "at": "com\/android\/server\/wm\/Transition.java" + }, "2128917433": { "message": "onProposedRotationChanged, rotation=%d", "level": "VERBOSE", @@ -4548,6 +4704,9 @@ "WM_DEBUG_CONTENT_RECORDING": { "tag": "WindowManager" }, + "WM_DEBUG_DIMMER": { + "tag": "WindowManager" + }, "WM_DEBUG_DRAW": { "tag": "WindowManager" }, @@ -4602,6 +4761,9 @@ "WM_DEBUG_TASKS": { "tag": "WindowManager" }, + "WM_DEBUG_TPL": { + "tag": "WindowManager" + }, "WM_DEBUG_WALLPAPER": { "tag": "WindowManager" }, diff --git a/data/fonts/font_fallback.xml b/data/fonts/font_fallback.xml index 12417362ddba..02e032b86443 100644 --- a/data/fonts/font_fallback.xml +++ b/data/fonts/font_fallback.xml @@ -15,92 +15,9 @@ --> <familyset version="23"> <!-- first font is default --> - <family name="sans-serif"> - <font weight="100" style="normal">Roboto-Regular.ttf - <axis tag="ital" stylevalue="0" /> + <family name="sans-serif" varFamilyType="2"> + <font>Roboto-Regular.ttf <axis tag="wdth" stylevalue="100" /> - <axis tag="wght" stylevalue="100" /> - </font> - <font weight="200" style="normal">Roboto-Regular.ttf - <axis tag="ital" stylevalue="0" /> - <axis tag="wdth" stylevalue="100" /> - <axis tag="wght" stylevalue="200" /> - </font> - <font weight="300" style="normal">Roboto-Regular.ttf - <axis tag="ital" stylevalue="0" /> - <axis tag="wdth" stylevalue="100" /> - <axis tag="wght" stylevalue="300" /> - </font> - <font weight="400" style="normal">RobotoStatic-Regular.ttf</font> - <font weight="500" style="normal">Roboto-Regular.ttf - <axis tag="ital" stylevalue="0" /> - <axis tag="wdth" stylevalue="100" /> - <axis tag="wght" stylevalue="500" /> - </font> - <font weight="600" style="normal">Roboto-Regular.ttf - <axis tag="ital" stylevalue="0" /> - <axis tag="wdth" stylevalue="100" /> - <axis tag="wght" stylevalue="600" /> - </font> - <font weight="700" style="normal">Roboto-Regular.ttf - <axis tag="ital" stylevalue="0" /> - <axis tag="wdth" stylevalue="100" /> - <axis tag="wght" stylevalue="700" /> - </font> - <font weight="800" style="normal">Roboto-Regular.ttf - <axis tag="ital" stylevalue="0" /> - <axis tag="wdth" stylevalue="100" /> - <axis tag="wght" stylevalue="800" /> - </font> - <font weight="900" style="normal">Roboto-Regular.ttf - <axis tag="ital" stylevalue="0" /> - <axis tag="wdth" stylevalue="100" /> - <axis tag="wght" stylevalue="900" /> - </font> - <font weight="100" style="italic">Roboto-Regular.ttf - <axis tag="ital" stylevalue="1" /> - <axis tag="wdth" stylevalue="100" /> - <axis tag="wght" stylevalue="100" /> - </font> - <font weight="200" style="italic">Roboto-Regular.ttf - <axis tag="ital" stylevalue="1" /> - <axis tag="wdth" stylevalue="100" /> - <axis tag="wght" stylevalue="200" /> - </font> - <font weight="300" style="italic">Roboto-Regular.ttf - <axis tag="ital" stylevalue="1" /> - <axis tag="wdth" stylevalue="100" /> - <axis tag="wght" stylevalue="300" /> - </font> - <font weight="400" style="italic">Roboto-Regular.ttf - <axis tag="ital" stylevalue="1" /> - <axis tag="wdth" stylevalue="100" /> - <axis tag="wght" stylevalue="400" /> - </font> - <font weight="500" style="italic">Roboto-Regular.ttf - <axis tag="ital" stylevalue="1" /> - <axis tag="wdth" stylevalue="100" /> - <axis tag="wght" stylevalue="500" /> - </font> - <font weight="600" style="italic">Roboto-Regular.ttf - <axis tag="ital" stylevalue="1" /> - <axis tag="wdth" stylevalue="100" /> - <axis tag="wght" stylevalue="600" /> - </font> - <font weight="700" style="italic">Roboto-Regular.ttf - <axis tag="ital" stylevalue="1" /> - <axis tag="wdth" stylevalue="100" /> - <axis tag="wght" stylevalue="700" /> - </font> - <font weight="800" style="italic">Roboto-Regular.ttf - <axis tag="ital" stylevalue="1" /> - <axis tag="wdth" stylevalue="100" /> - <axis tag="wght" stylevalue="800" /> - </font> - <font weight="900" style="italic">Roboto-Regular.ttf - <axis tag="ital" stylevalue="1" /> - <axis tag="wdth" stylevalue="100" /> - <axis tag="wght" stylevalue="900" /> </font> </family> @@ -115,96 +32,9 @@ <alias name="tahoma" to="sans-serif" /> <alias name="verdana" to="sans-serif" /> - <family name="sans-serif-condensed"> - <font weight="100" style="normal">Roboto-Regular.ttf - <axis tag="ital" stylevalue="0" /> - <axis tag="wdth" stylevalue="75" /> - <axis tag="wght" stylevalue="100" /> - </font> - <font weight="200" style="normal">Roboto-Regular.ttf - <axis tag="ital" stylevalue="0" /> - <axis tag="wdth" stylevalue="75" /> - <axis tag="wght" stylevalue="200" /> - </font> - <font weight="300" style="normal">Roboto-Regular.ttf - <axis tag="ital" stylevalue="0" /> - <axis tag="wdth" stylevalue="75" /> - <axis tag="wght" stylevalue="300" /> - </font> - <font weight="400" style="normal">Roboto-Regular.ttf - <axis tag="ital" stylevalue="0" /> - <axis tag="wdth" stylevalue="75" /> - <axis tag="wght" stylevalue="400" /> - </font> - <font weight="500" style="normal">Roboto-Regular.ttf - <axis tag="ital" stylevalue="0" /> - <axis tag="wdth" stylevalue="75" /> - <axis tag="wght" stylevalue="500" /> - </font> - <font weight="600" style="normal">Roboto-Regular.ttf - <axis tag="ital" stylevalue="0" /> - <axis tag="wdth" stylevalue="75" /> - <axis tag="wght" stylevalue="600" /> - </font> - <font weight="700" style="normal">Roboto-Regular.ttf - <axis tag="ital" stylevalue="0" /> - <axis tag="wdth" stylevalue="75" /> - <axis tag="wght" stylevalue="700" /> - </font> - <font weight="800" style="normal">Roboto-Regular.ttf - <axis tag="ital" stylevalue="0" /> + <family name="sans-serif-condensed" varFamilyType="2"> + <font>Roboto-Regular.ttf <axis tag="wdth" stylevalue="75" /> - <axis tag="wght" stylevalue="800" /> - </font> - <font weight="900" style="normal">Roboto-Regular.ttf - <axis tag="ital" stylevalue="0" /> - <axis tag="wdth" stylevalue="75" /> - <axis tag="wght" stylevalue="900" /> - </font> - <font weight="100" style="italic">Roboto-Regular.ttf - <axis tag="ital" stylevalue="1" /> - <axis tag="wdth" stylevalue="75" /> - <axis tag="wght" stylevalue="100" /> - </font> - <font weight="200" style="italic">Roboto-Regular.ttf - <axis tag="ital" stylevalue="1" /> - <axis tag="wdth" stylevalue="75" /> - <axis tag="wght" stylevalue="200" /> - </font> - <font weight="300" style="italic">Roboto-Regular.ttf - <axis tag="ital" stylevalue="1" /> - <axis tag="wdth" stylevalue="75" /> - <axis tag="wght" stylevalue="300" /> - </font> - <font weight="400" style="italic">Roboto-Regular.ttf - <axis tag="ital" stylevalue="1" /> - <axis tag="wdth" stylevalue="75" /> - <axis tag="wght" stylevalue="400" /> - </font> - <font weight="500" style="italic">Roboto-Regular.ttf - <axis tag="ital" stylevalue="1" /> - <axis tag="wdth" stylevalue="75" /> - <axis tag="wght" stylevalue="500" /> - </font> - <font weight="600" style="italic">Roboto-Regular.ttf - <axis tag="ital" stylevalue="1" /> - <axis tag="wdth" stylevalue="75" /> - <axis tag="wght" stylevalue="600" /> - </font> - <font weight="700" style="italic">Roboto-Regular.ttf - <axis tag="ital" stylevalue="1" /> - <axis tag="wdth" stylevalue="75" /> - <axis tag="wght" stylevalue="700" /> - </font> - <font weight="800" style="italic">Roboto-Regular.ttf - <axis tag="ital" stylevalue="1" /> - <axis tag="wdth" stylevalue="75" /> - <axis tag="wght" stylevalue="800" /> - </font> - <font weight="900" style="italic">Roboto-Regular.ttf - <axis tag="ital" stylevalue="1" /> - <axis tag="wdth" stylevalue="75" /> - <axis tag="wght" stylevalue="900" /> </font> </family> <alias name="sans-serif-condensed-light" to="sans-serif-condensed" weight="300" /> @@ -242,13 +72,8 @@ <font weight="400" style="normal" postScriptName="ComingSoon-Regular">ComingSoon.ttf</font> </family> - <family name="cursive"> - <font weight="400" style="normal">DancingScript-Regular.ttf - <axis tag="wght" stylevalue="400" /> - </font> - <font weight="700" style="normal">DancingScript-Regular.ttf - <axis tag="wght" stylevalue="700" /> - </font> + <family name="cursive" varFamilyType="1"> + <font>DancingScript-Regular.ttf</font> </family> <family name="sans-serif-smallcaps"> @@ -265,96 +90,9 @@ </family> <alias name="source-sans-pro-semi-bold" to="source-sans-pro" weight="600"/> - <family name="roboto-flex"> - <font weight="100" style="normal">RobotoFlex-Regular.ttf - <axis tag="slnt" stylevalue="0" /> - <axis tag="wdth" stylevalue="100" /> - <axis tag="wght" stylevalue="100" /> - </font> - <font weight="200" style="normal">RobotoFlex-Regular.ttf - <axis tag="slnt" stylevalue="0" /> - <axis tag="wdth" stylevalue="100" /> - <axis tag="wght" stylevalue="200" /> - </font> - <font weight="300" style="normal">RobotoFlex-Regular.ttf - <axis tag="slnt" stylevalue="0" /> - <axis tag="wdth" stylevalue="100" /> - <axis tag="wght" stylevalue="300" /> - </font> - <font weight="400" style="normal">RobotoFlex-Regular.ttf - <axis tag="slnt" stylevalue="0" /> - <axis tag="wdth" stylevalue="100" /> - <axis tag="wght" stylevalue="400" /> - </font> - <font weight="500" style="normal">RobotoFlex-Regular.ttf - <axis tag="slnt" stylevalue="0" /> - <axis tag="wdth" stylevalue="100" /> - <axis tag="wght" stylevalue="500" /> - </font> - <font weight="600" style="normal">RobotoFlex-Regular.ttf - <axis tag="slnt" stylevalue="0" /> - <axis tag="wdth" stylevalue="100" /> - <axis tag="wght" stylevalue="600" /> - </font> - <font weight="700" style="normal">RobotoFlex-Regular.ttf - <axis tag="slnt" stylevalue="0" /> - <axis tag="wdth" stylevalue="100" /> - <axis tag="wght" stylevalue="700" /> - </font> - <font weight="800" style="normal">RobotoFlex-Regular.ttf - <axis tag="slnt" stylevalue="0" /> - <axis tag="wdth" stylevalue="100" /> - <axis tag="wght" stylevalue="800" /> - </font> - <font weight="900" style="normal">RobotoFlex-Regular.ttf - <axis tag="slnt" stylevalue="0" /> - <axis tag="wdth" stylevalue="100" /> - <axis tag="wght" stylevalue="900" /> - </font> - <font weight="100" style="italic">RobotoFlex-Regular.ttf - <axis tag="slnt" stylevalue="-10" /> - <axis tag="wdth" stylevalue="100" /> - <axis tag="wght" stylevalue="100" /> - </font> - <font weight="200" style="italic">RobotoFlex-Regular.ttf - <axis tag="slnt" stylevalue="-10" /> - <axis tag="wdth" stylevalue="100" /> - <axis tag="wght" stylevalue="200" /> - </font> - <font weight="300" style="italic">RobotoFlex-Regular.ttf - <axis tag="slnt" stylevalue="-10" /> - <axis tag="wdth" stylevalue="100" /> - <axis tag="wght" stylevalue="300" /> - </font> - <font weight="400" style="italic">RobotoFlex-Regular.ttf - <axis tag="slnt" stylevalue="-10" /> - <axis tag="wdth" stylevalue="100" /> - <axis tag="wght" stylevalue="400" /> - </font> - <font weight="500" style="italic">RobotoFlex-Regular.ttf - <axis tag="slnt" stylevalue="-10" /> - <axis tag="wdth" stylevalue="100" /> - <axis tag="wght" stylevalue="500" /> - </font> - <font weight="600" style="italic">RobotoFlex-Regular.ttf - <axis tag="slnt" stylevalue="-10" /> - <axis tag="wdth" stylevalue="100" /> - <axis tag="wght" stylevalue="600" /> - </font> - <font weight="700" style="italic">RobotoFlex-Regular.ttf - <axis tag="slnt" stylevalue="-10" /> + <family name="roboto-flex" varFamilyType="2"> + <font>RobotoFlex-Regular.ttf <axis tag="wdth" stylevalue="100" /> - <axis tag="wght" stylevalue="700" /> - </font> - <font weight="800" style="italic">RobotoFlex-Regular.ttf - <axis tag="slnt" stylevalue="-10" /> - <axis tag="wdth" stylevalue="100" /> - <axis tag="wght" stylevalue="800" /> - </font> - <font weight="900" style="italic">RobotoFlex-Regular.ttf - <axis tag="slnt" stylevalue="-10" /> - <axis tag="wdth" stylevalue="100" /> - <axis tag="wght" stylevalue="900" /> </font> </family> @@ -371,38 +109,12 @@ </font> <font weight="700" style="normal">NotoNaskhArabicUI-Bold.ttf</font> </family> - <family lang="und-Ethi"> - <font weight="400" style="normal" postScriptName="NotoSansEthiopic-Regular"> - NotoSansEthiopic-VF.ttf - <axis tag="wght" stylevalue="400"/> - </font> - <font weight="500" style="normal" postScriptName="NotoSansEthiopic-Regular"> - NotoSansEthiopic-VF.ttf - <axis tag="wght" stylevalue="500"/> - </font> - <font weight="600" style="normal" postScriptName="NotoSansEthiopic-Regular"> - NotoSansEthiopic-VF.ttf - <axis tag="wght" stylevalue="600"/> - </font> - <font weight="700" style="normal" postScriptName="NotoSansEthiopic-Regular"> + <family lang="und-Ethi" varFamilyType="1"> + <font postScriptName="NotoSansEthiopic-Regular"> NotoSansEthiopic-VF.ttf - <axis tag="wght" stylevalue="700"/> - </font> - <font weight="400" style="normal" fallbackFor="serif" - postScriptName="NotoSerifEthiopic-Regular">NotoSerifEthiopic-VF.ttf - <axis tag="wght" stylevalue="400"/> - </font> - <font weight="500" style="normal" fallbackFor="serif" - postScriptName="NotoSerifEthiopic-Regular">NotoSerifEthiopic-VF.ttf - <axis tag="wght" stylevalue="500"/> - </font> - <font weight="600" style="normal" fallbackFor="serif" - postScriptName="NotoSerifEthiopic-Regular">NotoSerifEthiopic-VF.ttf - <axis tag="wght" stylevalue="600"/> </font> - <font weight="700" style="normal" fallbackFor="serif" - postScriptName="NotoSerifEthiopic-Regular">NotoSerifEthiopic-VF.ttf - <axis tag="wght" stylevalue="700"/> + <font fallbackFor="serif" postScriptName="NotoSerifEthiopic-Regular"> + NotoSerifEthiopic-VF.ttf </font> </family> <family lang="und-Hebr"> @@ -428,124 +140,33 @@ </font> <font weight="700" style="normal">NotoSansThaiUI-Bold.ttf</font> </family> - <family lang="und-Armn"> - <font weight="400" style="normal" postScriptName="NotoSansArmenian-Regular"> - NotoSansArmenian-VF.ttf - <axis tag="wght" stylevalue="400"/> - </font> - <font weight="500" style="normal" postScriptName="NotoSansArmenian-Regular"> - NotoSansArmenian-VF.ttf - <axis tag="wght" stylevalue="500"/> - </font> - <font weight="600" style="normal" postScriptName="NotoSansArmenian-Regular"> + <family lang="und-Armn" varFamilyType="1"> + <font postScriptName="NotoSansArmenian-Regular"> NotoSansArmenian-VF.ttf - <axis tag="wght" stylevalue="600"/> - </font> - <font weight="700" style="normal" postScriptName="NotoSansArmenian-Regular"> - NotoSansArmenian-VF.ttf - <axis tag="wght" stylevalue="700"/> </font> - <font weight="400" style="normal" fallbackFor="serif" - postScriptName="NotoSerifArmenian-Regular">NotoSerifArmenian-VF.ttf - <axis tag="wght" stylevalue="400"/> - </font> - <font weight="500" style="normal" fallbackFor="serif" - postScriptName="NotoSerifArmenian-Regular">NotoSerifArmenian-VF.ttf - <axis tag="wght" stylevalue="500"/> - </font> - <font weight="600" style="normal" fallbackFor="serif" - postScriptName="NotoSerifArmenian-Regular">NotoSerifArmenian-VF.ttf - <axis tag="wght" stylevalue="600"/> - </font> - <font weight="700" style="normal" fallbackFor="serif" - postScriptName="NotoSerifArmenian-Regular">NotoSerifArmenian-VF.ttf - <axis tag="wght" stylevalue="700"/> + <font fallbackFor="serif" postScriptName="NotoSerifArmenian-Regular"> + NotoSerifArmenian-VF.ttf </font> </family> - <family lang="und-Geor,und-Geok"> - <font weight="400" style="normal" postScriptName="NotoSansGeorgian-Regular"> + <family lang="und-Geor,und-Geok" varFamilyType="1"> + <font postScriptName="NotoSansGeorgian-Regular"> NotoSansGeorgian-VF.ttf - <axis tag="wght" stylevalue="400"/> </font> - <font weight="500" style="normal" postScriptName="NotoSansGeorgian-Regular"> - NotoSansGeorgian-VF.ttf - <axis tag="wght" stylevalue="500"/> - </font> - <font weight="600" style="normal" postScriptName="NotoSansGeorgian-Regular"> - NotoSansGeorgian-VF.ttf - <axis tag="wght" stylevalue="600"/> - </font> - <font weight="700" style="normal" postScriptName="NotoSansGeorgian-Regular"> - NotoSansGeorgian-VF.ttf - <axis tag="wght" stylevalue="700"/> - </font> - <font weight="400" style="normal" fallbackFor="serif" - postScriptName="NotoSerifGeorgian-Regular">NotoSerifGeorgian-VF.ttf - <axis tag="wght" stylevalue="400"/> - </font> - <font weight="500" style="normal" fallbackFor="serif" - postScriptName="NotoSerifGeorgian-Regular">NotoSerifGeorgian-VF.ttf - <axis tag="wght" stylevalue="500"/> - </font> - <font weight="600" style="normal" fallbackFor="serif" - postScriptName="NotoSerifGeorgian-Regular">NotoSerifGeorgian-VF.ttf - <axis tag="wght" stylevalue="600"/> - </font> - <font weight="700" style="normal" fallbackFor="serif" - postScriptName="NotoSerifGeorgian-Regular">NotoSerifGeorgian-VF.ttf - <axis tag="wght" stylevalue="700"/> + <font fallbackFor="serif" postScriptName="NotoSerifGeorgian-Regular"> + NotoSerifGeorgian-VF.ttf </font> </family> - <family lang="und-Deva" variant="elegant"> - <font weight="400" style="normal" postScriptName="NotoSansDevanagari-Regular"> - NotoSansDevanagari-VF.ttf - <axis tag="wght" stylevalue="400"/> - </font> - <font weight="500" style="normal" postScriptName="NotoSansDevanagari-Regular"> - NotoSansDevanagari-VF.ttf - <axis tag="wght" stylevalue="500"/> - </font> - <font weight="600" style="normal" postScriptName="NotoSansDevanagari-Regular"> + <family lang="und-Deva" variant="elegant" varFamilyType="1"> + <font postScriptName="NotoSansDevanagari-Regular"> NotoSansDevanagari-VF.ttf - <axis tag="wght" stylevalue="600"/> </font> - <font weight="700" style="normal" postScriptName="NotoSansDevanagari-Regular"> - NotoSansDevanagari-VF.ttf - <axis tag="wght" stylevalue="700"/> - </font> - <font weight="400" style="normal" fallbackFor="serif" - postScriptName="NotoSerifDevanagari-Regular">NotoSerifDevanagari-VF.ttf - <axis tag="wght" stylevalue="400"/> - </font> - <font weight="500" style="normal" fallbackFor="serif" - postScriptName="NotoSerifDevanagari-Regular">NotoSerifDevanagari-VF.ttf - <axis tag="wght" stylevalue="500"/> - </font> - <font weight="600" style="normal" fallbackFor="serif" - postScriptName="NotoSerifDevanagari-Regular">NotoSerifDevanagari-VF.ttf - <axis tag="wght" stylevalue="600"/> - </font> - <font weight="700" style="normal" fallbackFor="serif" - postScriptName="NotoSerifDevanagari-Regular">NotoSerifDevanagari-VF.ttf - <axis tag="wght" stylevalue="700"/> + <font fallbackFor="serif" postScriptName="NotoSerifDevanagari-Regular"> + NotoSerifDevanagari-VF.ttf </font> </family> - <family lang="und-Deva" variant="compact"> - <font weight="400" style="normal" postScriptName="NotoSansDevanagariUI-Regular"> + <family lang="und-Deva" variant="compact" varFamilyType="1"> + <font postScriptName="NotoSansDevanagariUI-Regular"> NotoSansDevanagariUI-VF.ttf - <axis tag="wght" stylevalue="400"/> - </font> - <font weight="500" style="normal" postScriptName="NotoSansDevanagariUI-Regular"> - NotoSansDevanagariUI-VF.ttf - <axis tag="wght" stylevalue="500"/> - </font> - <font weight="600" style="normal" postScriptName="NotoSansDevanagariUI-Regular"> - NotoSansDevanagariUI-VF.ttf - <axis tag="wght" stylevalue="600"/> - </font> - <font weight="700" style="normal" postScriptName="NotoSansDevanagariUI-Regular"> - NotoSansDevanagariUI-VF.ttf - <axis tag="wght" stylevalue="700"/> </font> </family> @@ -580,316 +201,82 @@ </font> <font weight="700" style="normal">NotoSansGujaratiUI-Bold.ttf</font> </family> - <family lang="und-Guru" variant="elegant"> - <font weight="400" style="normal" postScriptName="NotoSansGurmukhi-Regular"> - NotoSansGurmukhi-VF.ttf - <axis tag="wght" stylevalue="400"/> - </font> - <font weight="500" style="normal" postScriptName="NotoSansGurmukhi-Regular"> - NotoSansGurmukhi-VF.ttf - <axis tag="wght" stylevalue="500"/> - </font> - <font weight="600" style="normal" postScriptName="NotoSansGurmukhi-Regular"> - NotoSansGurmukhi-VF.ttf - <axis tag="wght" stylevalue="600"/> - </font> - <font weight="700" style="normal" postScriptName="NotoSansGurmukhi-Regular"> + <family lang="und-Guru" variant="elegant" varFamilyType="1"> + <font postScriptName="NotoSansGurmukhi-Regular"> NotoSansGurmukhi-VF.ttf - <axis tag="wght" stylevalue="700"/> - </font> - <font weight="400" style="normal" fallbackFor="serif" - postScriptName="NotoSerifGurmukhi-Regular">NotoSerifGurmukhi-VF.ttf - <axis tag="wght" stylevalue="400"/> - </font> - <font weight="500" style="normal" fallbackFor="serif" - postScriptName="NotoSerifGurmukhi-Regular">NotoSerifGurmukhi-VF.ttf - <axis tag="wght" stylevalue="500"/> </font> - <font weight="600" style="normal" fallbackFor="serif" - postScriptName="NotoSerifGurmukhi-Regular">NotoSerifGurmukhi-VF.ttf - <axis tag="wght" stylevalue="600"/> - </font> - <font weight="700" style="normal" fallbackFor="serif" - postScriptName="NotoSerifGurmukhi-Regular">NotoSerifGurmukhi-VF.ttf - <axis tag="wght" stylevalue="700"/> + <font fallbackFor="serif" postScriptName="NotoSerifGurmukhi-Regular"> + NotoSerifGurmukhi-VF.ttf </font> </family> - <family lang="und-Guru" variant="compact"> - <font weight="400" style="normal" postScriptName="NotoSansGurmukhiUI-Regular"> - NotoSansGurmukhiUI-VF.ttf - <axis tag="wght" stylevalue="400"/> - </font> - <font weight="500" style="normal" postScriptName="NotoSansGurmukhiUI-Regular"> + <family lang="und-Guru" variant="compact" varFamilyType="1"> + <font postScriptName="NotoSansGurmukhiUI-Regular"> NotoSansGurmukhiUI-VF.ttf - <axis tag="wght" stylevalue="500"/> - </font> - <font weight="600" style="normal" postScriptName="NotoSansGurmukhiUI-Regular"> - NotoSansGurmukhiUI-VF.ttf - <axis tag="wght" stylevalue="600"/> - </font> - <font weight="700" style="normal" postScriptName="NotoSansGurmukhiUI-Regular"> - NotoSansGurmukhiUI-VF.ttf - <axis tag="wght" stylevalue="700"/> </font> </family> - <family lang="und-Taml" variant="elegant"> - <font weight="400" style="normal" postScriptName="NotoSansTamil-Regular"> + <family lang="und-Taml" variant="elegant" varFamilyType="1"> + <font postScriptName="NotoSansTamil-Regular"> NotoSansTamil-VF.ttf - <axis tag="wght" stylevalue="400"/> - </font> - <font weight="500" style="normal" postScriptName="NotoSansTamil-Regular"> - NotoSansTamil-VF.ttf - <axis tag="wght" stylevalue="500"/> </font> - <font weight="600" style="normal" postScriptName="NotoSansTamil-Regular"> - NotoSansTamil-VF.ttf - <axis tag="wght" stylevalue="600"/> - </font> - <font weight="700" style="normal" postScriptName="NotoSansTamil-Regular"> - NotoSansTamil-VF.ttf - <axis tag="wght" stylevalue="700"/> - </font> - <font weight="400" style="normal" fallbackFor="serif" - postScriptName="NotoSerifTamil-Regular">NotoSerifTamil-VF.ttf - <axis tag="wght" stylevalue="400"/> - </font> - <font weight="500" style="normal" fallbackFor="serif" - postScriptName="NotoSerifTamil-Regular">NotoSerifTamil-VF.ttf - <axis tag="wght" stylevalue="500"/> - </font> - <font weight="600" style="normal" fallbackFor="serif" - postScriptName="NotoSerifTamil-Regular">NotoSerifTamil-VF.ttf - <axis tag="wght" stylevalue="600"/> - </font> - <font weight="700" style="normal" fallbackFor="serif" - postScriptName="NotoSerifTamil-Regular">NotoSerifTamil-VF.ttf - <axis tag="wght" stylevalue="700"/> + <font fallbackFor="serif" postScriptName="NotoSerifTamil-Regular"> + NotoSerifTamil-VF.ttf </font> </family> - <family lang="und-Taml" variant="compact"> - <font weight="400" style="normal" postScriptName="NotoSansTamilUI-Regular"> - NotoSansTamilUI-VF.ttf - <axis tag="wght" stylevalue="400"/> - </font> - <font weight="500" style="normal" postScriptName="NotoSansTamilUI-Regular"> - NotoSansTamilUI-VF.ttf - <axis tag="wght" stylevalue="500"/> - </font> - <font weight="600" style="normal" postScriptName="NotoSansTamilUI-Regular"> + <family lang="und-Taml" variant="compact" varFamilyType="1"> + <font postScriptName="NotoSansTamilUI-Regular"> NotoSansTamilUI-VF.ttf - <axis tag="wght" stylevalue="600"/> - </font> - <font weight="700" style="normal" postScriptName="NotoSansTamilUI-Regular"> - NotoSansTamilUI-VF.ttf - <axis tag="wght" stylevalue="700"/> </font> </family> - <family lang="und-Mlym" variant="elegant"> - <font weight="400" style="normal" postScriptName="NotoSansMalayalam-Regular"> + <family lang="und-Mlym" variant="elegant" varFamilyType="1"> + <font postScriptName="NotoSansMalayalam-Regular"> NotoSansMalayalam-VF.ttf - <axis tag="wght" stylevalue="400"/> - </font> - <font weight="500" style="normal" postScriptName="NotoSansMalayalam-Regular"> - NotoSansMalayalam-VF.ttf - <axis tag="wght" stylevalue="500"/> </font> - <font weight="600" style="normal" postScriptName="NotoSansMalayalam-Regular"> - NotoSansMalayalam-VF.ttf - <axis tag="wght" stylevalue="600"/> - </font> - <font weight="700" style="normal" postScriptName="NotoSansMalayalam-Regular"> - NotoSansMalayalam-VF.ttf - <axis tag="wght" stylevalue="700"/> - </font> - <font weight="400" style="normal" fallbackFor="serif" - postScriptName="NotoSerifMalayalam-Regular">NotoSerifMalayalam-VF.ttf - <axis tag="wght" stylevalue="400"/> - </font> - <font weight="500" style="normal" fallbackFor="serif" - postScriptName="NotoSerifMalayalam-Regular">NotoSerifMalayalam-VF.ttf - <axis tag="wght" stylevalue="500"/> - </font> - <font weight="600" style="normal" fallbackFor="serif" - postScriptName="NotoSerifMalayalam-Regular">NotoSerifMalayalam-VF.ttf - <axis tag="wght" stylevalue="600"/> - </font> - <font weight="700" style="normal" fallbackFor="serif" - postScriptName="NotoSerifMalayalam-Regular">NotoSerifMalayalam-VF.ttf - <axis tag="wght" stylevalue="700"/> + <font fallbackFor="serif" postScriptName="NotoSerifMalayalam-Regular"> + NotoSerifMalayalam-VF.ttf </font> </family> - <family lang="und-Mlym" variant="compact"> - <font weight="400" style="normal" postScriptName="NotoSansMalayalamUI-Regular"> - NotoSansMalayalamUI-VF.ttf - <axis tag="wght" stylevalue="400"/> - </font> - <font weight="500" style="normal" postScriptName="NotoSansMalayalamUI-Regular"> - NotoSansMalayalamUI-VF.ttf - <axis tag="wght" stylevalue="500"/> - </font> - <font weight="600" style="normal" postScriptName="NotoSansMalayalamUI-Regular"> - NotoSansMalayalamUI-VF.ttf - <axis tag="wght" stylevalue="600"/> - </font> - <font weight="700" style="normal" postScriptName="NotoSansMalayalamUI-Regular"> + <family lang="und-Mlym" variant="compact" varFamilyType="1"> + <font postScriptName="NotoSansMalayalamUI-Regular"> NotoSansMalayalamUI-VF.ttf - <axis tag="wght" stylevalue="700"/> </font> </family> - <family lang="und-Beng" variant="elegant"> - <font weight="400" style="normal" postScriptName="NotoSansBengali-Regular"> - NotoSansBengali-VF.ttf - <axis tag="wght" stylevalue="400"/> - </font> - <font weight="500" style="normal" postScriptName="NotoSansBengali-Regular"> + <family lang="und-Beng" variant="elegant" varFamilyType="1"> + <font postScriptName="NotoSansBengali-Regular"> NotoSansBengali-VF.ttf - <axis tag="wght" stylevalue="500"/> </font> - <font weight="600" style="normal" postScriptName="NotoSansBengali-Regular"> - NotoSansBengali-VF.ttf - <axis tag="wght" stylevalue="600"/> - </font> - <font weight="700" style="normal" postScriptName="NotoSansBengali-Regular"> - NotoSansBengali-VF.ttf - <axis tag="wght" stylevalue="700"/> - </font> - <font weight="400" style="normal" fallbackFor="serif" - postScriptName="NotoSerifBengali-Regular">NotoSerifBengali-VF.ttf - <axis tag="wght" stylevalue="400"/> - </font> - <font weight="500" style="normal" fallbackFor="serif" - postScriptName="NotoSerifBengali-Regular">NotoSerifBengali-VF.ttf - <axis tag="wght" stylevalue="500"/> - </font> - <font weight="600" style="normal" fallbackFor="serif" - postScriptName="NotoSerifBengali-Regular">NotoSerifBengali-VF.ttf - <axis tag="wght" stylevalue="600"/> - </font> - <font weight="700" style="normal" fallbackFor="serif" - postScriptName="NotoSerifBengali-Regular">NotoSerifBengali-VF.ttf - <axis tag="wght" stylevalue="700"/> + <font fallbackFor="serif" postScriptName="NotoSerifBengali-Regular"> + NotoSerifBengali-VF.ttf </font> </family> - <family lang="und-Beng" variant="compact"> - <font weight="400" style="normal" postScriptName="NotoSansBengaliUI-Regular"> - NotoSansBengaliUI-VF.ttf - <axis tag="wght" stylevalue="400"/> - </font> - <font weight="500" style="normal" postScriptName="NotoSansBengaliUI-Regular"> - NotoSansBengaliUI-VF.ttf - <axis tag="wght" stylevalue="500"/> - </font> - <font weight="600" style="normal" postScriptName="NotoSansBengaliUI-Regular"> - NotoSansBengaliUI-VF.ttf - <axis tag="wght" stylevalue="600"/> - </font> - <font weight="700" style="normal" postScriptName="NotoSansBengaliUI-Regular"> + <family lang="und-Beng" variant="compact" varFamilyType="1"> + <font postScriptName="NotoSansBengaliUI-Regular"> NotoSansBengaliUI-VF.ttf - <axis tag="wght" stylevalue="700"/> </font> </family> - <family lang="und-Telu" variant="elegant"> - <font weight="400" style="normal" postScriptName="NotoSansTelugu-Regular"> - NotoSansTelugu-VF.ttf - <axis tag="wght" stylevalue="400"/> - </font> - <font weight="500" style="normal" postScriptName="NotoSansTelugu-Regular"> - NotoSansTelugu-VF.ttf - <axis tag="wght" stylevalue="500"/> - </font> - <font weight="600" style="normal" postScriptName="NotoSansTelugu-Regular"> + <family lang="und-Telu" variant="elegant" varFamilyType="1"> + <font postScriptName="NotoSansTelugu-Regular"> NotoSansTelugu-VF.ttf - <axis tag="wght" stylevalue="600"/> - </font> - <font weight="700" style="normal" postScriptName="NotoSansTelugu-Regular"> - NotoSansTelugu-VF.ttf - <axis tag="wght" stylevalue="700"/> - </font> - <font weight="400" style="normal" fallbackFor="serif" - postScriptName="NotoSerifTelugu-Regular">NotoSerifTelugu-VF.ttf - <axis tag="wght" stylevalue="400"/> </font> - <font weight="500" style="normal" fallbackFor="serif" - postScriptName="NotoSerifTelugu-Regular">NotoSerifTelugu-VF.ttf - <axis tag="wght" stylevalue="500"/> - </font> - <font weight="600" style="normal" fallbackFor="serif" - postScriptName="NotoSerifTelugu-Regular">NotoSerifTelugu-VF.ttf - <axis tag="wght" stylevalue="600"/> - </font> - <font weight="700" style="normal" fallbackFor="serif" - postScriptName="NotoSerifTelugu-Regular">NotoSerifTelugu-VF.ttf - <axis tag="wght" stylevalue="700"/> + <font fallbackFor="serif" postScriptName="NotoSerifTelugu-Regular"> + NotoSerifTelugu-VF.ttf </font> </family> - <family lang="und-Telu" variant="compact"> - <font weight="400" style="normal" postScriptName="NotoSansTeluguUI-Regular"> - NotoSansTeluguUI-VF.ttf - <axis tag="wght" stylevalue="400"/> - </font> - <font weight="500" style="normal" postScriptName="NotoSansTeluguUI-Regular"> - NotoSansTeluguUI-VF.ttf - <axis tag="wght" stylevalue="500"/> - </font> - <font weight="600" style="normal" postScriptName="NotoSansTeluguUI-Regular"> - NotoSansTeluguUI-VF.ttf - <axis tag="wght" stylevalue="600"/> - </font> - <font weight="700" style="normal" postScriptName="NotoSansTeluguUI-Regular"> + <family lang="und-Telu" variant="compact" varFamilyType="1"> + <font postScriptName="NotoSansTeluguUI-Regular"> NotoSansTeluguUI-VF.ttf - <axis tag="wght" stylevalue="700"/> </font> </family> - <family lang="und-Knda" variant="elegant"> - <font weight="400" style="normal" postScriptName="NotoSansKannada-Regular"> - NotoSansKannada-VF.ttf - <axis tag="wght" stylevalue="400"/> - </font> - <font weight="500" style="normal" postScriptName="NotoSansKannada-Regular"> + <family lang="und-Knda" variant="elegant" varFamilyType="1"> + <font postScriptName="NotoSansKannada-Regular"> NotoSansKannada-VF.ttf - <axis tag="wght" stylevalue="500"/> </font> - <font weight="600" style="normal" postScriptName="NotoSansKannada-Regular"> - NotoSansKannada-VF.ttf - <axis tag="wght" stylevalue="600"/> - </font> - <font weight="700" style="normal" postScriptName="NotoSansKannada-Regular"> - NotoSansKannada-VF.ttf - <axis tag="wght" stylevalue="700"/> - </font> - <font weight="400" style="normal" fallbackFor="serif" - postScriptName="NotoSerifKannada-Regular">NotoSerifKannada-VF.ttf - <axis tag="wght" stylevalue="400"/> - </font> - <font weight="500" style="normal" fallbackFor="serif" - postScriptName="NotoSerifKannada-Regular">NotoSerifKannada-VF.ttf - <axis tag="wght" stylevalue="500"/> - </font> - <font weight="600" style="normal" fallbackFor="serif" - postScriptName="NotoSerifKannada-Regular">NotoSerifKannada-VF.ttf - <axis tag="wght" stylevalue="600"/> - </font> - <font weight="700" style="normal" fallbackFor="serif" - postScriptName="NotoSerifKannada-Regular">NotoSerifKannada-VF.ttf - <axis tag="wght" stylevalue="700"/> + <font fallbackFor="serif" postScriptName="NotoSerifKannada-Regular"> + NotoSerifKannada-VF.ttf </font> </family> - <family lang="und-Knda" variant="compact"> - <font weight="400" style="normal" postScriptName="NotoSansKannadaUI-Regular"> - NotoSansKannadaUI-VF.ttf - <axis tag="wght" stylevalue="400"/> - </font> - <font weight="500" style="normal" postScriptName="NotoSansKannadaUI-Regular"> - NotoSansKannadaUI-VF.ttf - <axis tag="wght" stylevalue="500"/> - </font> - <font weight="600" style="normal" postScriptName="NotoSansKannadaUI-Regular"> + <family lang="und-Knda" variant="compact" varFamilyType="1"> + <font postScriptName="NotoSansKannadaUI-Regular"> NotoSansKannadaUI-VF.ttf - <axis tag="wght" stylevalue="600"/> - </font> - <font weight="700" style="normal" postScriptName="NotoSansKannadaUI-Regular"> - NotoSansKannadaUI-VF.ttf - <axis tag="wght" stylevalue="700"/> </font> </family> <family lang="und-Orya" variant="elegant"> @@ -903,56 +290,17 @@ </font> <font weight="700" style="normal">NotoSansOriyaUI-Bold.ttf</font> </family> - <family lang="und-Sinh" variant="elegant"> - <font weight="400" style="normal" postScriptName="NotoSansSinhala-Regular"> + <family lang="und-Sinh" variant="elegant" varFamilyType="1"> + <font postScriptName="NotoSansSinhala-Regular"> NotoSansSinhala-VF.ttf - <axis tag="wght" stylevalue="400"/> - </font> - <font weight="500" style="normal" postScriptName="NotoSansSinhala-Regular"> - NotoSansSinhala-VF.ttf - <axis tag="wght" stylevalue="500"/> - </font> - <font weight="600" style="normal" postScriptName="NotoSansSinhala-Regular"> - NotoSansSinhala-VF.ttf - <axis tag="wght" stylevalue="600"/> - </font> - <font weight="700" style="normal" postScriptName="NotoSansSinhala-Regular"> - NotoSansSinhala-VF.ttf - <axis tag="wght" stylevalue="700"/> - </font> - <font weight="400" style="normal" fallbackFor="serif" - postScriptName="NotoSerifSinhala-Regular">NotoSerifSinhala-VF.ttf - <axis tag="wght" stylevalue="400"/> - </font> - <font weight="500" style="normal" fallbackFor="serif" - postScriptName="NotoSerifSinhala-Regular">NotoSerifSinhala-VF.ttf - <axis tag="wght" stylevalue="500"/> </font> - <font weight="600" style="normal" fallbackFor="serif" - postScriptName="NotoSerifSinhala-Regular">NotoSerifSinhala-VF.ttf - <axis tag="wght" stylevalue="600"/> - </font> - <font weight="700" style="normal" fallbackFor="serif" - postScriptName="NotoSerifSinhala-Regular">NotoSerifSinhala-VF.ttf - <axis tag="wght" stylevalue="700"/> + <font fallbackFor="serif" postScriptName="NotoSerifSinhala-Regular"> + NotoSerifSinhala-VF.ttf </font> </family> - <family lang="und-Sinh" variant="compact"> - <font weight="400" style="normal" postScriptName="NotoSansSinhalaUI-Regular"> - NotoSansSinhalaUI-VF.ttf - <axis tag="wght" stylevalue="400"/> - </font> - <font weight="500" style="normal" postScriptName="NotoSansSinhalaUI-Regular"> - NotoSansSinhalaUI-VF.ttf - <axis tag="wght" stylevalue="500"/> - </font> - <font weight="600" style="normal" postScriptName="NotoSansSinhalaUI-Regular"> - NotoSansSinhalaUI-VF.ttf - <axis tag="wght" stylevalue="600"/> - </font> - <font weight="700" style="normal" postScriptName="NotoSansSinhalaUI-Regular"> + <family lang="und-Sinh" variant="compact" varFamilyType="1"> + <font postScriptName="NotoSansSinhalaUI-Regular"> NotoSansSinhalaUI-VF.ttf - <axis tag="wght" stylevalue="700"/> </font> </family> <family lang="und-Khmr" variant="elegant"> @@ -1050,22 +398,9 @@ <family lang="und-Ahom"> <font weight="400" style="normal">NotoSansAhom-Regular.otf</font> </family> - <family lang="und-Adlm"> - <font weight="400" style="normal" postScriptName="NotoSansAdlam-Regular"> - NotoSansAdlam-VF.ttf - <axis tag="wght" stylevalue="400"/> - </font> - <font weight="500" style="normal" postScriptName="NotoSansAdlam-Regular"> + <family lang="und-Adlm" varFamilyType="1"> + <font postScriptName="NotoSansAdlam-Regular"> NotoSansAdlam-VF.ttf - <axis tag="wght" stylevalue="500"/> - </font> - <font weight="600" style="normal" postScriptName="NotoSansAdlam-Regular"> - NotoSansAdlam-VF.ttf - <axis tag="wght" stylevalue="600"/> - </font> - <font weight="700" style="normal" postScriptName="NotoSansAdlam-Regular"> - NotoSansAdlam-VF.ttf - <axis tag="wght" stylevalue="700"/> </font> </family> <family lang="und-Avst"> @@ -1351,22 +686,9 @@ NotoSansTaiViet-Regular.ttf </font> </family> - <family lang="und-Tibt"> - <font weight="400" style="normal" postScriptName="NotoSerifTibetan-Regular"> + <family lang="und-Tibt" varFamilyType="1"> + <font postScriptName="NotoSerifTibetan-Regular"> NotoSerifTibetan-VF.ttf - <axis tag="wght" stylevalue="400"/> - </font> - <font weight="500" style="normal" postScriptName="NotoSerifTibetan-Regular"> - NotoSerifTibetan-VF.ttf - <axis tag="wght" stylevalue="500"/> - </font> - <font weight="600" style="normal" postScriptName="NotoSerifTibetan-Regular"> - NotoSerifTibetan-VF.ttf - <axis tag="wght" stylevalue="600"/> - </font> - <font weight="700" style="normal" postScriptName="NotoSerifTibetan-Regular"> - NotoSerifTibetan-VF.ttf - <axis tag="wght" stylevalue="700"/> </font> </family> <family lang="und-Tfng"> @@ -1533,94 +855,29 @@ <family lang="und-Dogr"> <font weight="400" style="normal">NotoSerifDogra-Regular.ttf</font> </family> - <family lang="und-Medf"> - <font weight="400" style="normal" postScriptName="NotoSansMedefaidrin-Regular"> - NotoSansMedefaidrin-VF.ttf - <axis tag="wght" stylevalue="400"/> - </font> - <font weight="500" style="normal" postScriptName="NotoSansMedefaidrin-Regular"> - NotoSansMedefaidrin-VF.ttf - <axis tag="wght" stylevalue="500"/> - </font> - <font weight="600" style="normal" postScriptName="NotoSansMedefaidrin-Regular"> - NotoSansMedefaidrin-VF.ttf - <axis tag="wght" stylevalue="600"/> - </font> - <font weight="700" style="normal" postScriptName="NotoSansMedefaidrin-Regular"> + <family lang="und-Medf" varFamilyType="1"> + <font postScriptName="NotoSansMedefaidrin-Regular"> NotoSansMedefaidrin-VF.ttf - <axis tag="wght" stylevalue="700"/> </font> </family> - <family lang="und-Soyo"> - <font weight="400" style="normal" postScriptName="NotoSansSoyombo-Regular"> - NotoSansSoyombo-VF.ttf - <axis tag="wght" stylevalue="400"/> - </font> - <font weight="500" style="normal" postScriptName="NotoSansSoyombo-Regular"> + <family lang="und-Soyo" varFamilyType="1"> + <font postScriptName="NotoSansSoyombo-Regular"> NotoSansSoyombo-VF.ttf - <axis tag="wght" stylevalue="500"/> - </font> - <font weight="600" style="normal" postScriptName="NotoSansSoyombo-Regular"> - NotoSansSoyombo-VF.ttf - <axis tag="wght" stylevalue="600"/> - </font> - <font weight="700" style="normal" postScriptName="NotoSansSoyombo-Regular"> - NotoSansSoyombo-VF.ttf - <axis tag="wght" stylevalue="700"/> </font> </family> - <family lang="und-Takr"> - <font weight="400" style="normal" postScriptName="NotoSansTakri-Regular"> + <family lang="und-Takr" varFamilyType="1"> + <font postScriptName="NotoSansTakri-Regular"> NotoSansTakri-VF.ttf - <axis tag="wght" stylevalue="400"/> - </font> - <font weight="500" style="normal" postScriptName="NotoSansTakri-Regular"> - NotoSansTakri-VF.ttf - <axis tag="wght" stylevalue="500"/> - </font> - <font weight="600" style="normal" postScriptName="NotoSansTakri-Regular"> - NotoSansTakri-VF.ttf - <axis tag="wght" stylevalue="600"/> - </font> - <font weight="700" style="normal" postScriptName="NotoSansTakri-Regular"> - NotoSansTakri-VF.ttf - <axis tag="wght" stylevalue="700"/> </font> </family> - <family lang="und-Hmnp"> - <font weight="400" style="normal" postScriptName="NotoSerifHmongNyiakeng-Regular"> - NotoSerifNyiakengPuachueHmong-VF.ttf - <axis tag="wght" stylevalue="400"/> - </font> - <font weight="500" style="normal" postScriptName="NotoSerifHmongNyiakeng-Regular"> - NotoSerifNyiakengPuachueHmong-VF.ttf - <axis tag="wght" stylevalue="500"/> - </font> - <font weight="600" style="normal" postScriptName="NotoSerifHmongNyiakeng-Regular"> - NotoSerifNyiakengPuachueHmong-VF.ttf - <axis tag="wght" stylevalue="600"/> - </font> - <font weight="700" style="normal" postScriptName="NotoSerifHmongNyiakeng-Regular"> + <family lang="und-Hmnp" varFamilyType="1"> + <font postScriptName="NotoSerifHmongNyiakeng-Regular"> NotoSerifNyiakengPuachueHmong-VF.ttf - <axis tag="wght" stylevalue="700"/> </font> </family> - <family lang="und-Yezi"> - <font weight="400" style="normal" postScriptName="NotoSerifYezidi-Regular"> - NotoSerifYezidi-VF.ttf - <axis tag="wght" stylevalue="400"/> - </font> - <font weight="500" style="normal" postScriptName="NotoSerifYezidi-Regular"> + <family lang="und-Yezi" varFamilyType="1"> + <font postScriptName="NotoSerifYezidi-Regular"> NotoSerifYezidi-VF.ttf - <axis tag="wght" stylevalue="500"/> - </font> - <font weight="600" style="normal" postScriptName="NotoSerifYezidi-Regular"> - NotoSerifYezidi-VF.ttf - <axis tag="wght" stylevalue="600"/> - </font> - <font weight="700" style="normal" postScriptName="NotoSerifYezidi-Regular"> - NotoSerifYezidi-VF.ttf - <axis tag="wght" stylevalue="700"/> </font> </family> </familyset> diff --git a/data/keyboards/Generic.kcm b/data/keyboards/Generic.kcm index 1048742adb70..e7e174064849 100644 --- a/data/keyboards/Generic.kcm +++ b/data/keyboards/Generic.kcm @@ -500,7 +500,7 @@ key PLUS { key ESCAPE { base: none - alt, meta: fallback HOME + alt: fallback HOME ctrl: fallback MENU } diff --git a/data/keyboards/Generic.kl b/data/keyboards/Generic.kl index 51b720ddb758..f9347ee6ea09 100644 --- a/data/keyboards/Generic.kl +++ b/data/keyboards/Generic.kl @@ -324,7 +324,7 @@ key 362 GUIDE # key 365 "KEY_EPG" key 366 DVR # key 367 "KEY_MHP" -# key 368 "KEY_LANGUAGE" +key 368 LANGUAGE_SWITCH # key 369 "KEY_TITLE" key 370 CAPTIONS # key 371 "KEY_ANGLE" diff --git a/data/keyboards/Vendor_0957_Product_0001.kl b/data/keyboards/Vendor_0957_Product_0001.kl index 5d7fd85fc178..87cb942602f7 100644 --- a/data/keyboards/Vendor_0957_Product_0001.kl +++ b/data/keyboards/Vendor_0957_Product_0001.kl @@ -16,7 +16,7 @@ # Key Layout file for Google Reference RCU Remote. # -key 116 TV_POWER WAKE +key 116 POWER WAKE key 217 ASSIST WAKE key 103 DPAD_UP @@ -43,15 +43,15 @@ key 9 8 key 10 9 key 11 0 +key usage 0x00070037 PERIOD + # custom keys key usage 0x000c01BB TV_INPUT -key usage 0x000c0186 MACRO_1 key usage 0x000c0185 TV_TELETEXT key usage 0x000c0061 CAPTIONS key usage 0x000c01BD INFO -key usage 0x000c0037 PERIOD key usage 0x000c0069 PROG_RED key usage 0x000c006A PROG_GREEN diff --git a/data/keyboards/Vendor_18d1_Product_9451.idc b/data/keyboards/Vendor_18d1_Product_9451.idc index e13fcb2e312c..07cfc790e906 100644 --- a/data/keyboards/Vendor_18d1_Product_9451.idc +++ b/data/keyboards/Vendor_18d1_Product_9451.idc @@ -13,11 +13,10 @@ # limitations under the License. # -# Input Device Configuration file for a flavor of the Google Reference RCU Remote. +# Input Device Configuration file for a flavor of Google Remote Control. # # # Basic Parameters -keyboard.layout = Vendor_0957_Product_0001 keyboard.doNotWakeByDefault = 1 -audio.mic = 1
\ No newline at end of file +audio.mic = 1 diff --git a/data/keyboards/Vendor_18d1_Product_9451.kl b/data/keyboards/Vendor_18d1_Product_9451.kl new file mode 100644 index 000000000000..2a1f897b5e08 --- /dev/null +++ b/data/keyboards/Vendor_18d1_Product_9451.kl @@ -0,0 +1,39 @@ +# Copyright 2023 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. + +# +# Key Layout file for flavor of Google Remote Control. +# + +key 116 POWER WAKE +key 217 ASSIST + +key 103 DPAD_UP +key 108 DPAD_DOWN +key 105 DPAD_LEFT +key 106 DPAD_RIGHT +key 353 DPAD_CENTER WAKE + +key 158 BACK WAKE +key 172 HOME WAKE + +key 113 VOLUME_MUTE +key 114 VOLUME_DOWN +key 115 VOLUME_UP + +# custom keys +key usage 0x000c0186 MACRO_1 WAKE + +key usage 0x000c0077 BUTTON_3 WAKE #YouTube +key usage 0x000c0078 BUTTON_4 WAKE #Netflix |