OSDN Git Service

Reorganize font enumeration API.
authorSeigo Nonaka <nona@google.com>
Tue, 28 Mar 2017 23:16:41 +0000 (16:16 -0700)
committerSeigo Nonaka <nona@google.com>
Mon, 3 Apr 2017 20:55:07 +0000 (13:55 -0700)
commitff55115121a7a2753ba2265cb3201a3a14c0874d
tree151c60917705792e4afa5bfc5b7820228a72cc50
parentbe436bdefe1947c01eb4b42bf1b864b1e86b7fb9
Reorganize font enumeration API.

This CL cleans up APIs around font variation settings.
- Remove FontConfig and FontManager public API.
- Remove FontManagerService from system service.
- Extract inner class FontConfig.Axis as top-level class FontVariationAxis.
  This is used by Typeface.Builder public API to create new Typeface.
- Introduce and expose FontVariationAxis utility functions from/to string.
- Throws if the invalid font variation settings is passed.

Test: android.text.cts.FontVariationAxisTest passes
Test: android.graphics.cts.TypefaceTest passes
Test: android.graphics.cts.PaintTest passes
Change-Id: I9ccafe7a53935960566243e2856e166878ca59ae
26 files changed:
Android.mk
api/current.txt
api/system-current.txt
api/test-current.txt
compiled-classes-phone
core/java/android/app/SystemServiceRegistry.java
core/java/android/content/Context.java
core/java/android/text/FontConfig.java
core/java/android/text/FontManager.java [deleted file]
core/java/android/text/FontVariationAxis.aidl [moved from core/java/com/android/internal/font/IFontManager.aidl with 64% similarity]
core/java/android/widget/TextView.java
core/jni/android/graphics/FontUtils.cpp
core/tests/coretests/src/android/graphics/VariationParserTest.java [deleted file]
core/tests/coretests/src/android/text/VariationParserTest.java [new file with mode: 0644]
data/fonts/fonts.xml
graphics/java/android/graphics/FontFamily.java
graphics/java/android/graphics/FontListParser.java
graphics/java/android/graphics/Paint.java
graphics/java/android/graphics/Typeface.java
graphics/java/android/graphics/fonts/FontVariationAxis.java [new file with mode: 0644]
preloaded-classes
services/core/java/com/android/server/FontManagerService.java [deleted file]
services/java/com/android/server/SystemServer.java
services/profile-classes
tools/layoutlib/bridge/src/android/graphics/FontFamily_Delegate.java
tools/layoutlib/bridge/src/android/graphics/Typeface_Delegate.java