Fix bug #4772392 Check what needs to be done for RTL specific new att…

…ributes that are in public.xml - cleanup public.xml - make BiDiTest makefile non visible to the build system - provide file for injecting the new attributes by hand Change-Id: I5037ec323066ebd254be51fff7070a5a0101dff7
billybore · Jul 20, 2011 · 1180644 · 1180644
1 parent 5531a3a
commit 1180644
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 68 deletions.
diff --git a/api/current.txt b/api/current.txt
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
@@ -607,8 +607,6 @@
  * @attr ref android.R.styleable#View_paddingLeft
  * @attr ref android.R.styleable#View_paddingRight
  * @attr ref android.R.styleable#View_paddingTop
- * @attr ref android.R.styleable#View_paddingStart
- * @attr ref android.R.styleable#View_paddingEnd
  * @attr ref android.R.styleable#View_saveEnabled
  * @attr ref android.R.styleable#View_rotation
  * @attr ref android.R.styleable#View_rotationX

diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
@@ -1719,8 +1719,6 @@
   <public type="attr" name="textEditSuggestionsTopWindowLayout" />
   <public type="attr" name="textEditSuggestionItemLayout" />
 
-  <public type="attr" name="layoutDirection" />
-
   <public type="attr" name="suggestionsEnabled" />
 
   <public type="attr" name="rowCount" />
@@ -1765,15 +1763,8 @@
   <public type="attr" name="listPreferredItemHeightLarge" />
   <public type="attr" name="listPreferredItemHeightSmall" />
 
-  <public type="attr" name="paddingStart"/>
-  <public type="attr" name="paddingEnd"/>
-  <public type="attr" name="layout_marginStart"/>
-  <public type="attr" name="layout_marginEnd"/>
-
   <public type="attr" name="actionBarSplitStyle" />
 
-  <public type="attr" name="textDirection"/>
-
   <public type="attr" name="actionProviderClass" />
 
   <public type="attr" name="backgroundStacked" />

diff --git a/tests/BiDiTests/Android b/tests/BiDiTests/Android
diff --git a/tests/BiDiTests/Android.mk → tests/BiDiTests/Android-private.mk b/tests/BiDiTests/Android.mk → tests/BiDiTests/Android-private.mk
diff --git a/tests/BiDiTests/new-attributes.txt b/tests/BiDiTests/new-attributes.txt
@@ -0,0 +1,9 @@
+  <public type="attr" name="layoutDirection" />
+
+  <public type="attr" name="layout_marginStart"/>
+  <public type="attr" name="layout_marginEnd"/>
+
+  <public type="attr" name="paddingStart"/>
+  <public type="attr" name="paddingEnd"/>
+
+  <public type="attr" name="textDirection"/>