Global cleanup change.

--
PiperOrigin-RevId: 149652245
MOS_MIGRATED_REVID=149652245

1 files changed, 34 insertions, 32 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceClassWriter.java b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceClassWriter.java
index fad5cf5355..37fb7a81a2 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceClassWriter.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceClassWriter.java
@@ -176,10 +176,12 @@ public class AndroidResourceClassWriter implements Flushable {
    * at all alphabetical. It depends on the order in which the types are processed, and whether or
    * not previous types are present (compact). See the code in aapt Resource.cpp:buildResources().
    * There are several seemingly arbitrary and different processing orders in the function, but the
-   * ordering is determined specifically by the portion at: <a href="https://android.googlesource.com/platform/frameworks/base.git/+/marshmallow-release/tools/aapt/Resource.cpp#1254">
+   * ordering is determined specifically by the portion at: <a
+   * href="https://android.googlesource.com/platform/frameworks/base.git/+/marshmallow-release/tools/aapt/Resource.cpp#1254">
    * Resource.cpp:buildResources() </a>
    *
-   * where it does:
+   * <p>where it does:
+   *
    * <pre>
    *   if (drawables != NULL) { ... }
    *   if (mipmaps != NULL) { ... }
@@ -190,36 +192,36 @@ public class AndroidResourceClassWriter implements Flushable {
    * ResourceType.STYLEABLE doesn't actually need a resource ID, so that is skipped. We encode the
    * ordering in the following list.
    */
-  private static final List<ResourceType> AAPT_TYPE_ORDERING = ImmutableList.of(
-      ResourceType.DRAWABLE,
-      ResourceType.MIPMAP,
-      ResourceType.LAYOUT,
-      ResourceType.ANIM,
-      ResourceType.ANIMATOR,
-      ResourceType.TRANSITION,
-      ResourceType.INTERPOLATOR,
-      ResourceType.XML,
-      ResourceType.RAW,
-      // Begin VALUES portion
-      // Technically, aapt just assigns according to declaration order in the source value.xml files
-      // so it isn't really deterministic. However, the Gradle merger sorts the values.xml file
-      // before invoking aapt, so assume that is also done.
-      ResourceType.ARRAY,
-      ResourceType.BOOL,
-      ResourceType.COLOR,
-      ResourceType.DIMEN,
-      ResourceType.FRACTION,
-      ResourceType.ID,
-      ResourceType.INTEGER,
-      ResourceType.PLURALS,
-      ResourceType.STRING,
-      ResourceType.STYLE,
-      // End VALUES portion
-      // Technically, file-based COLOR resources come next. If we care about complete equivalence
-      // we should separate the file-based resources from value-based resources so that we can
-      // number them the same way.
-      ResourceType.MENU
-  );
+  private static final ImmutableList<ResourceType> AAPT_TYPE_ORDERING =
+      ImmutableList.of(
+          ResourceType.DRAWABLE,
+          ResourceType.MIPMAP,
+          ResourceType.LAYOUT,
+          ResourceType.ANIM,
+          ResourceType.ANIMATOR,
+          ResourceType.TRANSITION,
+          ResourceType.INTERPOLATOR,
+          ResourceType.XML,
+          ResourceType.RAW,
+          // Begin VALUES portion
+          // Technically, aapt just assigns according to declaration order in the source value.xml files
+          // so it isn't really deterministic. However, the Gradle merger sorts the values.xml file
+          // before invoking aapt, so assume that is also done.
+          ResourceType.ARRAY,
+          ResourceType.BOOL,
+          ResourceType.COLOR,
+          ResourceType.DIMEN,
+          ResourceType.FRACTION,
+          ResourceType.ID,
+          ResourceType.INTEGER,
+          ResourceType.PLURALS,
+          ResourceType.STRING,
+          ResourceType.STYLE,
+          // End VALUES portion
+          // Technically, file-based COLOR resources come next. If we care about complete equivalence
+          // we should separate the file-based resources from value-based resources so that we can
+          // number them the same way.
+          ResourceType.MENU);
 
   private Map<ResourceType, Integer> chooseTypeIds() {
     // Go through public entries. Those may have forced certain type assignments, so take those