Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c801e915 authored by Deepanshu Gupta's avatar Deepanshu Gupta Committed by Android (Google) Code Review
Browse files

Merge "LayoutLib: Change nullity annotations." into mnc-dev

parents 9123e666 476e582d

tools/layoutlib/.idea/misc.xml

+6 −4
Original line number Diff line number Diff line
@@ -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>

tools/layoutlib/bridge/src/android/content/res/BridgeTypedArray.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

tools/layoutlib/bridge/src/android/content/res/Resources_Theme_Delegate.java

+1 −1
Original line number Diff line number Diff line
@@ -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.content.res.Resources.ThemeKey;

tools/layoutlib/bridge/src/android/graphics/BitmapFactory_Delegate.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

tools/layoutlib/bridge/src/android/graphics/Bitmap_Delegate.java

+1 −1
Original line number Diff line number Diff line
@@ -16,13 +16,13 @@ 


package android.graphics;



import com.android.annotations.Nullable;

import com.android.ide.common.rendering.api.LayoutLog;

import com.android.layoutlib.bridge.Bridge;

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;