commit 375a8cf39274dfd9218056c4903833b505c4c18a
author Stuart Scott <stuartscott@google.com> Fri Nov 15 21:16:14 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 15 21:16:14 2013 +0000
tree f8889d7e1dad8e7b275118e59912b07056c63946
parent e6dbddf594cc78057111494a989e0155c2445aeb
parent c09a2e0bfbc7d015dfddc41079d30d60ddf4b46c

Merge "Removing old signature test, migrating to new one." into klp-dev

tests/res/layout/view_layout.xml

diff --git a/tests/res/layout/view_layout.xml b/tests/res/layout/view_layout.xml
index d30c733..40974f0 100644
--- a/tests/res/layout/view_layout.xml
+++ b/tests/res/layout/view_layout.xml
@@ -54,28 +54,28 @@
             android:id="@+id/mock_view_padding_full"
             android:layout_width="200px"
             android:layout_height="200px"
-            android:padding="0dp"
+            android:padding="0px"
             android:background="@drawable/padding_0" />
 
     <android.view.cts.MockView
             android:id="@+id/mock_view_padding_left"
             android:layout_width="200px"
             android:layout_height="200px"
-            android:paddingLeft="0dp"
+            android:paddingLeft="0px"
             android:background="@drawable/padding_0" />
 
     <android.view.cts.MockView
             android:id="@+id/mock_view_padding_right"
             android:layout_width="200px"
             android:layout_height="200px"
-            android:paddingRight="0dp"
+            android:paddingRight="0px"
             android:background="@drawable/padding_0" />
 
     <android.view.cts.MockView
             android:id="@+id/mock_view_padding_top"
             android:layout_width="200px"
             android:layout_height="200px"
-            android:paddingTop="0dp"
+            android:paddingTop="0px"
             android:background="@drawable/padding_0" />
 
     <android.view.cts.MockView
@@ -89,8 +89,8 @@
             android:id="@+id/mock_view_padding_runtime_updated"
             android:layout_width="200px"
             android:layout_height="200px"
-            android:paddingStart="8dp"
-            android:paddingEnd="8dp"
+            android:paddingStart="8px"
+            android:paddingEnd="8px"
             android:background="@drawable/no_padding" />
 
 </LinearLayout>

tests/tests/view/src/android/view/cts/ViewTest.java

diff --git a/tests/tests/view/src/android/view/cts/ViewTest.java b/tests/tests/view/src/android/view/cts/ViewTest.java
index 1066e67..2fd939c 100644
--- a/tests/tests/view/src/android/view/cts/ViewTest.java
+++ b/tests/tests/view/src/android/view/cts/ViewTest.java
@@ -2857,9 +2857,9 @@
         final int paddingRight = view.getPaddingRight();
         final int paddingTop = view.getPaddingTop();
         final int paddingBottom = view.getPaddingBottom();
-        assertEquals(24, paddingLeft);
+        assertEquals(8, paddingLeft);
         assertEquals(0, paddingTop);
-        assertEquals(24, paddingRight);
+        assertEquals(8, paddingRight);
         assertEquals(0, paddingBottom);
 
         // Manipulate background and padding
@@ -2868,9 +2868,9 @@
         view.setBackground(background);
         view.setPadding(paddingLeft, paddingTop, paddingRight, paddingBottom);
 
-        assertEquals(24, view.getPaddingLeft());
+        assertEquals(8, view.getPaddingLeft());
         assertEquals(0, view.getPaddingTop());
-        assertEquals(24, view.getPaddingRight());
+        assertEquals(8, view.getPaddingRight());
         assertEquals(0, view.getPaddingBottom());
     }