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

Commit c10b7493 authored by Deepanshu Gupta's avatar Deepanshu Gupta Committed by android-build-merger
Browse files

Merge "LayoutLib fixes for N" into nyc-dev am: f0c5b7af 

am: 89237f4b

* commit '89237f4b':
  LayoutLib fixes for N
parents edb90ee1 89237f4b

core/java/android/widget/TimePickerClockDelegate.java

+2 −4
Original line number Original line Diff line number Diff line
@@ -69,10 +69,8 @@ class TimePickerClockDelegate extends TimePicker.AbstractTimePickerDelegate impl 
    private static final int[] ATTRS_TEXT_COLOR = new int[] {R.attr.textColor};

    private static final int[] ATTRS_TEXT_COLOR = new int[] {R.attr.textColor};

    private static final int[] ATTRS_DISABLED_ALPHA = new int[] {R.attr.disabledAlpha};

    private static final int[] ATTRS_DISABLED_ALPHA = new int[] {R.attr.disabledAlpha};





    // LayoutLib relies on these constants. Change TimePickerClockDelegate_Delegate if

    private static final int AM = 0;

    // modifying these.

    private static final int PM = 1;

    static final int AM = 0;

    static final int PM = 1;





    private static final int HOURS_IN_HALF_DAY = 12;

    private static final int HOURS_IN_HALF_DAY = 12;

tools/layoutlib/.idea/inspectionProfiles/Project_Default.xml

+9 −1
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<component name="InspectionProjectProfileManager">

<component name="InspectionProjectProfileManager">

  <profile version="1.0" is_locked="false">

  <profile version="1.0" is_locked="false">

    <option name="myName" value="Project Default" />

    <option name="myName" value="Project Default" />
@@ -8,6 +7,15 @@ 
      <option name="CHECK_TRY_CATCH_SECTION" value="true" />

      <option name="CHECK_TRY_CATCH_SECTION" value="true" />

      <option name="CHECK_METHOD_BODY" value="true" />

      <option name="CHECK_METHOD_BODY" value="true" />

    </inspection_tool>

    </inspection_tool>

    <inspection_tool class="LoggerInitializedWithForeignClass" enabled="false" level="WARNING" enabled_by_default="false">

      <option name="loggerClassName" value="org.apache.log4j.Logger,org.slf4j.LoggerFactory,org.apache.commons.logging.LogFactory,java.util.logging.Logger" />

      <option name="loggerFactoryMethodName" value="getLogger,getLogger,getLog,getLogger" />

    </inspection_tool>

    <inspection_tool class="ToArrayCallWithZeroLengthArrayArgument" enabled="false" level="WARNING" enabled_by_default="false" />

    <inspection_tool class="ToArrayCallWithZeroLengthArrayArgument" enabled="false" level="WARNING" enabled_by_default="false" />

    <inspection_tool class="WeakerAccess" enabled="true" level="WARNING" enabled_by_default="true">

      <option name="SUGGEST_PACKAGE_LOCAL_FOR_MEMBERS" value="false" />

      <option name="SUGGEST_PACKAGE_LOCAL_FOR_TOP_CLASSES" value="false" />

      <option name="SUGGEST_PRIVATE_FOR_INNERS" value="true" />

    </inspection_tool>

  </profile>

  </profile>

</component>
 
</component>
 
 No newline at end of file

tools/layoutlib/.idea/misc.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -37,7 +37,7 @@ 
      </value>

      </value>

    </option>

    </option>

  </component>

  </component>

  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" default="false" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK">

  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">

    <output url="file://$PROJECT_DIR$/out" />

    <output url="file://$PROJECT_DIR$/out" />

  </component>

  </component>

</project>
 
</project>
 
 No newline at end of file

tools/layoutlib/Android.mk

+0 −2
Original line number Original line Diff line number Diff line
@@ -16,8 +16,6 @@ 
LOCAL_PATH := $(my-dir)

LOCAL_PATH := $(my-dir)

include $(CLEAR_VARS)

include $(CLEAR_VARS)





LOCAL_JAVACFLAGS := -source 6 -target 6



#

#

# Define rules to build temp_layoutlib.jar, which contains a subset of

# Define rules to build temp_layoutlib.jar, which contains a subset of

# the classes in framework.jar.  The layoutlib_create tool is used to

# the classes in framework.jar.  The layoutlib_create tool is used to

tools/layoutlib/bridge/Android.mk

+0 −2
Original line number Original line Diff line number Diff line
@@ -18,8 +18,6 @@ include $(CLEAR_VARS) 




LOCAL_SRC_FILES := $(call all-java-files-under,src)

LOCAL_SRC_FILES := $(call all-java-files-under,src)

LOCAL_JAVA_RESOURCE_DIRS := resources

LOCAL_JAVA_RESOURCE_DIRS := resources

LOCAL_JAVACFLAGS := -source 6 -target 6







LOCAL_JAVA_LIBRARIES := \

LOCAL_JAVA_LIBRARIES := \

	layoutlib_api-prebuilt \

	layoutlib_api-prebuilt \