Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LayoutLib: Change nullity annotations. [DO NOT MERGE]

Browse Source 
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 476e582d2f)
This commit is contained in:
Deepanshu Gupta
2015-05-22 14:11:22 -07:00
parent c96ef95285
commit a5ffed0b69
30 changed files with 50 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/layoutlib/.idea/misc.xml generated
View File

@@ -10,27 +10,29 @@
<type id="android" />
</component>
<component name="NullableNotNullManager">
<option name="myDefaultNullable" value="com.android.annotations.Nullable" />
<option name="myDefaultNotNull" value="com.android.annotations.NonNull" />
<option name="myDefaultNullable" value="android.annotation.Nullable" />
<option name="myDefaultNotNull" value="android.annotation.NonNull" />
<option name="myNullables">
<value>
<list size="5">
<list size="6">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
<item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
<item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
<item index="4" class="java.lang.String" itemvalue="com.android.annotations.Nullable" />
<item index="5" class="java.lang.String" itemvalue="android.annotation.Nullable" />
</list>
</value>
</option>
<option name="myNotNulls">
<value>
<list size="5">
<list size="6">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
<item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
<item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
<item index="4" class="java.lang.String" itemvalue="com.android.annotations.NonNull" />
<item index="5" class="java.lang.String" itemvalue="android.annotation.NonNull" />
</list>
</value>
</option>

2
tools/layoutlib/bridge/src/android/content/res/BridgeTypedArray.java
View File

@@ -16,7 +16,6 @@
package android.content.res;
import com.android.annotations.Nullable;
import com.android.ide.common.rendering.api.AttrResourceValue;
import com.android.ide.common.rendering.api.LayoutLog;
import com.android.ide.common.rendering.api.RenderResources;
@@ -33,6 +32,7 @@ import com.android.resources.ResourceType;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import android.annotation.Nullable;
import android.content.res.Resources.Theme;
import android.graphics.drawable.Drawable;
import android.util.DisplayMetrics;

2
tools/layoutlib/bridge/src/android/content/res/Resources_Theme_Delegate.java
View File

@@ -16,7 +16,6 @@
package android.content.res;
import com.android.annotations.Nullable;
import com.android.ide.common.rendering.api.ResourceReference;
import com.android.ide.common.rendering.api.StyleResourceValue;
import com.android.layoutlib.bridge.android.BridgeContext;
@@ -25,6 +24,7 @@ import com.android.layoutlib.bridge.impl.RenderSessionImpl;
import com.android.resources.ResourceType;
import com.android.tools.layoutlib.annotations.LayoutlibDelegate;
import android.annotation.Nullable;
import android.content.res.Resources.NotFoundException;
import android.content.res.Resources.Theme;
import android.util.AttributeSet;

2
tools/layoutlib/bridge/src/android/graphics/BitmapFactory_Delegate.java
View File

@@ -16,13 +16,13 @@
package android.graphics;
import com.android.annotations.Nullable;
import com.android.layoutlib.bridge.Bridge;
import com.android.layoutlib.bridge.impl.DelegateManager;
import com.android.ninepatch.NinePatchChunk;
import com.android.resources.Density;
import com.android.tools.layoutlib.annotations.LayoutlibDelegate;
import android.annotation.Nullable;
import android.content.res.BridgeResources.NinePatchInputStream;
import android.graphics.BitmapFactory.Options;
import android.graphics.Bitmap_Delegate.BitmapCreateFlags;

1
tools/layoutlib/bridge/src/android/graphics/Bitmap_Delegate.java
View File

@@ -22,6 +22,7 @@ import com.android.layoutlib.bridge.impl.DelegateManager;
import com.android.resources.Density;
import com.android.tools.layoutlib.annotations.LayoutlibDelegate;
import android.annotation.Nullable;
import android.graphics.Bitmap.Config;
import android.os.Parcel;

1
tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java
View File

@@ -23,6 +23,7 @@ import com.android.layoutlib.bridge.impl.GcSnapshot;
import com.android.layoutlib.bridge.impl.PorterDuffUtility;
import com.android.tools.layoutlib.annotations.LayoutlibDelegate;
import android.annotation.Nullable;
import android.graphics.Bitmap.Config;
import android.text.TextUtils;

4
tools/layoutlib/bridge/src/android/graphics/FontFamily_Delegate.java
View File

@@ -16,14 +16,14 @@
package android.graphics;
import com.android.annotations.NonNull;
import com.android.annotations.Nullable;
import com.android.ide.common.rendering.api.AssetRepository;
import com.android.ide.common.rendering.api.LayoutLog;
import com.android.layoutlib.bridge.Bridge;
import com.android.layoutlib.bridge.impl.DelegateManager;
import com.android.tools.layoutlib.annotations.LayoutlibDelegate;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.content.res.AssetManager;
import android.content.res.BridgeAssetManager;

2
tools/layoutlib/bridge/src/android/graphics/Paint_Delegate.java
View File

@@ -21,6 +21,8 @@ import com.android.layoutlib.bridge.Bridge;
import com.android.layoutlib.bridge.impl.DelegateManager;
import com.android.tools.layoutlib.annotations.LayoutlibDelegate;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.graphics.FontFamily_Delegate.FontVariant;
import android.graphics.Paint.FontMetrics;
import android.graphics.Paint.FontMetricsInt;

2
tools/layoutlib/bridge/src/android/graphics/Typeface_Delegate.java
View File

@@ -16,10 +16,10 @@
package android.graphics;
import com.android.annotations.NonNull;
import com.android.layoutlib.bridge.impl.DelegateManager;
import com.android.tools.layoutlib.annotations.LayoutlibDelegate;
import android.annotation.NonNull;
import android.graphics.FontFamily_Delegate.FontVariant;
import java.awt.Font;

2
tools/layoutlib/bridge/src/android/view/ShadowPainter.java
View File

@@ -16,7 +16,7 @@
package android.view;
import com.android.annotations.NonNull;
import android.annotation.NonNull;
import java.awt.Graphics2D;
import java.awt.Image;

3
tools/layoutlib/bridge/src/android/view/accessibility/AccessibilityManager.java
View File

@@ -16,9 +16,8 @@
package android.view.accessibility;
import com.android.annotations.NonNull;
import android.accessibilityservice.AccessibilityServiceInfo;
import android.annotation.NonNull;
import android.content.Context;
import android.content.pm.ServiceInfo;
import android.view.IWindow;

2
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/Bridge.java
View File

@@ -19,7 +19,6 @@ package com.android.layoutlib.bridge;
import static com.android.ide.common.rendering.api.Result.Status.ERROR_UNKNOWN;
import static com.android.ide.common.rendering.api.Result.Status.SUCCESS;
import com.android.annotations.NonNull;
import com.android.ide.common.rendering.api.Capability;
import com.android.ide.common.rendering.api.DrawableParams;
import com.android.ide.common.rendering.api.Features;
@@ -39,6 +38,7 @@ import com.android.util.Pair;
import com.ibm.icu.util.ULocale;
import libcore.io.MemoryMappedFile_Delegate;
import android.annotation.NonNull;
import android.content.res.BridgeAssetManager;
import android.graphics.Bitmap;
import android.graphics.FontFamily_Delegate;

2
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
View File

@@ -17,7 +17,6 @@
package com.android.layoutlib.bridge.android;
import android.os.IBinder;
import com.android.annotations.Nullable;
import com.android.ide.common.rendering.api.AssetRepository;
import com.android.ide.common.rendering.api.ILayoutPullParser;
import com.android.ide.common.rendering.api.LayoutLog;
@@ -37,6 +36,7 @@ import com.android.util.Pair;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import android.annotation.Nullable;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
import android.content.ContentResolver;

4
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/support/RecyclerViewUtil.java
View File

@@ -16,8 +16,6 @@
package com.android.layoutlib.bridge.android.support;
import com.android.annotations.NonNull;
import com.android.annotations.Nullable;
import com.android.ide.common.rendering.api.LayoutLog;
import com.android.ide.common.rendering.api.LayoutlibCallback;
import com.android.ide.common.rendering.api.SessionParams;
@@ -25,6 +23,8 @@ import com.android.layoutlib.bridge.Bridge;
import com.android.layoutlib.bridge.android.BridgeContext;
import com.android.layoutlib.bridge.android.RenderParamsFlags;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.content.Context;
import android.view.View;

4
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/AppCompatActionBar.java
View File

@@ -16,8 +16,6 @@
package com.android.layoutlib.bridge.bars;
import com.android.annotations.NonNull;
import com.android.annotations.Nullable;
import com.android.ide.common.rendering.api.RenderResources;
import com.android.ide.common.rendering.api.ResourceValue;
import com.android.ide.common.rendering.api.SessionParams;
@@ -26,6 +24,8 @@ import com.android.layoutlib.bridge.android.BridgeContext;
import com.android.layoutlib.bridge.impl.ResourceHelper;
import com.android.resources.ResourceType;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.view.ContextThemeWrapper;

2
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/BridgeActionBar.java
View File

@@ -16,7 +16,6 @@
package com.android.layoutlib.bridge.bars;
import com.android.annotations.NonNull;
import com.android.ide.common.rendering.api.ActionBarCallback;
import com.android.ide.common.rendering.api.ActionBarCallback.HomeButtonStyle;
import com.android.ide.common.rendering.api.RenderResources;
@@ -24,6 +23,7 @@ import com.android.ide.common.rendering.api.ResourceValue;
import com.android.ide.common.rendering.api.SessionParams;
import com.android.layoutlib.bridge.android.BridgeContext;
import android.annotation.NonNull;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;

2
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/CustomBar.java
View File

@@ -16,7 +16,6 @@
package com.android.layoutlib.bridge.bars;
import com.android.annotations.NonNull;
import com.android.ide.common.rendering.api.RenderResources;
import com.android.ide.common.rendering.api.ResourceValue;
import com.android.ide.common.rendering.api.StyleResourceValue;
@@ -32,6 +31,7 @@ import com.android.resources.ResourceType;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import android.annotation.NonNull;
import android.content.Context;
import android.content.res.ColorStateList;
import android.graphics.Bitmap;

4
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/FrameworkActionBar.java
View File

@@ -16,8 +16,6 @@
package com.android.layoutlib.bridge.bars;
import com.android.annotations.NonNull;
import com.android.annotations.Nullable;
import com.android.ide.common.rendering.api.RenderResources;
import com.android.ide.common.rendering.api.ResourceValue;
import com.android.ide.common.rendering.api.SessionParams;
@@ -27,6 +25,8 @@ import com.android.internal.view.menu.MenuItemImpl;
import com.android.layoutlib.bridge.android.BridgeContext;
import com.android.layoutlib.bridge.impl.ResourceHelper;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.content.Context;
import android.content.res.TypedArray;
import android.util.DisplayMetrics;

4
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/FrameworkActionBarWrapper.java
View File

@@ -16,8 +16,6 @@
package com.android.layoutlib.bridge.bars;
import com.android.annotations.NonNull;
import com.android.annotations.Nullable;
import com.android.ide.common.rendering.api.ActionBarCallback;
import com.android.ide.common.rendering.api.RenderResources;
import com.android.ide.common.rendering.api.ResourceValue;
@@ -31,6 +29,8 @@ import com.android.internal.widget.DecorToolbar;
import com.android.layoutlib.bridge.android.BridgeContext;
import com.android.layoutlib.bridge.impl.ResourceHelper;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.app.ActionBar;
import android.app.ActionBar.Tab;
import android.app.ActionBar.TabListener;

1
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/DelegateManager.java
View File

@@ -19,6 +19,7 @@ package com.android.layoutlib.bridge.impl;
import com.android.layoutlib.bridge.util.Debug;
import com.android.layoutlib.bridge.util.SparseWeakArray;
import android.annotation.Nullable;
import android.util.SparseArray;
import java.lang.ref.WeakReference;

6
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/ParserFactory.java
View File

@@ -17,12 +17,12 @@
package com.android.layoutlib.bridge.impl;
import com.android.annotations.NonNull;
import com.android.annotations.Nullable;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import android.annotation.NonNull;
import android.annotation.Nullable;
import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream;
import java.io.File;

4
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java
View File

@@ -16,8 +16,6 @@
package com.android.layoutlib.bridge.impl;
import com.android.annotations.NonNull;
import com.android.annotations.Nullable;
import com.android.ide.common.rendering.api.AdapterBinding;
import com.android.ide.common.rendering.api.HardwareConfig;
import com.android.ide.common.rendering.api.IAnimationListener;
@@ -68,6 +66,8 @@ import android.animation.Animator;
import android.animation.AnimatorInflater;
import android.animation.LayoutTransition;
import android.animation.LayoutTransition.TransitionListener;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.app.Fragment_Delegate;
import android.graphics.Bitmap;
import android.graphics.Bitmap_Delegate;

2
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/ResourceHelper.java
View File

@@ -17,7 +17,6 @@
package com.android.layoutlib.bridge.impl;
import com.android.SdkConstants;
import com.android.annotations.NonNull;
import com.android.ide.common.rendering.api.DensityBasedResourceValue;
import com.android.ide.common.rendering.api.LayoutLog;
import com.android.ide.common.rendering.api.RenderResources;
@@ -32,6 +31,7 @@ import com.android.resources.Density;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import android.annotation.NonNull;
import android.content.res.ColorStateList;
import android.content.res.Resources.Theme;
import android.graphics.Bitmap;

2
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/util/DynamicIdMap.java
View File

@@ -16,10 +16,10 @@
package com.android.layoutlib.bridge.util;
import com.android.annotations.NonNull;
import com.android.resources.ResourceType;
import com.android.util.Pair;
import android.annotation.NonNull;
import android.util.SparseArray;
import java.util.HashMap;

4
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/util/ReflectionUtils.java
View File

@@ -16,8 +16,8 @@
package com.android.layoutlib.bridge.util;
import com.android.annotations.NonNull;
import com.android.annotations.Nullable;
import android.annotation.NonNull;
import android.annotation.Nullable;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;

3
tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/android/BridgeXmlBlockParserTest.java
View File

@@ -16,7 +16,6 @@
package com.android.layoutlib.bridge.android;
import com.android.annotations.NonNull;
import com.android.layoutlib.bridge.impl.ParserFactory;
import org.junit.AfterClass;
@@ -27,6 +26,8 @@ import org.w3c.dom.Node;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import android.annotation.NonNull;
import static org.junit.Assert.assertEquals;
public class BridgeXmlBlockParserTest {

2
tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/ImageUtils.java
View File

@@ -16,7 +16,7 @@
package com.android.layoutlib.bridge.intensive;
import com.android.annotations.NonNull;
import android.annotation.NonNull;
import java.awt.AlphaComposite;
import java.awt.Color;

3
tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java
View File

@@ -16,7 +16,6 @@
package com.android.layoutlib.bridge.intensive;
import com.android.annotations.NonNull;
import com.android.ide.common.rendering.api.LayoutLog;
import com.android.ide.common.rendering.api.RenderSession;
import com.android.ide.common.rendering.api.Result;
@@ -39,6 +38,8 @@ import com.android.utils.ILogger;
import org.junit.Before;
import org.junit.Test;
import android.annotation.NonNull;
import java.io.File;
import java.io.FileFilter;
import java.io.IOException;

5
tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/setup/LayoutLibTestCallback.java
View File

@@ -17,8 +17,6 @@
package com.android.layoutlib.bridge.intensive.setup;
import com.android.SdkConstants;
import com.android.annotations.NonNull;
import com.android.annotations.Nullable;
import com.android.ide.common.rendering.api.ActionBarCallback;
import com.android.ide.common.rendering.api.AdapterBinding;
import com.android.ide.common.rendering.api.ILayoutPullParser;
@@ -35,6 +33,9 @@ import org.kxml2.io.KXmlParser;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import android.annotation.NonNull;
import android.annotation.Nullable;
import java.io.File;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;

2
tools/layoutlib/create/src/com/android/tools/layoutlib/create/Main.java
View File

@@ -118,6 +118,8 @@ public class Main {
"android.app.DatePickerDialog", // b.android.com/28318
"android.app.TimePickerDialog", // b.android.com/61515
"com.android.internal.view.menu.ActionMenu",
"android.annotation.NonNull", // annotations
"android.annotation.Nullable", // annotations
},
excludeClasses,
new String[] {