[atf] Update layoutlib and change tests accordingly
Test: Existing tests pass
Change-Id: Ib461d380aae63b1f71855322b6fb85c1d0d0e98c
diff --git a/Android.bp b/Android.bp
index 048b78e..d8a9aa4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -53,7 +53,7 @@
tools: ["layoutlib_create"],
out: ["temp_layoutlib.jar"],
srcs: [
- ":atf-prebuilt{.jar}",
+ ":atf-prebuilt-362209456{.jar}",
":core-icu4j-for-host{.jar}",
":core-libart-for-host{.jar}",
":framework-all{.jar}",
diff --git a/bridge/tests/src/com/android/tools/idea/validator/LayoutValidatorTests.java b/bridge/tests/src/com/android/tools/idea/validator/LayoutValidatorTests.java
index c01c1af..cf2770e 100644
--- a/bridge/tests/src/com/android/tools/idea/validator/LayoutValidatorTests.java
+++ b/bridge/tests/src/com/android/tools/idea/validator/LayoutValidatorTests.java
@@ -28,7 +28,6 @@
import com.android.tools.idea.validator.ValidatorData.Type;
-import org.junit.Ignore;
import org.junit.Test;
import android.view.View;
@@ -95,10 +94,10 @@
assertEquals("TouchTargetSizeCheck", second.mSourceClass);
assertTrue(compoundFix.mFixes.size() == 2);
assertEquals(
- "Set the view attribute android:layout_width to 48dp.",
+ "Set this item's android:layout_width to 48dp.",
compoundFix.mFixes.get(0).getDescription());
assertEquals(
- "Set the view attribute android:layout_height to 48dp.",
+ "Set this item's android:layout_height to 48dp.",
compoundFix.mFixes.get(1).getDescription());
Issue third = errorIssues.get(2);
@@ -110,7 +109,7 @@
third.mHelpfulUrl);
assertEquals("TextContrastCheck", third.mSourceClass);
assertTrue(third.mFix instanceof SetViewAttributeFix);
- assertEquals("Set the view attribute android:textColor to #FFFFFF.",
+ assertEquals("Set this item's android:textColor to #757575.",
third.mFix.getDescription());
});
}
diff --git a/validator/resources/strings.properties b/validator/resources/strings.properties
index d597714..0e76740 100644
--- a/validator/resources/strings.properties
+++ b/validator/resources/strings.properties
@@ -144,6 +144,6 @@
result_message_brief_is_unexposed_item_screen_region = Consider exposing items in this region to accessibility services.
question_message_screen_has_unexposed_items = Does this screen contain important items that are not outlined?
question_message_identify_unexposed_items = Select regions of the screen with unidentified items.
-description_remove_view_attribute = Remove the view attribute <tt>%1$s</tt>.
-description_set_view_attribute = Set the view attribute <tt>%1$s</tt> to <tt>%2$s</tt>.
-description_set_view_attribute_with_an_empty_string = Set the view attribute <tt>%1$s</tt> to a meaningful non-empty string or resource reference.
+suggestion_remove_view_attribute = Remove this item\'s <tt>%1$s</tt>.
+suggestion_set_view_attribute = Set this item\'s <tt>%1$s</tt> to <tt>%2$s</tt>.
+suggestion_set_view_attribute_with_an_non_empty_string = Set this item\'s <tt>%1$s</tt> to a meaningful non-empty string or resource reference.