OSDN Git Service

LayoutLib: Change nullity annotations. [DO NOT MERGE]
authorDeepanshu Gupta <deepanshu@google.com>
Fri, 22 May 2015 21:11:22 +0000 (14:11 -0700)
committerDeepanshu Gupta <deepanshu@google.com>
Tue, 25 Aug 2015 19:06:45 +0000 (12:06 -0700)
commita5ffed0b69ac41d65aacc6ee586688a22226f64b
tree8108d2e87a0694c084d6819d7cc19dcfac43d999
parentc96ef95285e935034377dee30f3b8a0329f6c3a2
LayoutLib: Change nullity annotations. [DO NOT MERGE]

Switch from using tools nullity annotations (com.android.annotations)
to android framework annotations (android.annotation).

A new sdk-common prebuilt is required for LayoutLib tests. The new
sdk-common requires an updated tools-common. The updated tools-common
doesn't have nullity annotations. So, instead of adding the annotation
dependency, just reuse the platform ones. This also paves the way to
include other platform annotations like IdRes etc.

Change-Id: I87b8f767d3681d914abe7d1329e26a87f49f50a7
(cherry picked from commit 476e582d2ffdf25102d4c55f8c242baa3d21d37f)
30 files changed:
tools/layoutlib/.idea/misc.xml
tools/layoutlib/bridge/src/android/content/res/BridgeTypedArray.java
tools/layoutlib/bridge/src/android/content/res/Resources_Theme_Delegate.java
tools/layoutlib/bridge/src/android/graphics/BitmapFactory_Delegate.java
tools/layoutlib/bridge/src/android/graphics/Bitmap_Delegate.java
tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java
tools/layoutlib/bridge/src/android/graphics/FontFamily_Delegate.java
tools/layoutlib/bridge/src/android/graphics/Paint_Delegate.java
tools/layoutlib/bridge/src/android/graphics/Typeface_Delegate.java
tools/layoutlib/bridge/src/android/view/ShadowPainter.java
tools/layoutlib/bridge/src/android/view/accessibility/AccessibilityManager.java
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/Bridge.java
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/support/RecyclerViewUtil.java
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/AppCompatActionBar.java
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/BridgeActionBar.java
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/CustomBar.java
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/FrameworkActionBar.java
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/FrameworkActionBarWrapper.java
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/DelegateManager.java
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/ParserFactory.java
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/ResourceHelper.java
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/util/DynamicIdMap.java
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/util/ReflectionUtils.java
tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/android/BridgeXmlBlockParserTest.java
tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/ImageUtils.java
tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java
tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/setup/LayoutLibTestCallback.java
tools/layoutlib/create/src/com/android/tools/layoutlib/create/Main.java