Trim trailing whitespace in code completion test golden files

There are no semantic changes.

Change-Id: I43eddc9372c6e5194ba645bbe2d2bedfc438c25b

23 files changed, 710 insertions, 710 deletions

diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/AndroidContentAssistTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/AndroidContentAssistTest.java
index c7a452e..89fb3b6 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/AndroidContentAssistTest.java
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/AndroidContentAssistTest.java
@@ -823,11 +823,11 @@ public class AndroidContentAssistTest extends AdtProjectTest {
         sb.append("Code completion in " + basename + " for " + caretLocation + ":\n");
         for (ICompletionProposal proposal : proposals) {
             // TODO: assertNotNull(proposal.getImage());
-            sb.append(proposal.getDisplayString());
+            sb.append(proposal.getDisplayString().trim());
             String help = proposal.getAdditionalProposalInfo();
             if (help != null && help.trim().length() > 0) {
                 sb.append(" : ");
-                sb.append(help.replace('\n', ' '));
+                sb.append(help.replace('\n', ' ').trim());
             }
             sb.append('\n');
         }
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/anim1-expected-completion55.txt b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/anim1-expected-completion55.txt
index 28b15d3..17cf984 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/anim1-expected-completion55.txt
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/anim1-expected-completion55.txt
@@ -1,16 +1,16 @@
 Code completion in anim1.xml for android:^fromXDelta=:
-android:fromXDelta : [float, fraction] 
-android:toXDelta : [float, fraction] 
-android:fromYDelta : [float, fraction] 
-android:toYDelta : [float, fraction] 
-android:interpolator : Defines the interpolator used to smooth the animation movement  in time.  [reference] 
-android:fillEnabled : When set to true, fillAfter is taken into account.  [boolean] 
-android:fillBefore : When set to true, the animation transformation is applied before  the animation has started.  [boolean] 
-android:fillAfter : When set to true, the animation transformation is applied after  the animation is over.  [boolean] 
-android:duration : Amount of time (in milliseconds) for the animation to run.  [integer] 
-android:startOffset : Delay in milliseconds before the animation runs, once start time  is reached.  [integer] 
-android:repeatCount : Defines how many times the animation should repeat.  [integer, enum] 
-android:repeatMode : Defines the animation behavior when it reaches the end and the  repeat count is greater than 0 or infinite.  [enum] 
-android:zAdjustment : Allows for an adjustment of the Z ordering of the content being  animated for the duration of the animation.  [enum] 
-android:background : Special background behind animation.  [reference, color] 
-android:detachWallpaper : Special option for window animations: if this window is on top  of a wallpaper, don't animate the wallpaper with it.  [boolean] 
+android:fromXDelta : [float, fraction]
+android:toXDelta : [float, fraction]
+android:fromYDelta : [float, fraction]
+android:toYDelta : [float, fraction]
+android:interpolator : Defines the interpolator used to smooth the animation movement  in time.  [reference]
+android:fillEnabled : When set to true, fillAfter is taken into account.  [boolean]
+android:fillBefore : When set to true, the animation transformation is applied before  the animation has started.  [boolean]
+android:fillAfter : When set to true, the animation transformation is applied after  the animation is over.  [boolean]
+android:duration : Amount of time (in milliseconds) for the animation to run.  [integer]
+android:startOffset : Delay in milliseconds before the animation runs, once start time  is reached.  [integer]
+android:repeatCount : Defines how many times the animation should repeat.  [integer, enum]
+android:repeatMode : Defines the animation behavior when it reaches the end and the  repeat count is greater than 0 or infinite.  [enum]
+android:zAdjustment : Allows for an adjustment of the Z ordering of the content being  animated for the duration of the animation.  [enum]
+android:background : Special background behind animation.  [reference, color]
+android:detachWallpaper : Special option for window animations: if this window is on top  of a wallpaper, don't animate the wallpaper with it.  [boolean]
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/anim1-expected-completion56.txt b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/anim1-expected-completion56.txt
index 632a9c5..837a6cc 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/anim1-expected-completion56.txt
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/anim1-expected-completion56.txt
@@ -1,14 +1,14 @@
 Code completion in anim1.xml for android:^fromAlpha=:
-android:fromAlpha : [float] 
-android:toAlpha : [float] 
-android:interpolator : Defines the interpolator used to smooth the animation movement  in time.  [reference] 
-android:fillEnabled : When set to true, fillAfter is taken into account.  [boolean] 
-android:fillBefore : When set to true, the animation transformation is applied before  the animation has started.  [boolean] 
-android:fillAfter : When set to true, the animation transformation is applied after  the animation is over.  [boolean] 
-android:duration : Amount of time (in milliseconds) for the animation to run.  [integer] 
-android:startOffset : Delay in milliseconds before the animation runs, once start time  is reached.  [integer] 
-android:repeatCount : Defines how many times the animation should repeat.  [integer, enum] 
-android:repeatMode : Defines the animation behavior when it reaches the end and the  repeat count is greater than 0 or infinite.  [enum] 
-android:zAdjustment : Allows for an adjustment of the Z ordering of the content being  animated for the duration of the animation.  [enum] 
-android:background : Special background behind animation.  [reference, color] 
-android:detachWallpaper : Special option for window animations: if this window is on top  of a wallpaper, don't animate the wallpaper with it.  [boolean] 
+android:fromAlpha : [float]
+android:toAlpha : [float]
+android:interpolator : Defines the interpolator used to smooth the animation movement  in time.  [reference]
+android:fillEnabled : When set to true, fillAfter is taken into account.  [boolean]
+android:fillBefore : When set to true, the animation transformation is applied before  the animation has started.  [boolean]
+android:fillAfter : When set to true, the animation transformation is applied after  the animation is over.  [boolean]
+android:duration : Amount of time (in milliseconds) for the animation to run.  [integer]
+android:startOffset : Delay in milliseconds before the animation runs, once start time  is reached.  [integer]
+android:repeatCount : Defines how many times the animation should repeat.  [integer, enum]
+android:repeatMode : Defines the animation behavior when it reaches the end and the  repeat count is greater than 0 or infinite.  [enum]
+android:zAdjustment : Allows for an adjustment of the Z ordering of the content being  animated for the duration of the animation.  [enum]
+android:background : Special background behind animation.  [reference, color]
+android:detachWallpaper : Special option for window animations: if this window is on top  of a wallpaper, don't animate the wallpaper with it.  [boolean]
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/animator1-expected-completion59.txt b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/animator1-expected-completion59.txt
index 0702712..474fe77 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/animator1-expected-completion59.txt
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/animator1-expected-completion59.txt
@@ -1,10 +1,10 @@
 Code completion in animator1.xml for android:^duration="2000":
-android:propertyName : Name of the property being animated.  [string] 
-android:interpolator : Defines the interpolator used to smooth the animation movement  in time.  [reference] 
-android:duration : Amount of time (in milliseconds) for the animation to run.  [integer] 
-android:startOffset : Delay in milliseconds before the animation runs, once start time  is reached.  [integer] 
-android:repeatCount : Defines how many times the animation should repeat.  [integer, enum] 
-android:repeatMode : Defines the animation behavior when it reaches the end and the  repeat count is greater than 0 or infinite.  [enum] 
-android:valueFrom : Value the animation starts from.  [integer, float, color, dimension] 
-android:valueTo : Value the animation animates to.  [integer, float, color, dimension] 
-android:valueType : The type of valueFrom and valueTo.  [enum] 
+android:propertyName : Name of the property being animated.  [string]
+android:interpolator : Defines the interpolator used to smooth the animation movement  in time.  [reference]
+android:duration : Amount of time (in milliseconds) for the animation to run.  [integer]
+android:startOffset : Delay in milliseconds before the animation runs, once start time  is reached.  [integer]
+android:repeatCount : Defines how many times the animation should repeat.  [integer, enum]
+android:repeatMode : Defines the animation behavior when it reaches the end and the  repeat count is greater than 0 or infinite.  [enum]
+android:valueFrom : Value the animation starts from.  [integer, float, color, dimension]
+android:valueTo : Value the animation animates to.  [integer, float, color, dimension]
+android:valueType : The type of valueFrom and valueTo.  [enum]
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/broken1-expected-completion20.txt b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/broken1-expected-completion20.txt
index 0a4c2f4..c5aa1a0 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/broken1-expected-completion20.txt
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/broken1-expected-completion20.txt
@@ -1,2 +1,2 @@
 Code completion in broken1.xml for android:textColorHigh^:
-android:textColorHighlight : Color of the text selection highlight.  [reference, color] 
+android:textColorHighlight : Color of the text selection highlight.  [reference, color]
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/color1-expected-completion46b.txt b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/color1-expected-completion46b.txt
index 7fcc5a9..8899193 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/color1-expected-completion46b.txt
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/color1-expected-completion46b.txt
@@ -1,16 +1,16 @@
 Code completion in color1.xml for <item ^android:state_focused="true"/>:
-android:state_focused : State value for StateListDrawable, set when a view has input  focus.  [boolean] 
-android:state_window_focused : State value for StateListDrawable, set when a view's window has  input focus.  [boolean] 
-android:state_enabled : State value for StateListDrawable, set when a view is enabled.  [boolean] 
-android:state_checkable : State identifier indicating that the object <var>may</var> display  a check mark.  [boolean] 
-android:state_checked : State identifier indicating that the object is currently checked.  [boolean] 
-android:state_selected : State value for StateListDrawable, set when a view (or one of  its parents) is currently selected.  [boolean] 
-android:state_pressed : State value for StateListDrawable, set when the user is pressing  down in a view.  [boolean] 
-android:state_activated : State value for StateListDrawable, set when a view or its parent  has been "activated" meaning the user has currently marked it  as being of interest.  [boolean] 
-android:state_active : State value for StateListDrawable.  [boolean] 
-android:state_single : State value for StateListDrawable.  [boolean] 
-android:state_first : State value for StateListDrawable.  [boolean] 
-android:state_middle : State value for StateListDrawable.  [boolean] 
-android:state_last : State value for StateListDrawable.  [boolean] 
-android:state_accelerated : State value for StateListDrawable, indicating that the Drawable  is in a view that is hardware accelerated.  [boolean] 
+android:state_focused : State value for StateListDrawable, set when a view has input  focus.  [boolean]
+android:state_window_focused : State value for StateListDrawable, set when a view's window has  input focus.  [boolean]
+android:state_enabled : State value for StateListDrawable, set when a view is enabled.  [boolean]
+android:state_checkable : State identifier indicating that the object <var>may</var> display  a check mark.  [boolean]
+android:state_checked : State identifier indicating that the object is currently checked.  [boolean]
+android:state_selected : State value for StateListDrawable, set when a view (or one of  its parents) is currently selected.  [boolean]
+android:state_pressed : State value for StateListDrawable, set when the user is pressing  down in a view.  [boolean]
+android:state_activated : State value for StateListDrawable, set when a view or its parent  has been "activated" meaning the user has currently marked it  as being of interest.  [boolean]
+android:state_active : State value for StateListDrawable.  [boolean]
+android:state_single : State value for StateListDrawable.  [boolean]
+android:state_first : State value for StateListDrawable.  [boolean]
+android:state_middle : State value for StateListDrawable.  [boolean]
+android:state_last : State value for StateListDrawable.  [boolean]
+android:state_accelerated : State value for StateListDrawable, indicating that the Drawable  is in a view that is hardware accelerated.  [boolean]
 android:color : Hexadeximal color. Required. The color is specified with an RGB value and optional alpha channel. The value always begins with a pound (#) character and then followed by the Alpha-Red-Green-Blue information in one of the following formats: * RGB * ARGB * RRGGBB * AARRGGBB
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion1-expected-completion1.txt b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion1-expected-completion1.txt
index 949067a..c3e75ad 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion1-expected-completion1.txt
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion1-expected-completion1.txt
@@ -1,3 +1,3 @@
 Code completion in completion1.xml for layout_w^idth="fill_parent":
-android:layout_width : Specifies the basic width of the view.  [dimension, enum] 
-android:layout_weight : [float] 
+android:layout_width : Specifies the basic width of the view.  [dimension, enum]
+android:layout_weight : [float]
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion1-expected-completion39.txt b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion1-expected-completion39.txt
index d03f129..ac18c6d 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion1-expected-completion39.txt
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion1-expected-completion39.txt
@@ -1,142 +1,142 @@
 Code completion in completion1.xml for marginBottom="50"^:
- style : A reference to a custom style  [reference] 
- android:bufferType : Determines the minimum type that getText() will return.  [enum] 
- android:text : Text to display.  [string] 
- android:hint : Hint text to display when the text is empty.  [string] 
- android:textColor : Text color.  [reference, color] 
- android:textColorHighlight : Color of the text selection highlight.  [reference, color] 
- android:textColorHint : Color of the hint text.  [reference, color] 
- android:textAppearance : Base text color, typeface, size, and style.  [reference] 
- android:textSize : Size of the text.  [dimension] 
- android:textScaleX : Sets the horizontal scaling factor for the text.  [float] 
- android:typeface : Typeface (normal, sans, serif, monospace) for the text.  [enum] 
- android:textStyle : Style (bold, italic, bolditalic) for the text.  [flag] 
- android:textColorLink : Text color for links.  [reference, color] 
- android:cursorVisible : Makes the cursor visible (the default) or invisible.  [boolean] 
- android:maxLines : Makes the TextView be at most this many lines tall.  [integer] 
- android:maxHeight : Makes the TextView be at most this many pixels tall.  [dimension] 
- android:lines : Makes the TextView be exactly this many lines tall.  [integer] 
- android:height : Makes the TextView be exactly this many pixels tall.  [dimension] 
- android:minLines : Makes the TextView be at least this many lines tall.  [integer] 
- android:minHeight : Makes the TextView be at least this many pixels tall.  [dimension] 
- android:maxEms : Makes the TextView be at most this many ems wide.  [integer] 
- android:maxWidth : Makes the TextView be at most this many pixels wide.  [dimension] 
- android:ems : Makes the TextView be exactly this many ems wide.  [integer] 
- android:width : Makes the TextView be exactly this many pixels wide.  [dimension] 
- android:minEms : Makes the TextView be at least this many ems wide.  [integer] 
- android:minWidth : Makes the TextView be at least this many pixels wide.  [dimension] 
- android:gravity : Specifies how to align the text by the view's x- and/or y-axis  when the text is smaller than the view.  [flag] 
- android:scrollHorizontally : Whether the text is allowed to be wider than the view (and therefore  can be scrolled horizontally).  [boolean] 
- android:password : Whether the characters of the field are displayed as password  dots instead of themselves. * Deprecated: Use inputType instead.  [boolean] 
- android:singleLine : Constrains the text to a single horizontally scrolling line instead  of letting it wrap onto multiple lines, and advances focus instead  of inserting a newline when you press the enter key. * Deprecated: This attribute is deprecated and is replaced by  the textMultiLine flag in the inputType attribute. Use caution  when altering existing layouts, as the default value of singeLine  is false (multi-line mode), but if you specify any value for  inputType, the default is single-line mode. (If both singleLine  and inputType attributes are found, the inputType flags will  override the value of singleLine.).  [boolean] 
- android:enabled : Specifies whether the TextView is enabled or not. * Deprecated: Use state_enabled instead.  [boolean] 
- android:selectAllOnFocus : If the text is selectable, select it all when the view takes  focus instead of moving the cursor to the start or end.  [boolean] 
- android:includeFontPadding : Leave enough room for ascenders and descenders instead of using  the font ascent and descent strictly.  [boolean] 
- android:maxLength : Set an input filter to constrain the text length to the specified  number.  [integer] 
- android:shadowColor : Place a shadow of the specified color behind the text.  [color] 
- android:shadowDx : Horizontal offset of the shadow.  [float] 
- android:shadowDy : Vertical offset of the shadow.  [float] 
- android:shadowRadius : Radius of the shadow.  [float] 
- android:autoLink : Controls whether links such as urls and email addresses are automatically  found and converted to clickable links.  [flag] 
- android:linksClickable : If set to false, keeps the movement method from being set to  the link movement method even if autoLink causes links to be  found.  [boolean] 
- android:numeric : If set, specifies that this TextView has a numeric input method. * Deprecated: Use inputType instead.  [flag] 
- android:digits : If set, specifies that this TextView has a numeric input method  and that these specific characters are the ones that it will  accept.  [string] 
- android:phoneNumber : If set, specifies that this TextView has a phone number input  method. * Deprecated: Use inputType instead.  [boolean] 
- android:inputMethod : If set, specifies that this TextView should use the specified  input method (specified by fully-qualified class name). * Deprecated: Use inputType instead.  [string] 
- android:capitalize : If set, specifies that this TextView has a textual input method  and should automatically capitalize what the user types. * Deprecated: Use inputType instead.  [enum] 
- android:autoText : If set, specifies that this TextView has a textual input method  and automatically corrects some common spelling errors. * Deprecated: Use inputType instead.  [boolean] 
- android:editable : If set, specifies that this TextView has an input method. * Deprecated: Use inputType instead.  [boolean] 
- android:freezesText : If set, the text view will include its current complete text  inside of its frozen icicle in addition to meta-data such as  the current cursor position.  [boolean] 
- android:ellipsize : If set, causes words that are longer than the view is wide to  be ellipsized instead of broken in the middle.  [enum] 
- android:drawableTop : The drawable to be drawn above the text.  [reference, color] 
- android:drawableBottom : The drawable to be drawn below the text.  [reference, color] 
- android:drawableLeft : The drawable to be drawn to the left of the text.  [reference, color] 
- android:drawableRight : The drawable to be drawn to the right of the text.  [reference, color] 
- android:drawablePadding : The padding between the drawables and the text.  [dimension] 
- android:lineSpacingExtra : Extra spacing between lines of text.  [dimension] 
- android:lineSpacingMultiplier : Extra spacing between lines of text, as a multiplier.  [float] 
- android:marqueeRepeatLimit : The number of times to repeat the marquee animation.  [integer, enum] 
- android:inputType : The type of data being placed in a text field, used to help an  input method decide how to let the user enter text.  [flag] 
- android:imeOptions : Additional features you can enable in an IME associated with  an editor to improve the integration with your application.  [flag] 
- android:privateImeOptions : An addition content type description to supply to the input method  attached to the text view, which is private to the implementation  of the input method.  [string] 
- android:imeActionLabel : Supply a value for EditorInfo.actionLabel used when an input  method is connected to the text view.  [string] 
- android:imeActionId : Supply a value for EditorInfo.actionId used when an input method  is connected to the text view.  [integer] 
- android:editorExtras : Reference to an "input-extras" XML resource containing additional  data to supply to an input method, which is private to the implementation  of the input method.  [reference] 
- android:textSelectHandleLeft : Reference to a drawable that will be used to display a text selection  anchor on the left side of a selection region.  [reference] 
- android:textSelectHandleRight : Reference to a drawable that will be used to display a text selection  anchor on the right side of a selection region.  [reference] 
- android:textSelectHandle : Reference to a drawable that will be used to display a text selection  anchor for positioning the cursor within text.  [reference] 
- android:textEditPasteWindowLayout : The layout of the view that is displayed on top of the cursor  to paste inside a TextEdit field.  [reference] 
- android:textEditNoPasteWindowLayout : Variation of textEditPasteWindowLayout displayed when the clipboard  is empty.  [reference] 
- android:textEditSidePasteWindowLayout : Used instead of textEditPasteWindowLayout when the window is  moved on the side of the insertion cursor because it would be  clipped if it were positioned on top.  [reference] 
- android:textEditSideNoPasteWindowLayout : Variation of textEditSidePasteWindowLayout displayed when the  clipboard is empty.  [reference] 
- android:textCursorDrawable : Reference to a drawable that will be drawn under the insertion  cursor.  [reference] 
- android:textIsSelectable : Indicates that the content of a non-editable text can be selected.  [boolean] 
- android:id : Supply an identifier name for this view, to later retrieve it  with View.findViewById() or Activity.findViewById().  [reference] 
- android:tag : Supply a tag for this view containing a String, to be retrieved  later with View.getTag() or searched for with View.findViewWithTag() .  [string] 
- android:scrollX : The initial horizontal scroll offset, in pixels.  [dimension] 
- android:scrollY : The initial vertical scroll offset, in pixels.  [dimension] 
- android:background : A drawable to use as the background.  [reference, color] 
- android:padding : Sets the padding, in pixels, of all four edges.  [dimension] 
- android:paddingLeft : Sets the padding, in pixels, of the left edge; see padding.  [dimension] 
- android:paddingTop : Sets the padding, in pixels, of the top edge; see padding.  [dimension] 
- android:paddingRight : Sets the padding, in pixels, of the right edge; see padding.  [dimension] 
- android:paddingBottom : Sets the padding, in pixels, of the bottom edge; see padding.  [dimension] 
- android:focusable : Boolean that controls whether a view can take focus.  [boolean] 
- android:focusableInTouchMode : Boolean that controls whether a view can take focus while in  touch mode.  [boolean] 
- android:visibility : Controls the initial visibility of the view.  [enum] 
- android:fitsSystemWindows : Boolean internal attribute to adjust view layout based on system  windows such as the status bar.  [boolean] 
- android:scrollbars : Defines which scrollbars should be displayed on scrolling or  not.  [flag] 
- android:scrollbarStyle : Controls the scrollbar style and position.  [enum] 
- android:isScrollContainer : Set this if the view will serve as a scrolling container, meaing  that it can be resized to shrink its overall window so that there  will be space for an input method.  [boolean] 
- android:fadeScrollbars : Defines whether to fade out scrollbars when they are not in use.  [boolean] 
- android:scrollbarFadeDuration : Defines the delay in milliseconds that a scrollbar takes to fade  out.  [integer] 
- android:scrollbarDefaultDelayBeforeFade : Defines the delay in milliseconds that a scrollbar waits before  fade out.  [integer] 
- android:scrollbarSize : Sets the width of vertical scrollbars and height of horizontal  scrollbars.  [dimension] 
- android:scrollbarThumbHorizontal : Defines the horizontal scrollbar thumb drawable.  [reference] 
- android:scrollbarThumbVertical : Defines the vertical scrollbar thumb drawable.  [reference] 
- android:scrollbarTrackHorizontal : Defines the horizontal scrollbar track drawable.  [reference] 
- android:scrollbarTrackVertical : Defines the vertical scrollbar track drawable.  [reference] 
- android:scrollbarAlwaysDrawHorizontalTrack : Defines whether the horizontal scrollbar track should always  be drawn.  [boolean] 
- android:scrollbarAlwaysDrawVerticalTrack : Defines whether the vertical scrollbar track should always be  drawn.  [boolean] 
- android:fadingEdge : Defines which edges should be fadeded on scrolling.  [flag] 
- android:fadingEdgeLength : Defines the length of the fading edges.  [dimension] 
- android:nextFocusLeft : Defines the next view to give focus to when the next focus is FOCUS_LEFT.  [reference] 
- android:nextFocusRight : Defines the next view to give focus to when the next focus is FOCUS_RIGHT If the reference refers to a view that does not exist or is  part of a hierarchy that is invisible, a java.lang.RuntimeException will result when the  reference is accessed.  [reference] 
- android:nextFocusUp : Defines the next view to give focus to when the next focus is FOCUS_UP If the reference refers to a view that does not exist or is  part of a hierarchy that is invisible, a java.lang.RuntimeException will result when the  reference is accessed.  [reference] 
- android:nextFocusDown : Defines the next view to give focus to when the next focus is FOCUS_DOWN If the reference refers to a view that does not exist or is  part of a hierarchy that is invisible, a java.lang.RuntimeException will result when the  reference is accessed.  [reference] 
- android:nextFocusForward : Defines the next view to give focus to when the next focus is FOCUS_FORWARD If the reference refers to a view that does not exist or is  part of a hierarchy that is invisible, a java.lang.RuntimeException will result when the  reference is accessed.  [reference] 
- android:clickable : Defines whether this view reacts to click events.  [boolean] 
- android:longClickable : Defines whether this view reacts to long click events.  [boolean] 
- android:saveEnabled : If unset, no state will be saved for this view when it is being  frozen.  [boolean] 
- android:filterTouchesWhenObscured : Specifies whether to filter touches when the view's window is  obscured by another visible window.  [boolean] 
- android:drawingCacheQuality : Defines the quality of translucent drawing caches.  [enum] 
- android:keepScreenOn : Controls whether the view's window should keep the screen on  while visible.  [boolean] 
- android:duplicateParentState : When this attribute is set to true, the view gets its drawable  state (focused, pressed, etc.) from its direct parent rather  than from itself.  [boolean] 
- android:minHeight : Defines the minimum height of the view.
- android:minWidth : Defines the minimum width of the view.
- android:soundEffectsEnabled : Boolean that controls whether a view should have sound effects  enabled for events such as clicking and touching.  [boolean] 
- android:hapticFeedbackEnabled : Boolean that controls whether a view should have haptic feedback  enabled for events such as long presses.  [boolean] 
- android:contentDescription : Defines text that briefly describes content of the view.  [string] 
- android:onClick : Name of the method in this View's context to invoke when the  view is clicked.  [string] 
- android:overScrollMode : Defines over-scrolling behavior.  [enum] 
- android:alpha : alpha property of the view, as a value between 0 (completely  transparent) and 1 (completely opaque).  [float] 
- android:translationX : translation in x of the view.  [dimension] 
- android:translationY : translation in y of the view.  [dimension] 
- android:transformPivotX : x location of the pivot point around which the view will rotate  and scale.  [dimension] 
- android:transformPivotY : y location of the pivot point around which the view will rotate  and scale.  [dimension] 
- android:rotation : rotation of the view, in degrees.  [float] 
- android:rotationX : rotation of the view around the x axis, in degrees.  [float] 
- android:rotationY : rotation of the view around the y axis, in degrees.  [float] 
- android:scaleX : scale of the view in the x direction.  [float] 
- android:scaleY : scale of the view in the y direction.  [float] 
- android:verticalScrollbarPosition : Determines which side the vertical scroll bar should be placed  on.  [enum] 
- android:layerType : Specifies the type of layer backing this view.  [enum] 
- android:layout_width : Specifies the basic width of the view.  [dimension, enum] 
- android:layout_height : Specifies the basic height of the view.  [dimension, enum] 
- android:layout_weight : [float] 
- android:layout_gravity : Standard gravity constant that a child can supply to its parent.  [flag] 
- android:layout_margin : Specifies extra space on the left, top, right and bottom sides  of this view.  [dimension] 
- android:layout_marginLeft : Specifies extra space on the left side of this view.  [dimension] 
- android:layout_marginTop : Specifies extra space on the top side of this view.  [dimension] 
- android:layout_marginRight : Specifies extra space on the right side of this view.  [dimension] 
- android:layout_marginBottom : Specifies extra space on the bottom side of this view.  [dimension] 
+style : A reference to a custom style  [reference]
+android:bufferType : Determines the minimum type that getText() will return.  [enum]
+android:text : Text to display.  [string]
+android:hint : Hint text to display when the text is empty.  [string]
+android:textColor : Text color.  [reference, color]
+android:textColorHighlight : Color of the text selection highlight.  [reference, color]
+android:textColorHint : Color of the hint text.  [reference, color]
+android:textAppearance : Base text color, typeface, size, and style.  [reference]
+android:textSize : Size of the text.  [dimension]
+android:textScaleX : Sets the horizontal scaling factor for the text.  [float]
+android:typeface : Typeface (normal, sans, serif, monospace) for the text.  [enum]
+android:textStyle : Style (bold, italic, bolditalic) for the text.  [flag]
+android:textColorLink : Text color for links.  [reference, color]
+android:cursorVisible : Makes the cursor visible (the default) or invisible.  [boolean]
+android:maxLines : Makes the TextView be at most this many lines tall.  [integer]
+android:maxHeight : Makes the TextView be at most this many pixels tall.  [dimension]
+android:lines : Makes the TextView be exactly this many lines tall.  [integer]
+android:height : Makes the TextView be exactly this many pixels tall.  [dimension]
+android:minLines : Makes the TextView be at least this many lines tall.  [integer]
+android:minHeight : Makes the TextView be at least this many pixels tall.  [dimension]
+android:maxEms : Makes the TextView be at most this many ems wide.  [integer]
+android:maxWidth : Makes the TextView be at most this many pixels wide.  [dimension]
+android:ems : Makes the TextView be exactly this many ems wide.  [integer]
+android:width : Makes the TextView be exactly this many pixels wide.  [dimension]
+android:minEms : Makes the TextView be at least this many ems wide.  [integer]
+android:minWidth : Makes the TextView be at least this many pixels wide.  [dimension]
+android:gravity : Specifies how to align the text by the view's x- and/or y-axis  when the text is smaller than the view.  [flag]
+android:scrollHorizontally : Whether the text is allowed to be wider than the view (and therefore  can be scrolled horizontally).  [boolean]
+android:password : Whether the characters of the field are displayed as password  dots instead of themselves. * Deprecated: Use inputType instead.  [boolean]
+android:singleLine : Constrains the text to a single horizontally scrolling line instead  of letting it wrap onto multiple lines, and advances focus instead  of inserting a newline when you press the enter key. * Deprecated: This attribute is deprecated and is replaced by  the textMultiLine flag in the inputType attribute. Use caution  when altering existing layouts, as the default value of singeLine  is false (multi-line mode), but if you specify any value for  inputType, the default is single-line mode. (If both singleLine  and inputType attributes are found, the inputType flags will  override the value of singleLine.).  [boolean]
+android:enabled : Specifies whether the TextView is enabled or not. * Deprecated: Use state_enabled instead.  [boolean]
+android:selectAllOnFocus : If the text is selectable, select it all when the view takes  focus instead of moving the cursor to the start or end.  [boolean]
+android:includeFontPadding : Leave enough room for ascenders and descenders instead of using  the font ascent and descent strictly.  [boolean]
+android:maxLength : Set an input filter to constrain the text length to the specified  number.  [integer]
+android:shadowColor : Place a shadow of the specified color behind the text.  [color]
+android:shadowDx : Horizontal offset of the shadow.  [float]
+android:shadowDy : Vertical offset of the shadow.  [float]
+android:shadowRadius : Radius of the shadow.  [float]
+android:autoLink : Controls whether links such as urls and email addresses are automatically  found and converted to clickable links.  [flag]
+android:linksClickable : If set to false, keeps the movement method from being set to  the link movement method even if autoLink causes links to be  found.  [boolean]
+android:numeric : If set, specifies that this TextView has a numeric input method. * Deprecated: Use inputType instead.  [flag]
+android:digits : If set, specifies that this TextView has a numeric input method  and that these specific characters are the ones that it will  accept.  [string]
+android:phoneNumber : If set, specifies that this TextView has a phone number input  method. * Deprecated: Use inputType instead.  [boolean]
+android:inputMethod : If set, specifies that this TextView should use the specified  input method (specified by fully-qualified class name). * Deprecated: Use inputType instead.  [string]
+android:capitalize : If set, specifies that this TextView has a textual input method  and should automatically capitalize what the user types. * Deprecated: Use inputType instead.  [enum]
+android:autoText : If set, specifies that this TextView has a textual input method  and automatically corrects some common spelling errors. * Deprecated: Use inputType instead.  [boolean]
+android:editable : If set, specifies that this TextView has an input method. * Deprecated: Use inputType instead.  [boolean]
+android:freezesText : If set, the text view will include its current complete text  inside of its frozen icicle in addition to meta-data such as  the current cursor position.  [boolean]
+android:ellipsize : If set, causes words that are longer than the view is wide to  be ellipsized instead of broken in the middle.  [enum]
+android:drawableTop : The drawable to be drawn above the text.  [reference, color]
+android:drawableBottom : The drawable to be drawn below the text.  [reference, color]
+android:drawableLeft : The drawable to be drawn to the left of the text.  [reference, color]
+android:drawableRight : The drawable to be drawn to the right of the text.  [reference, color]
+android:drawablePadding : The padding between the drawables and the text.  [dimension]
+android:lineSpacingExtra : Extra spacing between lines of text.  [dimension]
+android:lineSpacingMultiplier : Extra spacing between lines of text, as a multiplier.  [float]
+android:marqueeRepeatLimit : The number of times to repeat the marquee animation.  [integer, enum]
+android:inputType : The type of data being placed in a text field, used to help an  input method decide how to let the user enter text.  [flag]
+android:imeOptions : Additional features you can enable in an IME associated with  an editor to improve the integration with your application.  [flag]
+android:privateImeOptions : An addition content type description to supply to the input method  attached to the text view, which is private to the implementation  of the input method.  [string]
+android:imeActionLabel : Supply a value for EditorInfo.actionLabel used when an input  method is connected to the text view.  [string]
+android:imeActionId : Supply a value for EditorInfo.actionId used when an input method  is connected to the text view.  [integer]
+android:editorExtras : Reference to an "input-extras" XML resource containing additional  data to supply to an input method, which is private to the implementation  of the input method.  [reference]
+android:textSelectHandleLeft : Reference to a drawable that will be used to display a text selection  anchor on the left side of a selection region.  [reference]
+android:textSelectHandleRight : Reference to a drawable that will be used to display a text selection  anchor on the right side of a selection region.  [reference]
+android:textSelectHandle : Reference to a drawable that will be used to display a text selection  anchor for positioning the cursor within text.  [reference]
+android:textEditPasteWindowLayout : The layout of the view that is displayed on top of the cursor  to paste inside a TextEdit field.  [reference]
+android:textEditNoPasteWindowLayout : Variation of textEditPasteWindowLayout displayed when the clipboard  is empty.  [reference]
+android:textEditSidePasteWindowLayout : Used instead of textEditPasteWindowLayout when the window is  moved on the side of the insertion cursor because it would be  clipped if it were positioned on top.  [reference]
+android:textEditSideNoPasteWindowLayout : Variation of textEditSidePasteWindowLayout displayed when the  clipboard is empty.  [reference]
+android:textCursorDrawable : Reference to a drawable that will be drawn under the insertion  cursor.  [reference]
+android:textIsSelectable : Indicates that the content of a non-editable text can be selected.  [boolean]
+android:id : Supply an identifier name for this view, to later retrieve it  with View.findViewById() or Activity.findViewById().  [reference]
+android:tag : Supply a tag for this view containing a String, to be retrieved  later with View.getTag() or searched for with View.findViewWithTag() .  [string]
+android:scrollX : The initial horizontal scroll offset, in pixels.  [dimension]
+android:scrollY : The initial vertical scroll offset, in pixels.  [dimension]
+android:background : A drawable to use as the background.  [reference, color]
+android:padding : Sets the padding, in pixels, of all four edges.  [dimension]
+android:paddingLeft : Sets the padding, in pixels, of the left edge; see padding.  [dimension]
+android:paddingTop : Sets the padding, in pixels, of the top edge; see padding.  [dimension]
+android:paddingRight : Sets the padding, in pixels, of the right edge; see padding.  [dimension]
+android:paddingBottom : Sets the padding, in pixels, of the bottom edge; see padding.  [dimension]
+android:focusable : Boolean that controls whether a view can take focus.  [boolean]
+android:focusableInTouchMode : Boolean that controls whether a view can take focus while in  touch mode.  [boolean]
+android:visibility : Controls the initial visibility of the view.  [enum]
+android:fitsSystemWindows : Boolean internal attribute to adjust view layout based on system  windows such as the status bar.  [boolean]
+android:scrollbars : Defines which scrollbars should be displayed on scrolling or  not.  [flag]
+android:scrollbarStyle : Controls the scrollbar style and position.  [enum]
+android:isScrollContainer : Set this if the view will serve as a scrolling container, meaing  that it can be resized to shrink its overall window so that there  will be space for an input method.  [boolean]
+android:fadeScrollbars : Defines whether to fade out scrollbars when they are not in use.  [boolean]
+android:scrollbarFadeDuration : Defines the delay in milliseconds that a scrollbar takes to fade  out.  [integer]
+android:scrollbarDefaultDelayBeforeFade : Defines the delay in milliseconds that a scrollbar waits before  fade out.  [integer]
+android:scrollbarSize : Sets the width of vertical scrollbars and height of horizontal  scrollbars.  [dimension]
+android:scrollbarThumbHorizontal : Defines the horizontal scrollbar thumb drawable.  [reference]
+android:scrollbarThumbVertical : Defines the vertical scrollbar thumb drawable.  [reference]
+android:scrollbarTrackHorizontal : Defines the horizontal scrollbar track drawable.  [reference]
+android:scrollbarTrackVertical : Defines the vertical scrollbar track drawable.  [reference]
+android:scrollbarAlwaysDrawHorizontalTrack : Defines whether the horizontal scrollbar track should always  be drawn.  [boolean]
+android:scrollbarAlwaysDrawVerticalTrack : Defines whether the vertical scrollbar track should always be  drawn.  [boolean]
+android:fadingEdge : Defines which edges should be fadeded on scrolling.  [flag]
+android:fadingEdgeLength : Defines the length of the fading edges.  [dimension]
+android:nextFocusLeft : Defines the next view to give focus to when the next focus is FOCUS_LEFT.  [reference]
+android:nextFocusRight : Defines the next view to give focus to when the next focus is FOCUS_RIGHT If the reference refers to a view that does not exist or is  part of a hierarchy that is invisible, a java.lang.RuntimeException will result when the  reference is accessed.  [reference]
+android:nextFocusUp : Defines the next view to give focus to when the next focus is FOCUS_UP If the reference refers to a view that does not exist or is  part of a hierarchy that is invisible, a java.lang.RuntimeException will result when the  reference is accessed.  [reference]
+android:nextFocusDown : Defines the next view to give focus to when the next focus is FOCUS_DOWN If the reference refers to a view that does not exist or is  part of a hierarchy that is invisible, a java.lang.RuntimeException will result when the  reference is accessed.  [reference]
+android:nextFocusForward : Defines the next view to give focus to when the next focus is FOCUS_FORWARD If the reference refers to a view that does not exist or is  part of a hierarchy that is invisible, a java.lang.RuntimeException will result when the  reference is accessed.  [reference]
+android:clickable : Defines whether this view reacts to click events.  [boolean]
+android:longClickable : Defines whether this view reacts to long click events.  [boolean]
+android:saveEnabled : If unset, no state will be saved for this view when it is being  frozen.  [boolean]
+android:filterTouchesWhenObscured : Specifies whether to filter touches when the view's window is  obscured by another visible window.  [boolean]
+android:drawingCacheQuality : Defines the quality of translucent drawing caches.  [enum]
+android:keepScreenOn : Controls whether the view's window should keep the screen on  while visible.  [boolean]
+android:duplicateParentState : When this attribute is set to true, the view gets its drawable  state (focused, pressed, etc.) from its direct parent rather  than from itself.  [boolean]
+android:minHeight : Defines the minimum height of the view.
+android:minWidth : Defines the minimum width of the view.
+android:soundEffectsEnabled : Boolean that controls whether a view should have sound effects  enabled for events such as clicking and touching.  [boolean]
+android:hapticFeedbackEnabled : Boolean that controls whether a view should have haptic feedback  enabled for events such as long presses.  [boolean]
+android:contentDescription : Defines text that briefly describes content of the view.  [string]
+android:onClick : Name of the method in this View's context to invoke when the  view is clicked.  [string]
+android:overScrollMode : Defines over-scrolling behavior.  [enum]
+android:alpha : alpha property of the view, as a value between 0 (completely  transparent) and 1 (completely opaque).  [float]
+android:translationX : translation in x of the view.  [dimension]
+android:translationY : translation in y of the view.  [dimension]
+android:transformPivotX : x location of the pivot point around which the view will rotate  and scale.  [dimension]
+android:transformPivotY : y location of the pivot point around which the view will rotate  and scale.  [dimension]
+android:rotation : rotation of the view, in degrees.  [float]
+android:rotationX : rotation of the view around the x axis, in degrees.  [float]
+android:rotationY : rotation of the view around the y axis, in degrees.  [float]
+android:scaleX : scale of the view in the x direction.  [float]
+android:scaleY : scale of the view in the y direction.  [float]
+android:verticalScrollbarPosition : Determines which side the vertical scroll bar should be placed  on.  [enum]
+android:layerType : Specifies the type of layer backing this view.  [enum]
+android:layout_width : Specifies the basic width of the view.  [dimension, enum]
+android:layout_height : Specifies the basic height of the view.  [dimension, enum]
+android:layout_weight : [float]
+android:layout_gravity : Standard gravity constant that a child can supply to its parent.  [flag]
+android:layout_margin : Specifies extra space on the left, top, right and bottom sides  of this view.  [dimension]
+android:layout_marginLeft : Specifies extra space on the left side of this view.  [dimension]
+android:layout_marginTop : Specifies extra space on the top side of this view.  [dimension]
+android:layout_marginRight : Specifies extra space on the right side of this view.  [dimension]
+android:layout_marginBottom : Specifies extra space on the bottom side of this view.  [dimension]
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion1-expected-completion8.txt b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion1-expected-completion8.txt
index bee7f93..a364bc3 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion1-expected-completion8.txt
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion1-expected-completion8.txt
@@ -1,2 +1,2 @@
 Code completion in completion1.xml for layout_width^="fill_parent":
-android:layout_width : Specifies the basic width of the view.  [dimension, enum] 
+android:layout_width : Specifies the basic width of the view.  [dimension, enum]
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion5-expected-completion40.txt b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion5-expected-completion40.txt
index 0b5aa7e..138e225 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion5-expected-completion40.txt
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion5-expected-completion40.txt
@@ -1,142 +1,142 @@
 Code completion in completion5.xml for android:id='@+id/button2'^:
- style : A reference to a custom style  [reference] 
- android:bufferType : Determines the minimum type that getText() will return.  [enum] 
- android:text : Text to display.  [string] 
- android:hint : Hint text to display when the text is empty.  [string] 
- android:textColor : Text color.  [reference, color] 
- android:textColorHighlight : Color of the text selection highlight.  [reference, color] 
- android:textColorHint : Color of the hint text.  [reference, color] 
- android:textAppearance : Base text color, typeface, size, and style.  [reference] 
- android:textSize : Size of the text.  [dimension] 
- android:textScaleX : Sets the horizontal scaling factor for the text.  [float] 
- android:typeface : Typeface (normal, sans, serif, monospace) for the text.  [enum] 
- android:textStyle : Style (bold, italic, bolditalic) for the text.  [flag] 
- android:textColorLink : Text color for links.  [reference, color] 
- android:cursorVisible : Makes the cursor visible (the default) or invisible.  [boolean] 
- android:maxLines : Makes the TextView be at most this many lines tall.  [integer] 
- android:maxHeight : Makes the TextView be at most this many pixels tall.  [dimension] 
- android:lines : Makes the TextView be exactly this many lines tall.  [integer] 
- android:height : Makes the TextView be exactly this many pixels tall.  [dimension] 
- android:minLines : Makes the TextView be at least this many lines tall.  [integer] 
- android:minHeight : Makes the TextView be at least this many pixels tall.  [dimension] 
- android:maxEms : Makes the TextView be at most this many ems wide.  [integer] 
- android:maxWidth : Makes the TextView be at most this many pixels wide.  [dimension] 
- android:ems : Makes the TextView be exactly this many ems wide.  [integer] 
- android:width : Makes the TextView be exactly this many pixels wide.  [dimension] 
- android:minEms : Makes the TextView be at least this many ems wide.  [integer] 
- android:minWidth : Makes the TextView be at least this many pixels wide.  [dimension] 
- android:gravity : Specifies how to align the text by the view's x- and/or y-axis  when the text is smaller than the view.  [flag] 
- android:scrollHorizontally : Whether the text is allowed to be wider than the view (and therefore  can be scrolled horizontally).  [boolean] 
- android:password : Whether the characters of the field are displayed as password  dots instead of themselves. * Deprecated: Use inputType instead.  [boolean] 
- android:singleLine : Constrains the text to a single horizontally scrolling line instead  of letting it wrap onto multiple lines, and advances focus instead  of inserting a newline when you press the enter key. * Deprecated: This attribute is deprecated and is replaced by  the textMultiLine flag in the inputType attribute. Use caution  when altering existing layouts, as the default value of singeLine  is false (multi-line mode), but if you specify any value for  inputType, the default is single-line mode. (If both singleLine  and inputType attributes are found, the inputType flags will  override the value of singleLine.).  [boolean] 
- android:enabled : Specifies whether the TextView is enabled or not. * Deprecated: Use state_enabled instead.  [boolean] 
- android:selectAllOnFocus : If the text is selectable, select it all when the view takes  focus instead of moving the cursor to the start or end.  [boolean] 
- android:includeFontPadding : Leave enough room for ascenders and descenders instead of using  the font ascent and descent strictly.  [boolean] 
- android:maxLength : Set an input filter to constrain the text length to the specified  number.  [integer] 
- android:shadowColor : Place a shadow of the specified color behind the text.  [color] 
- android:shadowDx : Horizontal offset of the shadow.  [float] 
- android:shadowDy : Vertical offset of the shadow.  [float] 
- android:shadowRadius : Radius of the shadow.  [float] 
- android:autoLink : Controls whether links such as urls and email addresses are automatically  found and converted to clickable links.  [flag] 
- android:linksClickable : If set to false, keeps the movement method from being set to  the link movement method even if autoLink causes links to be  found.  [boolean] 
- android:numeric : If set, specifies that this TextView has a numeric input method. * Deprecated: Use inputType instead.  [flag] 
- android:digits : If set, specifies that this TextView has a numeric input method  and that these specific characters are the ones that it will  accept.  [string] 
- android:phoneNumber : If set, specifies that this TextView has a phone number input  method. * Deprecated: Use inputType instead.  [boolean] 
- android:inputMethod : If set, specifies that this TextView should use the specified  input method (specified by fully-qualified class name). * Deprecated: Use inputType instead.  [string] 
- android:capitalize : If set, specifies that this TextView has a textual input method  and should automatically capitalize what the user types. * Deprecated: Use inputType instead.  [enum] 
- android:autoText : If set, specifies that this TextView has a textual input method  and automatically corrects some common spelling errors. * Deprecated: Use inputType instead.  [boolean] 
- android:editable : If set, specifies that this TextView has an input method. * Deprecated: Use inputType instead.  [boolean] 
- android:freezesText : If set, the text view will include its current complete text  inside of its frozen icicle in addition to meta-data such as  the current cursor position.  [boolean] 
- android:ellipsize : If set, causes words that are longer than the view is wide to  be ellipsized instead of broken in the middle.  [enum] 
- android:drawableTop : The drawable to be drawn above the text.  [reference, color] 
- android:drawableBottom : The drawable to be drawn below the text.  [reference, color] 
- android:drawableLeft : The drawable to be drawn to the left of the text.  [reference, color] 
- android:drawableRight : The drawable to be drawn to the right of the text.  [reference, color] 
- android:drawablePadding : The padding between the drawables and the text.  [dimension] 
- android:lineSpacingExtra : Extra spacing between lines of text.  [dimension] 
- android:lineSpacingMultiplier : Extra spacing between lines of text, as a multiplier.  [float] 
- android:marqueeRepeatLimit : The number of times to repeat the marquee animation.  [integer, enum] 
- android:inputType : The type of data being placed in a text field, used to help an  input method decide how to let the user enter text.  [flag] 
- android:imeOptions : Additional features you can enable in an IME associated with  an editor to improve the integration with your application.  [flag] 
- android:privateImeOptions : An addition content type description to supply to the input method  attached to the text view, which is private to the implementation  of the input method.  [string] 
- android:imeActionLabel : Supply a value for EditorInfo.actionLabel used when an input  method is connected to the text view.  [string] 
- android:imeActionId : Supply a value for EditorInfo.actionId used when an input method  is connected to the text view.  [integer] 
- android:editorExtras : Reference to an "input-extras" XML resource containing additional  data to supply to an input method, which is private to the implementation  of the input method.  [reference] 
- android:textSelectHandleLeft : Reference to a drawable that will be used to display a text selection  anchor on the left side of a selection region.  [reference] 
- android:textSelectHandleRight : Reference to a drawable that will be used to display a text selection  anchor on the right side of a selection region.  [reference] 
- android:textSelectHandle : Reference to a drawable that will be used to display a text selection  anchor for positioning the cursor within text.  [reference] 
- android:textEditPasteWindowLayout : The layout of the view that is displayed on top of the cursor  to paste inside a TextEdit field.  [reference] 
- android:textEditNoPasteWindowLayout : Variation of textEditPasteWindowLayout displayed when the clipboard  is empty.  [reference] 
- android:textEditSidePasteWindowLayout : Used instead of textEditPasteWindowLayout when the window is  moved on the side of the insertion cursor because it would be  clipped if it were positioned on top.  [reference] 
- android:textEditSideNoPasteWindowLayout : Variation of textEditSidePasteWindowLayout displayed when the  clipboard is empty.  [reference] 
- android:textCursorDrawable : Reference to a drawable that will be drawn under the insertion  cursor.  [reference] 
- android:textIsSelectable : Indicates that the content of a non-editable text can be selected.  [boolean] 
- android:id : Supply an identifier name for this view, to later retrieve it  with View.findViewById() or Activity.findViewById().  [reference] 
- android:tag : Supply a tag for this view containing a String, to be retrieved  later with View.getTag() or searched for with View.findViewWithTag() .  [string] 
- android:scrollX : The initial horizontal scroll offset, in pixels.  [dimension] 
- android:scrollY : The initial vertical scroll offset, in pixels.  [dimension] 
- android:background : A drawable to use as the background.  [reference, color] 
- android:padding : Sets the padding, in pixels, of all four edges.  [dimension] 
- android:paddingLeft : Sets the padding, in pixels, of the left edge; see padding.  [dimension] 
- android:paddingTop : Sets the padding, in pixels, of the top edge; see padding.  [dimension] 
- android:paddingRight : Sets the padding, in pixels, of the right edge; see padding.  [dimension] 
- android:paddingBottom : Sets the padding, in pixels, of the bottom edge; see padding.  [dimension] 
- android:focusable : Boolean that controls whether a view can take focus.  [boolean] 
- android:focusableInTouchMode : Boolean that controls whether a view can take focus while in  touch mode.  [boolean] 
- android:visibility : Controls the initial visibility of the view.  [enum] 
- android:fitsSystemWindows : Boolean internal attribute to adjust view layout based on system  windows such as the status bar.  [boolean] 
- android:scrollbars : Defines which scrollbars should be displayed on scrolling or  not.  [flag] 
- android:scrollbarStyle : Controls the scrollbar style and position.  [enum] 
- android:isScrollContainer : Set this if the view will serve as a scrolling container, meaing  that it can be resized to shrink its overall window so that there  will be space for an input method.  [boolean] 
- android:fadeScrollbars : Defines whether to fade out scrollbars when they are not in use.  [boolean] 
- android:scrollbarFadeDuration : Defines the delay in milliseconds that a scrollbar takes to fade  out.  [integer] 
- android:scrollbarDefaultDelayBeforeFade : Defines the delay in milliseconds that a scrollbar waits before  fade out.  [integer] 
- android:scrollbarSize : Sets the width of vertical scrollbars and height of horizontal  scrollbars.  [dimension] 
- android:scrollbarThumbHorizontal : Defines the horizontal scrollbar thumb drawable.  [reference] 
- android:scrollbarThumbVertical : Defines the vertical scrollbar thumb drawable.  [reference] 
- android:scrollbarTrackHorizontal : Defines the horizontal scrollbar track drawable.  [reference] 
- android:scrollbarTrackVertical : Defines the vertical scrollbar track drawable.  [reference] 
- android:scrollbarAlwaysDrawHorizontalTrack : Defines whether the horizontal scrollbar track should always  be drawn.  [boolean] 
- android:scrollbarAlwaysDrawVerticalTrack : Defines whether the vertical scrollbar track should always be  drawn.  [boolean] 
- android:fadingEdge : Defines which edges should be fadeded on scrolling.  [flag] 
- android:fadingEdgeLength : Defines the length of the fading edges.  [dimension] 
- android:nextFocusLeft : Defines the next view to give focus to when the next focus is FOCUS_LEFT.  [reference] 
- android:nextFocusRight : Defines the next view to give focus to when the next focus is FOCUS_RIGHT If the reference refers to a view that does not exist or is  part of a hierarchy that is invisible, a java.lang.RuntimeException will result when the  reference is accessed.  [reference] 
- android:nextFocusUp : Defines the next view to give focus to when the next focus is FOCUS_UP If the reference refers to a view that does not exist or is  part of a hierarchy that is invisible, a java.lang.RuntimeException will result when the  reference is accessed.  [reference] 
- android:nextFocusDown : Defines the next view to give focus to when the next focus is FOCUS_DOWN If the reference refers to a view that does not exist or is  part of a hierarchy that is invisible, a java.lang.RuntimeException will result when the  reference is accessed.  [reference] 
- android:nextFocusForward : Defines the next view to give focus to when the next focus is FOCUS_FORWARD If the reference refers to a view that does not exist or is  part of a hierarchy that is invisible, a java.lang.RuntimeException will result when the  reference is accessed.  [reference] 
- android:clickable : Defines whether this view reacts to click events.  [boolean] 
- android:longClickable : Defines whether this view reacts to long click events.  [boolean] 
- android:saveEnabled : If unset, no state will be saved for this view when it is being  frozen.  [boolean] 
- android:filterTouchesWhenObscured : Specifies whether to filter touches when the view's window is  obscured by another visible window.  [boolean] 
- android:drawingCacheQuality : Defines the quality of translucent drawing caches.  [enum] 
- android:keepScreenOn : Controls whether the view's window should keep the screen on  while visible.  [boolean] 
- android:duplicateParentState : When this attribute is set to true, the view gets its drawable  state (focused, pressed, etc.) from its direct parent rather  than from itself.  [boolean] 
- android:minHeight : Defines the minimum height of the view.
- android:minWidth : Defines the minimum width of the view.
- android:soundEffectsEnabled : Boolean that controls whether a view should have sound effects  enabled for events such as clicking and touching.  [boolean] 
- android:hapticFeedbackEnabled : Boolean that controls whether a view should have haptic feedback  enabled for events such as long presses.  [boolean] 
- android:contentDescription : Defines text that briefly describes content of the view.  [string] 
- android:onClick : Name of the method in this View's context to invoke when the  view is clicked.  [string] 
- android:overScrollMode : Defines over-scrolling behavior.  [enum] 
- android:alpha : alpha property of the view, as a value between 0 (completely  transparent) and 1 (completely opaque).  [float] 
- android:translationX : translation in x of the view.  [dimension] 
- android:translationY : translation in y of the view.  [dimension] 
- android:transformPivotX : x location of the pivot point around which the view will rotate  and scale.  [dimension] 
- android:transformPivotY : y location of the pivot point around which the view will rotate  and scale.  [dimension] 
- android:rotation : rotation of the view, in degrees.  [float] 
- android:rotationX : rotation of the view around the x axis, in degrees.  [float] 
- android:rotationY : rotation of the view around the y axis, in degrees.  [float] 
- android:scaleX : scale of the view in the x direction.  [float] 
- android:scaleY : scale of the view in the y direction.  [float] 
- android:verticalScrollbarPosition : Determines which side the vertical scroll bar should be placed  on.  [enum] 
- android:layerType : Specifies the type of layer backing this view.  [enum] 
- android:layout_width : Specifies the basic width of the view.  [dimension, enum] 
- android:layout_height : Specifies the basic height of the view.  [dimension, enum] 
- android:layout_weight : [float] 
- android:layout_gravity : Standard gravity constant that a child can supply to its parent.  [flag] 
- android:layout_margin : Specifies extra space on the left, top, right and bottom sides  of this view.  [dimension] 
- android:layout_marginLeft : Specifies extra space on the left side of this view.  [dimension] 
- android:layout_marginTop : Specifies extra space on the top side of this view.  [dimension] 
- android:layout_marginRight : Specifies extra space on the right side of this view.  [dimension] 
- android:layout_marginBottom : Specifies extra space on the bottom side of this view.  [dimension] 
+style : A reference to a custom style  [reference]
+android:bufferType : Determines the minimum type that getText() will return.  [enum]
+android:text : Text to display.  [string]
+android:hint : Hint text to display when the text is empty.  [string]
+android:textColor : Text color.  [reference, color]
+android:textColorHighlight : Color of the text selection highlight.  [reference, color]
+android:textColorHint : Color of the hint text.  [reference, color]
+android:textAppearance : Base text color, typeface, size, and style.  [reference]
+android:textSize : Size of the text.  [dimension]
+android:textScaleX : Sets the horizontal scaling factor for the text.  [float]
+android:typeface : Typeface (normal, sans, serif, monospace) for the text.  [enum]
+android:textStyle : Style (bold, italic, bolditalic) for the text.  [flag]
+android:textColorLink : Text color for links.  [reference, color]
+android:cursorVisible : Makes the cursor visible (the default) or invisible.  [boolean]
+android:maxLines : Makes the TextView be at most this many lines tall.  [integer]
+android:maxHeight : Makes the TextView be at most this many pixels tall.  [dimension]
+android:lines : Makes the TextView be exactly this many lines tall.  [integer]
+android:height : Makes the TextView be exactly this many pixels tall.  [dimension]
+android:minLines : Makes the TextView be at least this many lines tall.  [integer]
+android:minHeight : Makes the TextView be at least this many pixels tall.  [dimension]
+android:maxEms : Makes the TextView be at most this many ems wide.  [integer]
+android:maxWidth : Makes the TextView be at most this many pixels wide.  [dimension]
+android:ems : Makes the TextView be exactly this many ems wide.  [integer]
+android:width : Makes the TextView be exactly this many pixels wide.  [dimension]
+android:minEms : Makes the TextView be at least this many ems wide.  [integer]
+android:minWidth : Makes the TextView be at least this many pixels wide.  [dimension]
+android:gravity : Specifies how to align the text by the view's x- and/or y-axis  when the text is smaller than the view.  [flag]
+android:scrollHorizontally : Whether the text is allowed to be wider than the view (and therefore  can be scrolled horizontally).  [boolean]
+android:password : Whether the characters of the field are displayed as password  dots instead of themselves. * Deprecated: Use inputType instead.  [boolean]
+android:singleLine : Constrains the text to a single horizontally scrolling line instead  of letting it wrap onto multiple lines, and advances focus instead  of inserting a newline when you press the enter key. * Deprecated: This attribute is deprecated and is replaced by  the textMultiLine flag in the inputType attribute. Use caution  when altering existing layouts, as the default value of singeLine  is false (multi-line mode), but if you specify any value for  inputType, the default is single-line mode. (If both singleLine  and inputType attributes are found, the inputType flags will  override the value of singleLine.).  [boolean]
+android:enabled : Specifies whether the TextView is enabled or not. * Deprecated: Use state_enabled instead.  [boolean]
+android:selectAllOnFocus : If the text is selectable, select it all when the view takes  focus instead of moving the cursor to the start or end.  [boolean]
+android:includeFontPadding : Leave enough room for ascenders and descenders instead of using  the font ascent and descent strictly.  [boolean]
+android:maxLength : Set an input filter to constrain the text length to the specified  number.  [integer]
+android:shadowColor : Place a shadow of the specified color behind the text.  [color]
+android:shadowDx : Horizontal offset of the shadow.  [float]
+android:shadowDy : Vertical offset of the shadow.  [float]
+android:shadowRadius : Radius of the shadow.  [float]
+android:autoLink : Controls whether links such as urls and email addresses are automatically  found and converted to clickable links.  [flag]
+android:linksClickable : If set to false, keeps the movement method from being set to  the link movement method even if autoLink causes links to be  found.  [boolean]
+android:numeric : If set, specifies that this TextView has a numeric input method. * Deprecated: Use inputType instead.  [flag]
+android:digits : If set, specifies that this TextView has a numeric input method  and that these specific characters are the ones that it will  accept.  [string]
+android:phoneNumber : If set, specifies that this TextView has a phone number input  method. * Deprecated: Use inputType instead.  [boolean]
+android:inputMethod : If set, specifies that this TextView should use the specified  input method (specified by fully-qualified class name). * Deprecated: Use inputType instead.  [string]
+android:capitalize : If set, specifies that this TextView has a textual input method  and should automatically capitalize what the user types. * Deprecated: Use inputType instead.  [enum]
+android:autoText : If set, specifies that this TextView has a textual input method  and automatically corrects some common spelling errors. * Deprecated: Use inputType instead.  [boolean]
+android:editable : If set, specifies that this TextView has an input method. * Deprecated: Use inputType instead.  [boolean]
+android:freezesText : If set, the text view will include its current complete text  inside of its frozen icicle in addition to meta-data such as  the current cursor position.  [boolean]
+android:ellipsize : If set, causes words that are longer than the view is wide to  be ellipsized instead of broken in the middle.  [enum]
+android:drawableTop : The drawable to be drawn above the text.  [reference, color]
+android:drawableBottom : The drawable to be drawn below the text.  [reference, color]
+android:drawableLeft : The drawable to be drawn to the left of the text.  [reference, color]
+android:drawableRight : The drawable to be drawn to the right of the text.  [reference, color]
+android:drawablePadding : The padding between the drawables and the text.  [dimension]
+android:lineSpacingExtra : Extra spacing between lines of text.  [dimension]
+android:lineSpacingMultiplier : Extra spacing between lines of text, as a multiplier.  [float]
+android:marqueeRepeatLimit : The number of times to repeat the marquee animation.  [integer, enum]
+android:inputType : The type of data being placed in a text field, used to help an  input method decide how to let the user enter text.  [flag]
+android:imeOptions : Additional features you can enable in an IME associated with  an editor to improve the integration with your application.  [flag]
+android:privateImeOptions : An addition content type description to supply to the input method  attached to the text view, which is private to the implementation  of the input method.  [string]
+android:imeActionLabel : Supply a value for EditorInfo.actionLabel used when an input  method is connected to the text view.  [string]
+android:imeActionId : Supply a value for EditorInfo.actionId used when an input method  is connected to the text view.  [integer]
+android:editorExtras : Reference to an "input-extras" XML resource containing additional  data to supply to an input method, which is private to the implementation  of the input method.  [reference]
+android:textSelectHandleLeft : Reference to a drawable that will be used to display a text selection  anchor on the left side of a selection region.  [reference]
+android:textSelectHandleRight : Reference to a drawable that will be used to display a text selection  anchor on the right side of a selection region.  [reference]
+android:textSelectHandle : Reference to a drawable that will be used to display a text selection  anchor for positioning the cursor within text.  [reference]
+android:textEditPasteWindowLayout : The layout of the view that is displayed on top of the cursor  to paste inside a TextEdit field.  [reference]
+android:textEditNoPasteWindowLayout : Variation of textEditPasteWindowLayout displayed when the clipboard  is empty.  [reference]
+android:textEditSidePasteWindowLayout : Used instead of textEditPasteWindowLayout when the window is  moved on the side of the insertion cursor because it would be  clipped if it were positioned on top.  [reference]
+android:textEditSideNoPasteWindowLayout : Variation of textEditSidePasteWindowLayout displayed when the  clipboard is empty.  [reference]
+android:textCursorDrawable : Reference to a drawable that will be drawn under the insertion  cursor.  [reference]
+android:textIsSelectable : Indicates that the content of a non-editable text can be selected.  [boolean]
+android:id : Supply an identifier name for this view, to later retrieve it  with View.findViewById() or Activity.findViewById().  [reference]
+android:tag : Supply a tag for this view containing a String, to be retrieved  later with View.getTag() or searched for with View.findViewWithTag() .  [string]
+android:scrollX : The initial horizontal scroll offset, in pixels.  [dimension]
+android:scrollY : The initial vertical scroll offset, in pixels.  [dimension]
+android:background : A drawable to use as the background.  [reference, color]
+android:padding : Sets the padding, in pixels, of all four edges.  [dimension]
+android:paddingLeft : Sets the padding, in pixels, of the left edge; see padding.  [dimension]
+android:paddingTop : Sets the padding, in pixels, of the top edge; see padding.  [dimension]
+android:paddingRight : Sets the padding, in pixels, of the right edge; see padding.  [dimension]
+android:paddingBottom : Sets the padding, in pixels, of the bottom edge; see padding.  [dimension]
+android:focusable : Boolean that controls whether a view can take focus.  [boolean]
+android:focusableInTouchMode : Boolean that controls whether a view can take focus while in  touch mode.  [boolean]
+android:visibility : Controls the initial visibility of the view.  [enum]
+android:fitsSystemWindows : Boolean internal attribute to adjust view layout based on system  windows such as the status bar.  [boolean]
+android:scrollbars : Defines which scrollbars should be displayed on scrolling or  not.  [flag]
+android:scrollbarStyle : Controls the scrollbar style and position.  [enum]
+android:isScrollContainer : Set this if the view will serve as a scrolling container, meaing  that it can be resized to shrink its overall window so that there  will be space for an input method.  [boolean]
+android:fadeScrollbars : Defines whether to fade out scrollbars when they are not in use.  [boolean]
+android:scrollbarFadeDuration : Defines the delay in milliseconds that a scrollbar takes to fade  out.  [integer]
+android:scrollbarDefaultDelayBeforeFade : Defines the delay in milliseconds that a scrollbar waits before  fade out.  [integer]
+android:scrollbarSize : Sets the width of vertical scrollbars and height of horizontal  scrollbars.  [dimension]
+android:scrollbarThumbHorizontal : Defines the horizontal scrollbar thumb drawable.  [reference]
+android:scrollbarThumbVertical : Defines the vertical scrollbar thumb drawable.  [reference]
+android:scrollbarTrackHorizontal : Defines the horizontal scrollbar track drawable.  [reference]
+android:scrollbarTrackVertical : Defines the vertical scrollbar track drawable.  [reference]
+android:scrollbarAlwaysDrawHorizontalTrack : Defines whether the horizontal scrollbar track should always  be drawn.  [boolean]
+android:scrollbarAlwaysDrawVerticalTrack : Defines whether the vertical scrollbar track should always be  drawn.  [boolean]
+android:fadingEdge : Defines which edges should be fadeded on scrolling.  [flag]
+android:fadingEdgeLength : Defines the length of the fading edges.  [dimension]
+android:nextFocusLeft : Defines the next view to give focus to when the next focus is FOCUS_LEFT.  [reference]
+android:nextFocusRight : Defines the next view to give focus to when the next focus is FOCUS_RIGHT If the reference refers to a view that does not exist or is  part of a hierarchy that is invisible, a java.lang.RuntimeException will result when the  reference is accessed.  [reference]
+android:nextFocusUp : Defines the next view to give focus to when the next focus is FOCUS_UP If the reference refers to a view that does not exist or is  part of a hierarchy that is invisible, a java.lang.RuntimeException will result when the  reference is accessed.  [reference]
+android:nextFocusDown : Defines the next view to give focus to when the next focus is FOCUS_DOWN If the reference refers to a view that does not exist or is  part of a hierarchy that is invisible, a java.lang.RuntimeException will result when the  reference is accessed.  [reference]
+android:nextFocusForward : Defines the next view to give focus to when the next focus is FOCUS_FORWARD If the reference refers to a view that does not exist or is  part of a hierarchy that is invisible, a java.lang.RuntimeException will result when the  reference is accessed.  [reference]
+android:clickable : Defines whether this view reacts to click events.  [boolean]
+android:longClickable : Defines whether this view reacts to long click events.  [boolean]
+android:saveEnabled : If unset, no state will be saved for this view when it is being  frozen.  [boolean]
+android:filterTouchesWhenObscured : Specifies whether to filter touches when the view's window is  obscured by another visible window.  [boolean]
+android:drawingCacheQuality : Defines the quality of translucent drawing caches.  [enum]
+android:keepScreenOn : Controls whether the view's window should keep the screen on  while visible.  [boolean]
+android:duplicateParentState : When this attribute is set to true, the view gets its drawable  state (focused, pressed, etc.) from its direct parent rather  than from itself.  [boolean]
+android:minHeight : Defines the minimum height of the view.
+android:minWidth : Defines the minimum width of the view.
+android:soundEffectsEnabled : Boolean that controls whether a view should have sound effects  enabled for events such as clicking and touching.  [boolean]
+android:hapticFeedbackEnabled : Boolean that controls whether a view should have haptic feedback  enabled for events such as long presses.  [boolean]
+android:contentDescription : Defines text that briefly describes content of the view.  [string]
+android:onClick : Name of the method in this View's context to invoke when the  view is clicked.  [string]
+android:overScrollMode : Defines over-scrolling behavior.  [enum]
+android:alpha : alpha property of the view, as a value between 0 (completely  transparent) and 1 (completely opaque).  [float]
+android:translationX : translation in x of the view.  [dimension]
+android:translationY : translation in y of the view.  [dimension]
+android:transformPivotX : x location of the pivot point around which the view will rotate  and scale.  [dimension]
+android:transformPivotY : y location of the pivot point around which the view will rotate  and scale.  [dimension]
+android:rotation : rotation of the view, in degrees.  [float]
+android:rotationX : rotation of the view around the x axis, in degrees.  [float]
+android:rotationY : rotation of the view around the y axis, in degrees.  [float]
+android:scaleX : scale of the view in the x direction.  [float]
+android:scaleY : scale of the view in the y direction.  [float]
+android:verticalScrollbarPosition : Determines which side the vertical scroll bar should be placed  on.  [enum]
+android:layerType : Specifies the type of layer backing this view.  [enum]
+android:layout_width : Specifies the basic width of the view.  [dimension, enum]
+android:layout_height : Specifies the basic height of the view.  [dimension, enum]
+android:layout_weight : [float]
+android:layout_gravity : Standard gravity constant that a child can supply to its parent.  [flag]
+android:layout_margin : Specifies extra space on the left, top, right and bottom sides  of this view.  [dimension]
+android:layout_marginLeft : Specifies extra space on the left side of this view.  [dimension]
+android:layout_marginTop : Specifies extra space on the top side of this view.  [dimension]
+android:layout_marginRight : Specifies extra space on the right side of this view.  [dimension]
+android:layout_marginBottom : Specifies extra space on the bottom side of this view.  [dimension]
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion8-expected-completion41.txt b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion8-expected-completion41.txt
index 917d888..14065df 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion8-expected-completion41.txt
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion8-expected-completion41.txt
@@ -1,7 +1,7 @@
 Code completion in completion8.xml for android:mar^="50dp":
-android:marqueeRepeatLimit : The number of times to repeat the marquee animation.  [integer, enum] 
-android:layout_margin : Specifies extra space on the left, top, right and bottom sides  of this view.  [dimension] 
-android:layout_marginLeft : Specifies extra space on the left side of this view.  [dimension] 
-android:layout_marginTop : Specifies extra space on the top side of this view.  [dimension] 
-android:layout_marginRight : Specifies extra space on the right side of this view.  [dimension] 
-android:layout_marginBottom : Specifies extra space on the bottom side of this view.  [dimension] 
+android:marqueeRepeatLimit : The number of times to repeat the marquee animation.  [integer, enum]
+android:layout_margin : Specifies extra space on the left, top, right and bottom sides  of this view.  [dimension]
+android:layout_marginLeft : Specifies extra space on the left side of this view.  [dimension]
+android:layout_marginTop : Specifies extra space on the top side of this view.  [dimension]
+android:layout_marginRight : Specifies extra space on the right side of this view.  [dimension]
+android:layout_marginBottom : Specifies extra space on the bottom side of this view.  [dimension]
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion8-expected-completion42.txt b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion8-expected-completion42.txt
index f51744d..c8be83f 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion8-expected-completion42.txt
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion8-expected-completion42.txt
@@ -1,4 +1,4 @@
 Code completion in completion8.xml for android:w^i="100":
-android:width : Makes the TextView be exactly this many pixels wide.  [dimension] 
-android:layout_width : Specifies the basic width of the view.  [dimension, enum] 
-android:layout_weight : [float] 
+android:width : Makes the TextView be exactly this many pixels wide.  [dimension]
+android:layout_width : Specifies the basic width of the view.  [dimension, enum]
+android:layout_weight : [float]
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion8-expected-completion43.txt b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion8-expected-completion43.txt
index 622a2ba..dfdb6cb 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion8-expected-completion43.txt
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion8-expected-completion43.txt
@@ -1,7 +1,7 @@
 Code completion in completion8.xml for mar^="60dp":
-android:marqueeRepeatLimit : The number of times to repeat the marquee animation.  [integer, enum] 
-android:layout_margin : Specifies extra space on the left, top, right and bottom sides  of this view.  [dimension] 
-android:layout_marginLeft : Specifies extra space on the left side of this view.  [dimension] 
-android:layout_marginTop : Specifies extra space on the top side of this view.  [dimension] 
-android:layout_marginRight : Specifies extra space on the right side of this view.  [dimension] 
-android:layout_marginBottom : Specifies extra space on the bottom side of this view.  [dimension] 
+android:marqueeRepeatLimit : The number of times to repeat the marquee animation.  [integer, enum]
+android:layout_margin : Specifies extra space on the left, top, right and bottom sides  of this view.  [dimension]
+android:layout_marginLeft : Specifies extra space on the left side of this view.  [dimension]
+android:layout_marginTop : Specifies extra space on the top side of this view.  [dimension]
+android:layout_marginRight : Specifies extra space on the right side of this view.  [dimension]
+android:layout_marginBottom : Specifies extra space on the bottom side of this view.  [dimension]
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion8-expected-completion44.txt b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion8-expected-completion44.txt
index 6f7f2d3..5b0b44a 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion8-expected-completion44.txt
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion8-expected-completion44.txt
@@ -1,10 +1,10 @@
 Code completion in completion8.xml for android:layo^ut_width="fill_parent":
-android:layout_width : Specifies the basic width of the view.  [dimension, enum] 
-android:layout_height : Specifies the basic height of the view.  [dimension, enum] 
-android:layout_weight : [float] 
-android:layout_gravity : Standard gravity constant that a child can supply to its parent.  [flag] 
-android:layout_margin : Specifies extra space on the left, top, right and bottom sides  of this view.  [dimension] 
-android:layout_marginLeft : Specifies extra space on the left side of this view.  [dimension] 
-android:layout_marginTop : Specifies extra space on the top side of this view.  [dimension] 
-android:layout_marginRight : Specifies extra space on the right side of this view.  [dimension] 
-android:layout_marginBottom : Specifies extra space on the bottom side of this view.  [dimension] 
+android:layout_width : Specifies the basic width of the view.  [dimension, enum]
+android:layout_height : Specifies the basic height of the view.  [dimension, enum]
+android:layout_weight : [float]
+android:layout_gravity : Standard gravity constant that a child can supply to its parent.  [flag]
+android:layout_margin : Specifies extra space on the left, top, right and bottom sides  of this view.  [dimension]
+android:layout_marginLeft : Specifies extra space on the left side of this view.  [dimension]
+android:layout_marginTop : Specifies extra space on the top side of this view.  [dimension]
+android:layout_marginRight : Specifies extra space on the right side of this view.  [dimension]
+android:layout_marginBottom : Specifies extra space on the bottom side of this view.  [dimension]
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completionvalues1-expected-completion23.txt b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completionvalues1-expected-completion23.txt
index 28cc9ba..a2f64dc 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completionvalues1-expected-completion23.txt
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completionvalues1-expected-completion23.txt
@@ -1,7 +1,7 @@
 Code completion in completionvalues1.xml for android:textS^ize:
-android:textScaleX : Sets the horizontal scaling factor for the text.  [float] 
-android:textSelectHandle : Reference to a drawable that will be used to display a text selection  anchor for positioning the cursor within text.  [reference] 
-android:textSelectHandleLeft : Reference to a drawable that will be used to display a text selection  anchor on the left side of a selection region.  [reference] 
-android:textSelectHandleRight : Reference to a drawable that will be used to display a text selection  anchor on the right side of a selection region.  [reference] 
-android:textSize : Size of the text.  [dimension] 
-android:textStyle : Style (bold, italic, bolditalic) for the text.  [flag] 
+android:textScaleX : Sets the horizontal scaling factor for the text.  [float]
+android:textSelectHandle : Reference to a drawable that will be used to display a text selection  anchor for positioning the cursor within text.  [reference]
+android:textSelectHandleLeft : Reference to a drawable that will be used to display a text selection  anchor on the left side of a selection region.  [reference]
+android:textSelectHandleRight : Reference to a drawable that will be used to display a text selection  anchor on the right side of a selection region.  [reference]
+android:textSize : Size of the text.  [dimension]
+android:textStyle : Style (bold, italic, bolditalic) for the text.  [flag]
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completionvalues1-expected-completion29.txt b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completionvalues1-expected-completion29.txt
index 0ad8ad2..c082ce4 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completionvalues1-expected-completion29.txt
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completionvalues1-expected-completion29.txt
@@ -1,3 +1,3 @@
 Code completion in completionvalues1.xml for <item name="gr^">:
-android:gravity : Specifies how to place the content of an object, both on the  x- and y-axis, within the object itself.  [flag] 
-android:groupIndicator : Indicator shown beside the group View.  [reference] 
+android:gravity : Specifies how to place the content of an object, both on the  x- and y-axis, within the object itself.  [flag]
+android:groupIndicator : Indicator shown beside the group View.  [reference]
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completionvalues1-expected-completion30.txt b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completionvalues1-expected-completion30.txt
index 1f18826..4b87a0c 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completionvalues1-expected-completion30.txt
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completionvalues1-expected-completion30.txt
@@ -1,8 +1,8 @@
 Code completion in completionvalues1.xml for <item name="an^">:
 android:
-android:animateFirstView : Defines whether to animate the current View when the ViewAnimation  is first displayed.  [boolean] 
-android:animateLayoutChanges : Defines whether changes in layout (caused by adding and removing  items) should cause a LayoutTransition to run.  [boolean] 
-android:animateOnClick : Indicates whether the drawer should be opened/closed with an  animation when the user clicks the handle.  [boolean] 
-android:animationCache : Defines whether layout animations should create a drawing cache  for their children.  [boolean] 
-android:animationDuration : Sets how long a transition animation should run (in milliseconds)  when layout has changed.  [integer] 
-android:animationResolution : Timeout between frames of animation in milliseconds  [integer] 
+android:animateFirstView : Defines whether to animate the current View when the ViewAnimation  is first displayed.  [boolean]
+android:animateLayoutChanges : Defines whether changes in layout (caused by adding and removing  items) should cause a LayoutTransition to run.  [boolean]
+android:animateOnClick : Indicates whether the drawer should be opened/closed with an  animation when the user clicks the handle.  [boolean]
+android:animationCache : Defines whether layout animations should create a drawing cache  for their children.  [boolean]
+android:animationDuration : Sets how long a transition animation should run (in milliseconds)  when layout has changed.  [integer]
+android:animationResolution : Timeout between frames of animation in milliseconds  [integer]
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completionvalues1-expected-completion32.txt b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completionvalues1-expected-completion32.txt
index 9f31ecb..3592e04 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completionvalues1-expected-completion32.txt
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completionvalues1-expected-completion32.txt
@@ -1,295 +1,295 @@
 Code completion in completionvalues1.xml for <item name="^"></item>:
 android:
-android:addStatesFromChildren : Sets whether this ViewGroup's drawable states also include its  children's drawable states.  [boolean] 
-android:adjustViewBounds : Set this to true if you want the ImageView to adjust its bounds  to preserve the aspect ratio of its drawable.  [boolean] 
-android:allowSingleTap : Indicates whether the drawer can be opened/closed by a single  tap on the handle.  [boolean] 
-android:alpha : alpha property of the view, as a value between 0 (completely  transparent) and 1 (completely opaque).  [float] 
-android:alwaysDrawnWithCache : Defines whether the ViewGroup should always draw its children  using their drawing cache or not.  [boolean] 
-android:animateFirstView : Defines whether to animate the current View when the ViewAnimation  is first displayed.  [boolean] 
-android:animateLayoutChanges : Defines whether changes in layout (caused by adding and removing  items) should cause a LayoutTransition to run.  [boolean] 
-android:animateOnClick : Indicates whether the drawer should be opened/closed with an  animation when the user clicks the handle.  [boolean] 
-android:animationCache : Defines whether layout animations should create a drawing cache  for their children.  [boolean] 
-android:animationDuration : Sets how long a transition animation should run (in milliseconds)  when layout has changed.  [integer] 
-android:animationResolution : Timeout between frames of animation in milliseconds  [integer] 
-android:autoLink : Controls whether links such as urls and email addresses are automatically  found and converted to clickable links.  [flag] 
-android:autoStart : When true, automatically start animating  [boolean] 
-android:autoText : If set, specifies that this TextView has a textual input method  and automatically corrects some common spelling errors. * Deprecated: Use inputType instead.  [boolean] 
-android:background : A drawable to use as the background.  [reference, color] 
-android:baseline : The offset of the baseline within this view.  [dimension] 
-android:baselineAlignBottom : If true, the image view will be baseline aligned with based on  its bottom edge.  [boolean] 
-android:baselineAligned : When set to false, prevents the layout from aligning its children's  baselines.  [boolean] 
-android:baselineAlignedChildIndex : When a linear layout is part of another layout that is baseline  aligned, it can specify which of its children to baseline align  to (that is, which child TextView).  [integer] 
-android:bottomOffset : Extra offset for the handle at the bottom of the SlidingDrawer.  [dimension] 
-android:bufferType : Determines the minimum type that getText() will return.  [enum] 
-android:button : Drawable used for the button graphic (e.g. checkbox, radio button,  etc).  [reference] 
-android:cacheColorHint : Indicates that this list will always be drawn on top of solid,  single-color opaque background.  [color] 
-android:calendarViewShown : Whether the calendar view is shown.  [boolean] 
-android:capitalize : If set, specifies that this TextView has a textual input method  and should automatically capitalize what the user types. * Deprecated: Use inputType instead.  [enum] 
-android:checkMark : Drawable used for the check mark graphic.  [reference] 
-android:checked : Indicates the initial checked state of this button.  [boolean] 
-android:checkedButton : The id of the child radio button that should be checked by default  within this radio group.  [integer] 
-android:childDivider : Drawable or color that is used as a divider for children.  [reference, color] 
-android:childIndicator : Indicator shown beside the child View.  [reference] 
-android:childIndicatorLeft : The left bound for a child's indicator.  [dimension] 
-android:childIndicatorRight : The right bound for a child's indicator.  [dimension] 
-android:choiceMode : Defines the choice behavior for the view.  [enum] 
+android:addStatesFromChildren : Sets whether this ViewGroup's drawable states also include its  children's drawable states.  [boolean]
+android:adjustViewBounds : Set this to true if you want the ImageView to adjust its bounds  to preserve the aspect ratio of its drawable.  [boolean]
+android:allowSingleTap : Indicates whether the drawer can be opened/closed by a single  tap on the handle.  [boolean]
+android:alpha : alpha property of the view, as a value between 0 (completely  transparent) and 1 (completely opaque).  [float]
+android:alwaysDrawnWithCache : Defines whether the ViewGroup should always draw its children  using their drawing cache or not.  [boolean]
+android:animateFirstView : Defines whether to animate the current View when the ViewAnimation  is first displayed.  [boolean]
+android:animateLayoutChanges : Defines whether changes in layout (caused by adding and removing  items) should cause a LayoutTransition to run.  [boolean]
+android:animateOnClick : Indicates whether the drawer should be opened/closed with an  animation when the user clicks the handle.  [boolean]
+android:animationCache : Defines whether layout animations should create a drawing cache  for their children.  [boolean]
+android:animationDuration : Sets how long a transition animation should run (in milliseconds)  when layout has changed.  [integer]
+android:animationResolution : Timeout between frames of animation in milliseconds  [integer]
+android:autoLink : Controls whether links such as urls and email addresses are automatically  found and converted to clickable links.  [flag]
+android:autoStart : When true, automatically start animating  [boolean]
+android:autoText : If set, specifies that this TextView has a textual input method  and automatically corrects some common spelling errors. * Deprecated: Use inputType instead.  [boolean]
+android:background : A drawable to use as the background.  [reference, color]
+android:baseline : The offset of the baseline within this view.  [dimension]
+android:baselineAlignBottom : If true, the image view will be baseline aligned with based on  its bottom edge.  [boolean]
+android:baselineAligned : When set to false, prevents the layout from aligning its children's  baselines.  [boolean]
+android:baselineAlignedChildIndex : When a linear layout is part of another layout that is baseline  aligned, it can specify which of its children to baseline align  to (that is, which child TextView).  [integer]
+android:bottomOffset : Extra offset for the handle at the bottom of the SlidingDrawer.  [dimension]
+android:bufferType : Determines the minimum type that getText() will return.  [enum]
+android:button : Drawable used for the button graphic (e.g. checkbox, radio button,  etc).  [reference]
+android:cacheColorHint : Indicates that this list will always be drawn on top of solid,  single-color opaque background.  [color]
+android:calendarViewShown : Whether the calendar view is shown.  [boolean]
+android:capitalize : If set, specifies that this TextView has a textual input method  and should automatically capitalize what the user types. * Deprecated: Use inputType instead.  [enum]
+android:checkMark : Drawable used for the check mark graphic.  [reference]
+android:checked : Indicates the initial checked state of this button.  [boolean]
+android:checkedButton : The id of the child radio button that should be checked by default  within this radio group.  [integer]
+android:childDivider : Drawable or color that is used as a divider for children.  [reference, color]
+android:childIndicator : Indicator shown beside the child View.  [reference]
+android:childIndicatorLeft : The left bound for a child's indicator.  [dimension]
+android:childIndicatorRight : The right bound for a child's indicator.  [dimension]
+android:choiceMode : Defines the choice behavior for the view.  [enum]
 class : Supply the name of the fragment class to instantiate
-android:clickable : Defines whether this view reacts to click events.  [boolean] 
-android:clipChildren : Defines whether a child is limited to draw inside of its bounds  or not.  [boolean] 
-android:clipToPadding : Defines whether the ViewGroup will clip its drawing surface so  as to exclude the padding area.  [boolean] 
-android:collapseColumns : The zero-based index of the columns to collapse.  [string] 
-android:columnWidth : Specifies the fixed width for each column.  [dimension] 
-android:completionHint : Defines the hint displayed in the drop down menu.  [string] 
-android:completionHintView : Defines the hint view displayed in the drop down menu.  [reference] 
-android:completionThreshold : Defines the number of characters that the user must type before  completion suggestions are displayed in a drop down menu.  [integer] 
-android:content : Identifier for the child that represents the drawer's content.  [reference] 
-android:contentDescription : Defines text that briefly describes content of the view.  [string] 
-android:cropToPadding : If true, the image will be cropped to fit within its padding.  [boolean] 
-android:cursorVisible : Makes the cursor visible (the default) or invisible.  [boolean] 
-android:dateTextAppearance : The text appearance for the calendar dates.  [reference] 
-android:descendantFocusability : Defines the relationship between the ViewGroup and its descendants  when looking for a View to take focus.  [enum] 
-android:dial : [reference] 
-android:digits : If set, specifies that this TextView has a numeric input method  and that these specific characters are the ones that it will  accept.  [string] 
-android:disabledAlpha : The alpha to apply to the indicator when disabled.  [float] 
+android:clickable : Defines whether this view reacts to click events.  [boolean]
+android:clipChildren : Defines whether a child is limited to draw inside of its bounds  or not.  [boolean]
+android:clipToPadding : Defines whether the ViewGroup will clip its drawing surface so  as to exclude the padding area.  [boolean]
+android:collapseColumns : The zero-based index of the columns to collapse.  [string]
+android:columnWidth : Specifies the fixed width for each column.  [dimension]
+android:completionHint : Defines the hint displayed in the drop down menu.  [string]
+android:completionHintView : Defines the hint view displayed in the drop down menu.  [reference]
+android:completionThreshold : Defines the number of characters that the user must type before  completion suggestions are displayed in a drop down menu.  [integer]
+android:content : Identifier for the child that represents the drawer's content.  [reference]
+android:contentDescription : Defines text that briefly describes content of the view.  [string]
+android:cropToPadding : If true, the image will be cropped to fit within its padding.  [boolean]
+android:cursorVisible : Makes the cursor visible (the default) or invisible.  [boolean]
+android:dateTextAppearance : The text appearance for the calendar dates.  [reference]
+android:descendantFocusability : Defines the relationship between the ViewGroup and its descendants  when looking for a View to take focus.  [enum]
+android:dial : [reference]
+android:digits : If set, specifies that this TextView has a numeric input method  and that these specific characters are the ones that it will  accept.  [string]
+android:disabledAlpha : The alpha to apply to the indicator when disabled.  [float]
 android:divider : Drawable to use as a vertical divider between buttons.
-android:dividerHeight : Height of the divider.  [dimension] 
-android:dividerPadding : Size of padding on either end of a divider.  [dimension] 
-android:drawSelectorOnTop : When set to true, the selector will be drawn over the selected  item.  [boolean] 
-android:drawableBottom : The drawable to be drawn below the text.  [reference, color] 
-android:drawableLeft : The drawable to be drawn to the left of the text.  [reference, color] 
-android:drawablePadding : The padding between the drawables and the text.  [dimension] 
-android:drawableRight : The drawable to be drawn to the right of the text.  [reference, color] 
-android:drawableTop : The drawable to be drawn above the text.  [reference, color] 
-android:drawingCacheQuality : Defines the quality of translucent drawing caches.  [enum] 
-android:dropDownAnchor : View to anchor the auto-complete dropdown to.  [reference] 
-android:dropDownHeight : Specifies the basic height of the dropdown.  [dimension, enum] 
-android:dropDownHorizontalOffset : Horizontal offset from the spinner widget for positioning the  dropdown in spinnerMode="dropdown".  [dimension] 
-android:dropDownSelector : List selector to use for spinnerMode="dropdown" display.  [reference, color] 
-android:dropDownVerticalOffset : Vertical offset from the spinner widget for positioning the dropdown  in spinnerMode="dropdown".  [dimension] 
-android:dropDownWidth : Width of the dropdown in spinnerMode="dropdown".  [dimension, enum] 
-android:duplicateParentState : When this attribute is set to true, the view gets its drawable  state (focused, pressed, etc.) from its direct parent rather  than from itself.  [boolean] 
-android:editable : If set, specifies that this TextView has an input method. * Deprecated: Use inputType instead.  [boolean] 
-android:editorExtras : Reference to an "input-extras" XML resource containing additional  data to supply to an input method, which is private to the implementation  of the input method.  [reference] 
-android:ellipsize : If set, causes words that are longer than the view is wide to  be ellipsized instead of broken in the middle.  [enum] 
-android:ems : Makes the TextView be exactly this many ems wide.  [integer] 
-android:enabled : Specifies whether the TextView is enabled or not. * Deprecated: Use state_enabled instead.  [boolean] 
-android:endYear : The last year (inclusive), for example "2010".  [integer] 
-android:entries : Reference to an array resource that will populate the Spinner.  [reference] 
-android:eventsInterceptionEnabled : Defines whether the overlay should intercept the motion events  when a gesture is recognized.  [boolean] 
-android:fadeDuration : Duration, in milliseconds, of the fade out effect after the user  is done drawing a gesture.  [integer] 
-android:fadeEnabled : Defines whether the gesture will automatically fade out after  being recognized.  [boolean] 
-android:fadeOffset : Time, in milliseconds, to wait before the gesture fades out after  the user is done drawing it.  [integer] 
-android:fadeScrollbars : Defines whether to fade out scrollbars when they are not in use.  [boolean] 
-android:fadingEdge : Defines which edges should be fadeded on scrolling.  [flag] 
-android:fadingEdgeLength : Defines the length of the fading edges.  [dimension] 
-android:fastScrollAlwaysVisible : When set to true, the list will always show the fast scroll interface.  [boolean] 
-android:fastScrollEnabled : Enables the fast scroll thumb that can be dragged to quickly  scroll through the list.  [boolean] 
-android:fillViewport : Defines whether the scrollview should stretch its content to  fill the viewport.  [boolean] 
-android:filterTouchesWhenObscured : Specifies whether to filter touches when the view's window is  obscured by another visible window.  [boolean] 
-android:firstDayOfWeek : The first day of week according to java.util.Calendar.  [integer] 
-android:fitsSystemWindows : Boolean internal attribute to adjust view layout based on system  windows such as the status bar.  [boolean] 
-android:flingable : @hide Whether the number picker supports fligning.  [boolean] 
-android:flipInterval : [integer] 
-android:focusable : Boolean that controls whether a view can take focus.  [boolean] 
-android:focusableInTouchMode : Boolean that controls whether a view can take focus while in  touch mode.  [boolean] 
-android:focusedMonthDateColor : The color for the dates of the selected month.  [reference, color] 
-android:footerDividersEnabled : When set to false, the ListView will not draw the divider before  each footer view.  [boolean] 
-android:foreground : Defines the drawable to draw over the content.  [reference, color] 
-android:foregroundGravity : Defines the gravity to apply to the foreground drawable.  [flag] 
-android:foregroundInsidePadding : Defines whether the foreground drawable should be drawn inside  the padding.  [boolean] 
-android:format : Format string: if specified, the Chronometer will display this  string, with the first "%s" replaced by the current timer value  in "MM:SS" or "H:MM:SS" form.  [string] 
-android:freezesText : If set, the text view will include its current complete text  inside of its frozen icicle in addition to meta-data such as  the current cursor position.  [boolean] 
-android:gestureColor : Color used to draw a gesture.  [color] 
-android:gestureStrokeAngleThreshold : Minimum curve angle a stroke must contain before it is recognized  as a gesture.  [float] 
-android:gestureStrokeLengthThreshold : Minimum length of a stroke before it is recognized as a gesture.  [float] 
-android:gestureStrokeSquarenessThreshold : Squareness threshold of a stroke before it is recognized as a  gesture.  [float] 
-android:gestureStrokeType : Defines the type of strokes that define a gesture.  [enum] 
-android:gestureStrokeWidth : Width of the stroke used to draw the gesture.  [float] 
-android:gravity : Specifies how to place the content of an object, both on the  x- and y-axis, within the object itself.  [flag] 
-android:groupIndicator : Indicator shown beside the group View.  [reference] 
-android:hand_hour : [reference] 
-android:hand_minute : [reference] 
-android:handle : Identifier for the child that represents the drawer's handle.  [reference] 
-android:hapticFeedbackEnabled : Boolean that controls whether a view should have haptic feedback  enabled for events such as long presses.  [boolean] 
-android:headerDividersEnabled : When set to false, the ListView will not draw the divider after  each header view.  [boolean] 
-android:height : Makes the TextView be exactly this many pixels tall.  [dimension] 
-android:hint : Hint text to display when the text is empty.  [string] 
-android:horizontalSpacing : Defines the default horizontal spacing between columns.  [dimension] 
-android:iconifiedByDefault : The default state of the SearchView.  [boolean] 
-android:id : Supply an identifier name for the top-level view, to later retrieve  it with View.findViewById() or Activity.findViewById().  [reference] 
-android:ignoreGravity : Indicates what view should not be affected by gravity.  [reference] 
-android:imeActionId : Supply a value for EditorInfo.actionId used when an input method  is connected to the text view.  [integer] 
-android:imeActionLabel : Supply a value for EditorInfo.actionLabel used when an input  method is connected to the text view.  [string] 
-android:imeOptions : Additional features you can enable in an IME associated with  an editor to improve the integration with your application.  [flag] 
-android:inAnimation : Identifier for the animation to use when a view is shown.  [reference] 
-android:includeFontPadding : Leave enough room for ascenders and descenders instead of using  the font ascent and descent strictly.  [boolean] 
-android:indeterminate : Allows to enable the indeterminate mode.  [boolean] 
-android:indeterminateBehavior : Defines how the indeterminate mode should behave when the progress  reaches max.  [enum] 
-android:indeterminateDrawable : Drawable used for the indeterminate mode.  [reference] 
-android:indeterminateDuration : Duration of the indeterminate animation.  [integer] 
-android:indeterminateOnly : Restricts to ONLY indeterminate mode (state-keeping progress  mode will not work).  [boolean] 
-android:indicatorLeft : The left bound for an item's indicator.  [dimension] 
-android:indicatorRight : The right bound for an item's indicator.  [dimension] 
-android:inflatedId : Overrides the id of the inflated View with this value.  [reference] 
-android:inputMethod : If set, specifies that this TextView should use the specified  input method (specified by fully-qualified class name). * Deprecated: Use inputType instead.  [string] 
-android:inputType : The type of data being placed in a text field, used to help an  input method decide how to let the user enter text.  [flag] 
-android:interpolator : [reference] 
-android:isIndicator : Whether this rating bar is an indicator (and non-changeable by  the user).  [boolean] 
-android:isScrollContainer : Set this if the view will serve as a scrolling container, meaing  that it can be resized to shrink its overall window so that there  will be space for an input method.  [boolean] 
-android:keepScreenOn : Controls whether the view's window should keep the screen on  while visible.  [boolean] 
-android:layerType : Specifies the type of layer backing this view.  [enum] 
-layout : [reference]. * Required. 
-android:layoutAnimation : Defines the layout animation to use the first time the ViewGroup  is laid out.  [reference] 
-android:lineSpacingExtra : Extra spacing between lines of text.  [dimension] 
-android:lineSpacingMultiplier : Extra spacing between lines of text, as a multiplier.  [float] 
-android:lines : Makes the TextView be exactly this many lines tall.  [integer] 
-android:linksClickable : If set to false, keeps the movement method from being set to  the link movement method even if autoLink causes links to be  found.  [boolean] 
-android:listSelector : Drawable used to indicate the currently selected item in the  list.  [reference, color] 
-android:longClickable : Defines whether this view reacts to long click events.  [boolean] 
-android:loopViews : Defines whether the animator loops to the first view once it  has reached the end of the list.  [boolean] 
-android:marqueeRepeatLimit : The number of times to repeat the marquee animation.  [integer, enum] 
-android:max : Defines the maximum value the progress can take.  [integer] 
-android:maxDate : The minimal date shown by this calendar view in mm/dd/yyyy format.  [string] 
-android:maxEms : Makes the TextView be at most this many ems wide.  [integer] 
-android:maxHeight : An optional argument to supply a maximum height for this view.  [dimension] 
-android:maxLength : Set an input filter to constrain the text length to the specified  number.  [integer] 
-android:maxLines : Makes the TextView be at most this many lines tall.  [integer] 
-android:maxWidth : An optional argument to supply a maximum width for this view.  [dimension] 
-android:measureAllChildren : Determines whether to measure all children or just those in the  VISIBLE or INVISIBLE state when measuring.  [boolean] 
-android:measureWithLargestChild : When set to true, all children with a weight will be considered  having the minimum size of the largest child.  [boolean] 
-android:minDate : The minimal date shown by this calendar view in mm/dd/yyyy format.  [string] 
-android:minEms : Makes the TextView be at least this many ems wide.  [integer] 
+android:dividerHeight : Height of the divider.  [dimension]
+android:dividerPadding : Size of padding on either end of a divider.  [dimension]
+android:drawSelectorOnTop : When set to true, the selector will be drawn over the selected  item.  [boolean]
+android:drawableBottom : The drawable to be drawn below the text.  [reference, color]
+android:drawableLeft : The drawable to be drawn to the left of the text.  [reference, color]
+android:drawablePadding : The padding between the drawables and the text.  [dimension]
+android:drawableRight : The drawable to be drawn to the right of the text.  [reference, color]
+android:drawableTop : The drawable to be drawn above the text.  [reference, color]
+android:drawingCacheQuality : Defines the quality of translucent drawing caches.  [enum]
+android:dropDownAnchor : View to anchor the auto-complete dropdown to.  [reference]
+android:dropDownHeight : Specifies the basic height of the dropdown.  [dimension, enum]
+android:dropDownHorizontalOffset : Horizontal offset from the spinner widget for positioning the  dropdown in spinnerMode="dropdown".  [dimension]
+android:dropDownSelector : List selector to use for spinnerMode="dropdown" display.  [reference, color]
+android:dropDownVerticalOffset : Vertical offset from the spinner widget for positioning the dropdown  in spinnerMode="dropdown".  [dimension]
+android:dropDownWidth : Width of the dropdown in spinnerMode="dropdown".  [dimension, enum]
+android:duplicateParentState : When this attribute is set to true, the view gets its drawable  state (focused, pressed, etc.) from its direct parent rather  than from itself.  [boolean]
+android:editable : If set, specifies that this TextView has an input method. * Deprecated: Use inputType instead.  [boolean]
+android:editorExtras : Reference to an "input-extras" XML resource containing additional  data to supply to an input method, which is private to the implementation  of the input method.  [reference]
+android:ellipsize : If set, causes words that are longer than the view is wide to  be ellipsized instead of broken in the middle.  [enum]
+android:ems : Makes the TextView be exactly this many ems wide.  [integer]
+android:enabled : Specifies whether the TextView is enabled or not. * Deprecated: Use state_enabled instead.  [boolean]
+android:endYear : The last year (inclusive), for example "2010".  [integer]
+android:entries : Reference to an array resource that will populate the Spinner.  [reference]
+android:eventsInterceptionEnabled : Defines whether the overlay should intercept the motion events  when a gesture is recognized.  [boolean]
+android:fadeDuration : Duration, in milliseconds, of the fade out effect after the user  is done drawing a gesture.  [integer]
+android:fadeEnabled : Defines whether the gesture will automatically fade out after  being recognized.  [boolean]
+android:fadeOffset : Time, in milliseconds, to wait before the gesture fades out after  the user is done drawing it.  [integer]
+android:fadeScrollbars : Defines whether to fade out scrollbars when they are not in use.  [boolean]
+android:fadingEdge : Defines which edges should be fadeded on scrolling.  [flag]
+android:fadingEdgeLength : Defines the length of the fading edges.  [dimension]
+android:fastScrollAlwaysVisible : When set to true, the list will always show the fast scroll interface.  [boolean]
+android:fastScrollEnabled : Enables the fast scroll thumb that can be dragged to quickly  scroll through the list.  [boolean]
+android:fillViewport : Defines whether the scrollview should stretch its content to  fill the viewport.  [boolean]
+android:filterTouchesWhenObscured : Specifies whether to filter touches when the view's window is  obscured by another visible window.  [boolean]
+android:firstDayOfWeek : The first day of week according to java.util.Calendar.  [integer]
+android:fitsSystemWindows : Boolean internal attribute to adjust view layout based on system  windows such as the status bar.  [boolean]
+android:flingable : @hide Whether the number picker supports fligning.  [boolean]
+android:flipInterval : [integer]
+android:focusable : Boolean that controls whether a view can take focus.  [boolean]
+android:focusableInTouchMode : Boolean that controls whether a view can take focus while in  touch mode.  [boolean]
+android:focusedMonthDateColor : The color for the dates of the selected month.  [reference, color]
+android:footerDividersEnabled : When set to false, the ListView will not draw the divider before  each footer view.  [boolean]
+android:foreground : Defines the drawable to draw over the content.  [reference, color]
+android:foregroundGravity : Defines the gravity to apply to the foreground drawable.  [flag]
+android:foregroundInsidePadding : Defines whether the foreground drawable should be drawn inside  the padding.  [boolean]
+android:format : Format string: if specified, the Chronometer will display this  string, with the first "%s" replaced by the current timer value  in "MM:SS" or "H:MM:SS" form.  [string]
+android:freezesText : If set, the text view will include its current complete text  inside of its frozen icicle in addition to meta-data such as  the current cursor position.  [boolean]
+android:gestureColor : Color used to draw a gesture.  [color]
+android:gestureStrokeAngleThreshold : Minimum curve angle a stroke must contain before it is recognized  as a gesture.  [float]
+android:gestureStrokeLengthThreshold : Minimum length of a stroke before it is recognized as a gesture.  [float]
+android:gestureStrokeSquarenessThreshold : Squareness threshold of a stroke before it is recognized as a  gesture.  [float]
+android:gestureStrokeType : Defines the type of strokes that define a gesture.  [enum]
+android:gestureStrokeWidth : Width of the stroke used to draw the gesture.  [float]
+android:gravity : Specifies how to place the content of an object, both on the  x- and y-axis, within the object itself.  [flag]
+android:groupIndicator : Indicator shown beside the group View.  [reference]
+android:hand_hour : [reference]
+android:hand_minute : [reference]
+android:handle : Identifier for the child that represents the drawer's handle.  [reference]
+android:hapticFeedbackEnabled : Boolean that controls whether a view should have haptic feedback  enabled for events such as long presses.  [boolean]
+android:headerDividersEnabled : When set to false, the ListView will not draw the divider after  each header view.  [boolean]
+android:height : Makes the TextView be exactly this many pixels tall.  [dimension]
+android:hint : Hint text to display when the text is empty.  [string]
+android:horizontalSpacing : Defines the default horizontal spacing between columns.  [dimension]
+android:iconifiedByDefault : The default state of the SearchView.  [boolean]
+android:id : Supply an identifier name for the top-level view, to later retrieve  it with View.findViewById() or Activity.findViewById().  [reference]
+android:ignoreGravity : Indicates what view should not be affected by gravity.  [reference]
+android:imeActionId : Supply a value for EditorInfo.actionId used when an input method  is connected to the text view.  [integer]
+android:imeActionLabel : Supply a value for EditorInfo.actionLabel used when an input  method is connected to the text view.  [string]
+android:imeOptions : Additional features you can enable in an IME associated with  an editor to improve the integration with your application.  [flag]
+android:inAnimation : Identifier for the animation to use when a view is shown.  [reference]
+android:includeFontPadding : Leave enough room for ascenders and descenders instead of using  the font ascent and descent strictly.  [boolean]
+android:indeterminate : Allows to enable the indeterminate mode.  [boolean]
+android:indeterminateBehavior : Defines how the indeterminate mode should behave when the progress  reaches max.  [enum]
+android:indeterminateDrawable : Drawable used for the indeterminate mode.  [reference]
+android:indeterminateDuration : Duration of the indeterminate animation.  [integer]
+android:indeterminateOnly : Restricts to ONLY indeterminate mode (state-keeping progress  mode will not work).  [boolean]
+android:indicatorLeft : The left bound for an item's indicator.  [dimension]
+android:indicatorRight : The right bound for an item's indicator.  [dimension]
+android:inflatedId : Overrides the id of the inflated View with this value.  [reference]
+android:inputMethod : If set, specifies that this TextView should use the specified  input method (specified by fully-qualified class name). * Deprecated: Use inputType instead.  [string]
+android:inputType : The type of data being placed in a text field, used to help an  input method decide how to let the user enter text.  [flag]
+android:interpolator : [reference]
+android:isIndicator : Whether this rating bar is an indicator (and non-changeable by  the user).  [boolean]
+android:isScrollContainer : Set this if the view will serve as a scrolling container, meaing  that it can be resized to shrink its overall window so that there  will be space for an input method.  [boolean]
+android:keepScreenOn : Controls whether the view's window should keep the screen on  while visible.  [boolean]
+android:layerType : Specifies the type of layer backing this view.  [enum]
+layout : [reference]. * Required.
+android:layoutAnimation : Defines the layout animation to use the first time the ViewGroup  is laid out.  [reference]
+android:lineSpacingExtra : Extra spacing between lines of text.  [dimension]
+android:lineSpacingMultiplier : Extra spacing between lines of text, as a multiplier.  [float]
+android:lines : Makes the TextView be exactly this many lines tall.  [integer]
+android:linksClickable : If set to false, keeps the movement method from being set to  the link movement method even if autoLink causes links to be  found.  [boolean]
+android:listSelector : Drawable used to indicate the currently selected item in the  list.  [reference, color]
+android:longClickable : Defines whether this view reacts to long click events.  [boolean]
+android:loopViews : Defines whether the animator loops to the first view once it  has reached the end of the list.  [boolean]
+android:marqueeRepeatLimit : The number of times to repeat the marquee animation.  [integer, enum]
+android:max : Defines the maximum value the progress can take.  [integer]
+android:maxDate : The minimal date shown by this calendar view in mm/dd/yyyy format.  [string]
+android:maxEms : Makes the TextView be at most this many ems wide.  [integer]
+android:maxHeight : An optional argument to supply a maximum height for this view.  [dimension]
+android:maxLength : Set an input filter to constrain the text length to the specified  number.  [integer]
+android:maxLines : Makes the TextView be at most this many lines tall.  [integer]
+android:maxWidth : An optional argument to supply a maximum width for this view.  [dimension]
+android:measureAllChildren : Determines whether to measure all children or just those in the  VISIBLE or INVISIBLE state when measuring.  [boolean]
+android:measureWithLargestChild : When set to true, all children with a weight will be considered  having the minimum size of the largest child.  [boolean]
+android:minDate : The minimal date shown by this calendar view in mm/dd/yyyy format.  [string]
+android:minEms : Makes the TextView be at least this many ems wide.  [integer]
 android:minHeight : Defines the minimum height of the view.
-android:minLines : Makes the TextView be at least this many lines tall.  [integer] 
+android:minLines : Makes the TextView be at least this many lines tall.  [integer]
 android:minWidth : Defines the minimum width of the view.
-android:mode : [enum] 
+android:mode : [enum]
 android:name : Supply the name of the fragment class to instantiate.
-android:nextFocusDown : Defines the next view to give focus to when the next focus is FOCUS_DOWN If the reference refers to a view that does not exist or is  part of a hierarchy that is invisible, a java.lang.RuntimeException will result when the  reference is accessed.  [reference] 
-android:nextFocusForward : Defines the next view to give focus to when the next focus is FOCUS_FORWARD If the reference refers to a view that does not exist or is  part of a hierarchy that is invisible, a java.lang.RuntimeException will result when the  reference is accessed.  [reference] 
-android:nextFocusLeft : Defines the next view to give focus to when the next focus is FOCUS_LEFT.  [reference] 
-android:nextFocusRight : Defines the next view to give focus to when the next focus is FOCUS_RIGHT If the reference refers to a view that does not exist or is  part of a hierarchy that is invisible, a java.lang.RuntimeException will result when the  reference is accessed.  [reference] 
-android:nextFocusUp : Defines the next view to give focus to when the next focus is FOCUS_UP If the reference refers to a view that does not exist or is  part of a hierarchy that is invisible, a java.lang.RuntimeException will result when the  reference is accessed.  [reference] 
-android:numColumns : Defines how many columns to show.  [integer, enum] 
-android:numStars : The number of stars (or rating items) to show.  [integer] 
-android:numeric : If set, specifies that this TextView has a numeric input method. * Deprecated: Use inputType instead.  [flag] 
-android:onClick : Name of the method in this View's context to invoke when the  view is clicked.  [string] 
-android:orientation : Should the layout be a column or a row? Use "horizontal" for  a row, "vertical" for a column.  [enum] 
-android:outAnimation : Identifier for the animation to use when a view is hidden.  [reference] 
-android:overScrollFooter : Drawable to draw below list content.  [reference, color] 
-android:overScrollHeader : Drawable to draw above list content.  [reference, color] 
-android:overScrollMode : Defines over-scrolling behavior.  [enum] 
-android:padding : Sets the padding, in pixels, of all four edges.  [dimension] 
-android:paddingBottom : Sets the padding, in pixels, of the bottom edge; see padding.  [dimension] 
-android:paddingLeft : Sets the padding, in pixels, of the left edge; see padding.  [dimension] 
-android:paddingRight : Sets the padding, in pixels, of the right edge; see padding.  [dimension] 
-android:paddingTop : Sets the padding, in pixels, of the top edge; see padding.  [dimension] 
-android:password : Whether the characters of the field are displayed as password  dots instead of themselves. * Deprecated: Use inputType instead.  [boolean] 
-android:persistentDrawingCache : Defines the persistence of the drawing cache.  [flag] 
-android:phoneNumber : If set, specifies that this TextView has a phone number input  method. * Deprecated: Use inputType instead.  [boolean] 
-android:popupBackground : Background drawable to use for the dropdown in spinnerMode="dropdown".  [reference, color] 
-android:popupPromptView : Reference to a layout to use for displaying a prompt in the dropdown  for spinnerMode="dropdown".  [reference] 
-android:privateImeOptions : An addition content type description to supply to the input method  attached to the text view, which is private to the implementation  of the input method.  [string] 
-android:progress : Defines the default progress value, between 0 and max.  [integer] 
-android:progressDrawable : Drawable used for the progress mode.  [reference] 
-android:prompt : The prompt to display when the spinner's dialog is shown.  [reference] 
-android:queryHint : An optional query hint string to be displayed in the empty query  field.  [string] 
-android:quickContactWindowSize : [enum] 
-android:rating : The rating to set by default.  [float] 
-android:rotation : rotation of the view, in degrees.  [float] 
-android:rotationX : rotation of the view around the x axis, in degrees.  [float] 
-android:rotationY : rotation of the view around the y axis, in degrees.  [float] 
-android:saveEnabled : If unset, no state will be saved for this view when it is being  frozen.  [boolean] 
-android:scaleType : Controls how the image should be resized or moved to match the  size of this ImageView.  [enum] 
-android:scaleX : scale of the view in the x direction.  [float] 
-android:scaleY : scale of the view in the y direction.  [float] 
-android:scrollHorizontally : Whether the text is allowed to be wider than the view (and therefore  can be scrolled horizontally).  [boolean] 
-android:scrollX : The initial horizontal scroll offset, in pixels.  [dimension] 
-android:scrollY : The initial vertical scroll offset, in pixels.  [dimension] 
-android:scrollbarAlwaysDrawHorizontalTrack : Defines whether the horizontal scrollbar track should always  be drawn.  [boolean] 
-android:scrollbarAlwaysDrawVerticalTrack : Defines whether the vertical scrollbar track should always be  drawn.  [boolean] 
-android:scrollbarDefaultDelayBeforeFade : Defines the delay in milliseconds that a scrollbar waits before  fade out.  [integer] 
-android:scrollbarFadeDuration : Defines the delay in milliseconds that a scrollbar takes to fade  out.  [integer] 
-android:scrollbarSize : Sets the width of vertical scrollbars and height of horizontal  scrollbars.  [dimension] 
-android:scrollbarStyle : Controls the scrollbar style and position.  [enum] 
-android:scrollbarThumbHorizontal : Defines the horizontal scrollbar thumb drawable.  [reference] 
-android:scrollbarThumbVertical : Defines the vertical scrollbar thumb drawable.  [reference] 
-android:scrollbarTrackHorizontal : Defines the horizontal scrollbar track drawable.  [reference] 
-android:scrollbarTrackVertical : Defines the vertical scrollbar track drawable.  [reference] 
-android:scrollbars : Defines which scrollbars should be displayed on scrolling or  not.  [flag] 
-android:scrollingCache : When set to true, the list uses a drawing cache during scrolling.  [boolean] 
-android:secondaryProgress : Defines the secondary progress value, between 0 and max.  [integer] 
-android:selectAllOnFocus : If the text is selectable, select it all when the view takes  focus instead of moving the cursor to the start or end.  [boolean] 
-android:selectedDateVerticalBar : Drawable for the vertical bar shown at the beggining and at the  end of a selected date.  [reference] 
-android:selectedWeekBackgroundColor : The background color for the selected week.  [reference, color] 
-android:selectionDivider : @hide The divider for making the selection area.  [reference] 
-android:selectionDividerHeight : @hide The height of the selection divider.  [dimension] 
-android:shadowColor : Place a shadow of the specified color behind the text.  [color] 
-android:shadowDx : Horizontal offset of the shadow.  [float] 
-android:shadowDy : Vertical offset of the shadow.  [float] 
-android:shadowRadius : Radius of the shadow.  [float] 
-android:showDividers : Setting for which dividers to show.  [flag] 
-android:showWeekNumber : Whether do show week numbers.  [boolean] 
-android:shownWeekCount : The number of weeks to be shown.  [integer] 
-android:shrinkColumns : The zero-based index of the columns to shrink.  [string] 
-android:singleLine : Constrains the text to a single horizontally scrolling line instead  of letting it wrap onto multiple lines, and advances focus instead  of inserting a newline when you press the enter key. * Deprecated: This attribute is deprecated and is replaced by  the textMultiLine flag in the inputType attribute. Use caution  when altering existing layouts, as the default value of singeLine  is false (multi-line mode), but if you specify any value for  inputType, the default is single-line mode. (If both singleLine  and inputType attributes are found, the inputType flags will  override the value of singleLine.).  [boolean] 
-android:smoothScrollbar : When set to true, the list will use a more refined calculation  method based on the pixels height of the items visible on screen.  [boolean] 
-android:solidColor : @hide Color for the solid color background if such for optimized  rendering.  [reference, color] 
-android:soundEffectsEnabled : Boolean that controls whether a view should have sound effects  enabled for events such as clicking and touching.  [boolean] 
-android:spacing : [dimension] 
-android:spinnerMode : Display mode for spinner options.  [enum] 
-android:spinnersShown : Whether the spinners are shown.  [boolean] 
-android:splitMotionEvents : Sets whether this ViewGroup should split MotionEvents to separate  child views during touch event dispatch.  [boolean] 
-android:src : Sets a drawable as the content of this ImageView.  [reference, color] 
-android:stackFromBottom : Used by ListView and GridView to stack their content from the  bottom.  [boolean] 
-android:startYear : The first year (inclusive), for example "1940".  [integer] 
-android:stepSize : The step size of the rating.  [float] 
-android:stretchColumns : The zero-based index of the columns to stretch.  [string] 
-android:stretchMode : Defines how columns should stretch to fill the available empty  space, if any.  [enum] 
-style : A reference to a custom style  [reference] 
-android:tabLayout : Layout used to organize each tab's content.  [reference] 
-android:tabStripEnabled : Determines whether the strip under the tab indicators is drawn  or not.  [boolean] 
-android:tabStripLeft : Drawable used to draw the left part of the strip underneath the  tabs.  [reference] 
-android:tabStripRight : Drawable used to draw the right part of the strip underneath  the tabs.  [reference] 
-android:tag : Supply a tag for the top-level view containing a String, to be  retrieved later with View.getTag() or searched for with View.findViewWithTag() .  [string] 
-android:text : Text to display.  [string] 
-android:textAppearance : Base text color, typeface, size, and style.  [reference] 
-android:textColor : Text color.  [reference, color] 
-android:textColorHighlight : Color of the text selection highlight.  [reference, color] 
-android:textColorHint : Color of the hint text.  [reference, color] 
-android:textColorLink : Text color for links.  [reference, color] 
-android:textCursorDrawable : Reference to a drawable that will be drawn under the insertion  cursor.  [reference] 
-android:textEditNoPasteWindowLayout : Variation of textEditPasteWindowLayout displayed when the clipboard  is empty.  [reference] 
-android:textEditPasteWindowLayout : The layout of the view that is displayed on top of the cursor  to paste inside a TextEdit field.  [reference] 
-android:textEditSideNoPasteWindowLayout : Variation of textEditSidePasteWindowLayout displayed when the  clipboard is empty.  [reference] 
-android:textEditSidePasteWindowLayout : Used instead of textEditPasteWindowLayout when the window is  moved on the side of the insertion cursor because it would be  clipped if it were positioned on top.  [reference] 
-android:textFilterEnabled : When set to true, the list will filter results as the user types.  [boolean] 
-android:textIsSelectable : Indicates that the content of a non-editable text can be selected.  [boolean] 
-android:textOff : The text for the button when it is not checked.  [string] 
-android:textOn : The text for the button when it is checked.  [string] 
-android:textScaleX : Sets the horizontal scaling factor for the text.  [float] 
-android:textSelectHandle : Reference to a drawable that will be used to display a text selection  anchor for positioning the cursor within text.  [reference] 
-android:textSelectHandleLeft : Reference to a drawable that will be used to display a text selection  anchor on the left side of a selection region.  [reference] 
-android:textSelectHandleRight : Reference to a drawable that will be used to display a text selection  anchor on the right side of a selection region.  [reference] 
-android:textSize : Size of the text.  [dimension] 
-android:textStyle : Style (bold, italic, bolditalic) for the text.  [flag] 
-android:thumb : Draws the thumb on a seekbar.  [reference] 
-android:thumbOffset : An offset for the thumb that allows it to extend out of the range  of the track.  [dimension] 
-android:tint : Set a tinting color for the image.  [color] 
-android:topOffset : Extra offset for the handle at the top of the SlidingDrawer.  [dimension] 
-android:transcriptMode : Sets the transcript mode for the list.  [enum] 
-android:transformPivotX : x location of the pivot point around which the view will rotate  and scale.  [dimension] 
-android:transformPivotY : y location of the pivot point around which the view will rotate  and scale.  [dimension] 
-android:translationX : translation in x of the view.  [dimension] 
-android:translationY : translation in y of the view.  [dimension] 
-android:typeface : Typeface (normal, sans, serif, monospace) for the text.  [enum] 
-android:uncertainGestureColor : Color used to draw the user's strokes until we are sure it's  a gesture.  [color] 
-android:unfocusedMonthDateColor : The color for the dates of an unfocused month.  [reference, color] 
-android:unselectedAlpha : Sets the alpha on the items that are not selected.  [float] 
-android:verticalScrollbarPosition : Determines which side the vertical scroll bar should be placed  on.  [enum] 
-android:verticalSpacing : Defines the default vertical spacing between rows.  [dimension] 
-android:visibility : Controls the initial visibility of the view.  [enum] 
-android:weekDayTextAppearance : The text appearance for the week day abbreviation of the calendar  header.  [reference] 
-android:weekNumberColor : The color for the week numbers.  [reference, color] 
-android:weekSeparatorLineColor : The color for the sepatator line between weeks.  [reference, color] 
-android:weightSum : Defines the maximum weight sum.  [float] 
-android:width : Makes the TextView be exactly this many pixels wide.  [dimension] 
+android:nextFocusDown : Defines the next view to give focus to when the next focus is FOCUS_DOWN If the reference refers to a view that does not exist or is  part of a hierarchy that is invisible, a java.lang.RuntimeException will result when the  reference is accessed.  [reference]
+android:nextFocusForward : Defines the next view to give focus to when the next focus is FOCUS_FORWARD If the reference refers to a view that does not exist or is  part of a hierarchy that is invisible, a java.lang.RuntimeException will result when the  reference is accessed.  [reference]
+android:nextFocusLeft : Defines the next view to give focus to when the next focus is FOCUS_LEFT.  [reference]
+android:nextFocusRight : Defines the next view to give focus to when the next focus is FOCUS_RIGHT If the reference refers to a view that does not exist or is  part of a hierarchy that is invisible, a java.lang.RuntimeException will result when the  reference is accessed.  [reference]
+android:nextFocusUp : Defines the next view to give focus to when the next focus is FOCUS_UP If the reference refers to a view that does not exist or is  part of a hierarchy that is invisible, a java.lang.RuntimeException will result when the  reference is accessed.  [reference]
+android:numColumns : Defines how many columns to show.  [integer, enum]
+android:numStars : The number of stars (or rating items) to show.  [integer]
+android:numeric : If set, specifies that this TextView has a numeric input method. * Deprecated: Use inputType instead.  [flag]
+android:onClick : Name of the method in this View's context to invoke when the  view is clicked.  [string]
+android:orientation : Should the layout be a column or a row? Use "horizontal" for  a row, "vertical" for a column.  [enum]
+android:outAnimation : Identifier for the animation to use when a view is hidden.  [reference]
+android:overScrollFooter : Drawable to draw below list content.  [reference, color]
+android:overScrollHeader : Drawable to draw above list content.  [reference, color]
+android:overScrollMode : Defines over-scrolling behavior.  [enum]
+android:padding : Sets the padding, in pixels, of all four edges.  [dimension]
+android:paddingBottom : Sets the padding, in pixels, of the bottom edge; see padding.  [dimension]
+android:paddingLeft : Sets the padding, in pixels, of the left edge; see padding.  [dimension]
+android:paddingRight : Sets the padding, in pixels, of the right edge; see padding.  [dimension]
+android:paddingTop : Sets the padding, in pixels, of the top edge; see padding.  [dimension]
+android:password : Whether the characters of the field are displayed as password  dots instead of themselves. * Deprecated: Use inputType instead.  [boolean]
+android:persistentDrawingCache : Defines the persistence of the drawing cache.  [flag]
+android:phoneNumber : If set, specifies that this TextView has a phone number input  method. * Deprecated: Use inputType instead.  [boolean]
+android:popupBackground : Background drawable to use for the dropdown in spinnerMode="dropdown".  [reference, color]
+android:popupPromptView : Reference to a layout to use for displaying a prompt in the dropdown  for spinnerMode="dropdown".  [reference]
+android:privateImeOptions : An addition content type description to supply to the input method  attached to the text view, which is private to the implementation  of the input method.  [string]
+android:progress : Defines the default progress value, between 0 and max.  [integer]
+android:progressDrawable : Drawable used for the progress mode.  [reference]
+android:prompt : The prompt to display when the spinner's dialog is shown.  [reference]
+android:queryHint : An optional query hint string to be displayed in the empty query  field.  [string]
+android:quickContactWindowSize : [enum]
+android:rating : The rating to set by default.  [float]
+android:rotation : rotation of the view, in degrees.  [float]
+android:rotationX : rotation of the view around the x axis, in degrees.  [float]
+android:rotationY : rotation of the view around the y axis, in degrees.  [float]
+android:saveEnabled : If unset, no state will be saved for this view when it is being  frozen.  [boolean]
+android:scaleType : Controls how the image should be resized or moved to match the  size of this ImageView.  [enum]
+android:scaleX : scale of the view in the x direction.  [float]
+android:scaleY : scale of the view in the y direction.  [float]
+android:scrollHorizontally : Whether the text is allowed to be wider than the view (and therefore  can be scrolled horizontally).  [boolean]
+android:scrollX : The initial horizontal scroll offset, in pixels.  [dimension]
+android:scrollY : The initial vertical scroll offset, in pixels.  [dimension]
+android:scrollbarAlwaysDrawHorizontalTrack : Defines whether the horizontal scrollbar track should always  be drawn.  [boolean]
+android:scrollbarAlwaysDrawVerticalTrack : Defines whether the vertical scrollbar track should always be  drawn.  [boolean]
+android:scrollbarDefaultDelayBeforeFade : Defines the delay in milliseconds that a scrollbar waits before  fade out.  [integer]
+android:scrollbarFadeDuration : Defines the delay in milliseconds that a scrollbar takes to fade  out.  [integer]
+android:scrollbarSize : Sets the width of vertical scrollbars and height of horizontal  scrollbars.  [dimension]
+android:scrollbarStyle : Controls the scrollbar style and position.  [enum]
+android:scrollbarThumbHorizontal : Defines the horizontal scrollbar thumb drawable.  [reference]
+android:scrollbarThumbVertical : Defines the vertical scrollbar thumb drawable.  [reference]
+android:scrollbarTrackHorizontal : Defines the horizontal scrollbar track drawable.  [reference]
+android:scrollbarTrackVertical : Defines the vertical scrollbar track drawable.  [reference]
+android:scrollbars : Defines which scrollbars should be displayed on scrolling or  not.  [flag]
+android:scrollingCache : When set to true, the list uses a drawing cache during scrolling.  [boolean]
+android:secondaryProgress : Defines the secondary progress value, between 0 and max.  [integer]
+android:selectAllOnFocus : If the text is selectable, select it all when the view takes  focus instead of moving the cursor to the start or end.  [boolean]
+android:selectedDateVerticalBar : Drawable for the vertical bar shown at the beggining and at the  end of a selected date.  [reference]
+android:selectedWeekBackgroundColor : The background color for the selected week.  [reference, color]
+android:selectionDivider : @hide The divider for making the selection area.  [reference]
+android:selectionDividerHeight : @hide The height of the selection divider.  [dimension]
+android:shadowColor : Place a shadow of the specified color behind the text.  [color]
+android:shadowDx : Horizontal offset of the shadow.  [float]
+android:shadowDy : Vertical offset of the shadow.  [float]
+android:shadowRadius : Radius of the shadow.  [float]
+android:showDividers : Setting for which dividers to show.  [flag]
+android:showWeekNumber : Whether do show week numbers.  [boolean]
+android:shownWeekCount : The number of weeks to be shown.  [integer]
+android:shrinkColumns : The zero-based index of the columns to shrink.  [string]
+android:singleLine : Constrains the text to a single horizontally scrolling line instead  of letting it wrap onto multiple lines, and advances focus instead  of inserting a newline when you press the enter key. * Deprecated: This attribute is deprecated and is replaced by  the textMultiLine flag in the inputType attribute. Use caution  when altering existing layouts, as the default value of singeLine  is false (multi-line mode), but if you specify any value for  inputType, the default is single-line mode. (If both singleLine  and inputType attributes are found, the inputType flags will  override the value of singleLine.).  [boolean]
+android:smoothScrollbar : When set to true, the list will use a more refined calculation  method based on the pixels height of the items visible on screen.  [boolean]
+android:solidColor : @hide Color for the solid color background if such for optimized  rendering.  [reference, color]
+android:soundEffectsEnabled : Boolean that controls whether a view should have sound effects  enabled for events such as clicking and touching.  [boolean]
+android:spacing : [dimension]
+android:spinnerMode : Display mode for spinner options.  [enum]
+android:spinnersShown : Whether the spinners are shown.  [boolean]
+android:splitMotionEvents : Sets whether this ViewGroup should split MotionEvents to separate  child views during touch event dispatch.  [boolean]
+android:src : Sets a drawable as the content of this ImageView.  [reference, color]
+android:stackFromBottom : Used by ListView and GridView to stack their content from the  bottom.  [boolean]
+android:startYear : The first year (inclusive), for example "1940".  [integer]
+android:stepSize : The step size of the rating.  [float]
+android:stretchColumns : The zero-based index of the columns to stretch.  [string]
+android:stretchMode : Defines how columns should stretch to fill the available empty  space, if any.  [enum]
+style : A reference to a custom style  [reference]
+android:tabLayout : Layout used to organize each tab's content.  [reference]
+android:tabStripEnabled : Determines whether the strip under the tab indicators is drawn  or not.  [boolean]
+android:tabStripLeft : Drawable used to draw the left part of the strip underneath the  tabs.  [reference]
+android:tabStripRight : Drawable used to draw the right part of the strip underneath  the tabs.  [reference]
+android:tag : Supply a tag for the top-level view containing a String, to be  retrieved later with View.getTag() or searched for with View.findViewWithTag() .  [string]
+android:text : Text to display.  [string]
+android:textAppearance : Base text color, typeface, size, and style.  [reference]
+android:textColor : Text color.  [reference, color]
+android:textColorHighlight : Color of the text selection highlight.  [reference, color]
+android:textColorHint : Color of the hint text.  [reference, color]
+android:textColorLink : Text color for links.  [reference, color]
+android:textCursorDrawable : Reference to a drawable that will be drawn under the insertion  cursor.  [reference]
+android:textEditNoPasteWindowLayout : Variation of textEditPasteWindowLayout displayed when the clipboard  is empty.  [reference]
+android:textEditPasteWindowLayout : The layout of the view that is displayed on top of the cursor  to paste inside a TextEdit field.  [reference]
+android:textEditSideNoPasteWindowLayout : Variation of textEditSidePasteWindowLayout displayed when the  clipboard is empty.  [reference]
+android:textEditSidePasteWindowLayout : Used instead of textEditPasteWindowLayout when the window is  moved on the side of the insertion cursor because it would be  clipped if it were positioned on top.  [reference]
+android:textFilterEnabled : When set to true, the list will filter results as the user types.  [boolean]
+android:textIsSelectable : Indicates that the content of a non-editable text can be selected.  [boolean]
+android:textOff : The text for the button when it is not checked.  [string]
+android:textOn : The text for the button when it is checked.  [string]
+android:textScaleX : Sets the horizontal scaling factor for the text.  [float]
+android:textSelectHandle : Reference to a drawable that will be used to display a text selection  anchor for positioning the cursor within text.  [reference]
+android:textSelectHandleLeft : Reference to a drawable that will be used to display a text selection  anchor on the left side of a selection region.  [reference]
+android:textSelectHandleRight : Reference to a drawable that will be used to display a text selection  anchor on the right side of a selection region.  [reference]
+android:textSize : Size of the text.  [dimension]
+android:textStyle : Style (bold, italic, bolditalic) for the text.  [flag]
+android:thumb : Draws the thumb on a seekbar.  [reference]
+android:thumbOffset : An offset for the thumb that allows it to extend out of the range  of the track.  [dimension]
+android:tint : Set a tinting color for the image.  [color]
+android:topOffset : Extra offset for the handle at the top of the SlidingDrawer.  [dimension]
+android:transcriptMode : Sets the transcript mode for the list.  [enum]
+android:transformPivotX : x location of the pivot point around which the view will rotate  and scale.  [dimension]
+android:transformPivotY : y location of the pivot point around which the view will rotate  and scale.  [dimension]
+android:translationX : translation in x of the view.  [dimension]
+android:translationY : translation in y of the view.  [dimension]
+android:typeface : Typeface (normal, sans, serif, monospace) for the text.  [enum]
+android:uncertainGestureColor : Color used to draw the user's strokes until we are sure it's  a gesture.  [color]
+android:unfocusedMonthDateColor : The color for the dates of an unfocused month.  [reference, color]
+android:unselectedAlpha : Sets the alpha on the items that are not selected.  [float]
+android:verticalScrollbarPosition : Determines which side the vertical scroll bar should be placed  on.  [enum]
+android:verticalSpacing : Defines the default vertical spacing between rows.  [dimension]
+android:visibility : Controls the initial visibility of the view.  [enum]
+android:weekDayTextAppearance : The text appearance for the week day abbreviation of the calendar  header.  [reference]
+android:weekNumberColor : The color for the week numbers.  [reference, color]
+android:weekSeparatorLineColor : The color for the sepatator line between weeks.  [reference, color]
+android:weightSum : Defines the maximum weight sum.  [float]
+android:width : Makes the TextView be exactly this many pixels wide.  [dimension]
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/drawable1-expected-completion48.txt b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/drawable1-expected-completion48.txt
index f98bb4c..024cdeb 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/drawable1-expected-completion48.txt
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/drawable1-expected-completion48.txt
@@ -1,3 +1,3 @@
 Code completion in drawable1.xml for ^xmlns:android:
-android:opacity : Indicates the opacity of the layer.  [enum] 
+android:opacity : Indicates the opacity of the layer.  [enum]
 xmlns:android
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/drawable1-expected-completion49.txt b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/drawable1-expected-completion49.txt
index 4d3dfe3..269fd86 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/drawable1-expected-completion49.txt
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/drawable1-expected-completion49.txt
@@ -1,7 +1,7 @@
 Code completion in drawable1.xml for <item ^></item>:
-android:left : Left coordinate of the layer.  [dimension] 
-android:top : Top coordinate of the layer.  [dimension] 
-android:right : Right coordinate of the layer.  [dimension] 
-android:bottom : Bottom coordinate of the layer.  [dimension] 
-android:drawable : Drawable used to render the layer.  [reference] 
-android:id : Identifier of the layer.  [reference] 
+android:left : Left coordinate of the layer.  [dimension]
+android:top : Top coordinate of the layer.  [dimension]
+android:right : Right coordinate of the layer.  [dimension]
+android:bottom : Bottom coordinate of the layer.  [dimension]
+android:drawable : Drawable used to render the layer.  [reference]
+android:id : Identifier of the layer.  [reference]
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/drawable2-expected-completion51.txt b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/drawable2-expected-completion51.txt
index 1471845..438bd76 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/drawable2-expected-completion51.txt
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/drawable2-expected-completion51.txt
@@ -1,10 +1,10 @@
 Code completion in drawable2.xml for ^android:innerRadiusRatio="2":
-android:visible : Indicates whether the drawable should intially be visible.  [boolean] 
-android:dither : Enables or disables dithering.  [boolean] 
-android:shape : Indicates what shape to fill with a gradient.  [enum] 
-android:innerRadiusRatio : Inner radius of the ring expressed as a ratio of the ring's width.  [float] 
-android:thicknessRatio : Thickness of the ring expressed as a ratio of the ring's width.  [float] 
-android:innerRadius : Inner radius of the ring.  [dimension] 
-android:thickness : Thickness of the ring.  [dimension] 
+android:visible : Indicates whether the drawable should intially be visible.  [boolean]
+android:dither : Enables or disables dithering.  [boolean]
+android:shape : Indicates what shape to fill with a gradient.  [enum]
+android:innerRadiusRatio : Inner radius of the ring expressed as a ratio of the ring's width.  [float]
+android:thicknessRatio : Thickness of the ring expressed as a ratio of the ring's width.  [float]
+android:innerRadius : Inner radius of the ring.  [dimension]
+android:thickness : Thickness of the ring.  [dimension]
 android:useLevel : Indicates whether the drawable's level affects the way the gradient  is drawn.
 xmlns:android
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/manifest-expected-completion17.txt b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/manifest-expected-completion17.txt
index 6d966da..815d393 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/manifest-expected-completion17.txt
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/manifest-expected-completion17.txt
@@ -1,7 +1,7 @@
 Code completion in manifest.xml for ^android:versionCode="1":
 package : This attribute gives a unique name for the package, using a Java-style naming convention to avoid name collisions. For example, applications published by Google could have names of the form com.google.app.appname
-android:versionCode : Internal version code.  [integer] 
-android:versionName : The text shown to the user to indicate the version they have.  [string] 
-android:sharedUserId : Specify the name of a user ID that will be shared between multiple  packages.  [string] 
-android:sharedUserLabel : Specify a label for the shared user UID of this package.  [reference] 
-android:installLocation : The default install location defined by an application.  [enum] 
+android:versionCode : Internal version code.  [integer]
+android:versionName : The text shown to the user to indicate the version they have.  [string]
+android:sharedUserId : Specify the name of a user ID that will be shared between multiple  packages.  [string]
+android:sharedUserLabel : Specify a label for the shared user UID of this package.  [reference]
+android:installLocation : The default install location defined by an application.  [enum]
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/manifest-expected-completion18.txt b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/manifest-expected-completion18.txt
index 6fd1096..21bb2fa 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/manifest-expected-completion18.txt
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/manifest-expected-completion18.txt
@@ -1,27 +1,27 @@
 Code completion in manifest.xml for <activity android:^name=".TestActivity":
-android:name : Required name of the class implementing the activity, deriving  from android.app.Activity.  [string] 
-android:theme : The overall theme to use for an activity.  [reference] 
-android:label : A user-legible name for the given item.  [string, reference] 
-android:description : Descriptive text for the associated data.  [reference] 
-android:icon : A Drawable resource providing a graphical representation of its  associated item.  [reference] 
-android:logo : A Drawable resource providing an extended graphical logo for  its associated item.  [reference] 
-android:launchMode : Specify how an activity should be launched.  [enum] 
-android:screenOrientation : Specify the orientation an activity should be run in.  [enum] 
-android:configChanges : Specify one or more configuration changes that the activity will  handle itself.  [flag] 
-android:permission : Specify a permission that a client is required to have in order  to use the associated object.  [string] 
-android:multiprocess : Specify whether a component is allowed to have multiple instances  of itself running in different processes.  [boolean] 
-android:process : Specify a specific process that the associated code is to run  in.  [string] 
-android:taskAffinity : Specify a task name that activities have an "affinity" to.  [string] 
-android:allowTaskReparenting : Specify that an activity can be moved out of a task it is in  to the task it has an affinity for when appropriate.  [boolean] 
-android:finishOnTaskLaunch : Specify whether an activity should be finished when its task  is brought to the foreground by relaunching from the home screen.  [boolean] 
-android:finishOnCloseSystemDialogs : Specify whether an activity should be finished when a "close  system windows" request has been made.  [boolean] 
-android:clearTaskOnLaunch : Specify whether an activity's task should be cleared when it  is re-launched from the home screen.  [boolean] 
-android:noHistory : Specify whether an activity should be kept in its history stack.  [boolean] 
-android:alwaysRetainTaskState : Specify whether an acitivty's task state should always be maintained  by the system, or if it is allowed to reset the task to its initial  state in certain situations.  [boolean] 
-android:stateNotNeeded : Indicates that an Activity does not need to have its freeze state  (as returned by onSaveInstanceState retained in order to be restarted.  [boolean] 
-android:excludeFromRecents : Indicates that an Activity should be excluded from the list of  recently launched activities.  [boolean] 
-android:enabled : Specify whether the activity is enabled or not (that is, can  be instantiated by the system).  [boolean] 
-android:exported : Flag indicating whether the given application component is available  to other applications.  [boolean] 
-android:windowSoftInputMode : Specify the default soft-input mode for the main window of this  activity.  [flag] 
-android:immersive : Flag declaring this activity to be 'immersive'; immersive activities  should not be interrupted with other activities or notifications.  [boolean] 
-android:hardwareAccelerated : <p>Flag indicating whether the application's rendering should  be hardware accelerated if possible.  [boolean] 
+android:name : Required name of the class implementing the activity, deriving  from android.app.Activity.  [string]
+android:theme : The overall theme to use for an activity.  [reference]
+android:label : A user-legible name for the given item.  [string, reference]
+android:description : Descriptive text for the associated data.  [reference]
+android:icon : A Drawable resource providing a graphical representation of its  associated item.  [reference]
+android:logo : A Drawable resource providing an extended graphical logo for  its associated item.  [reference]
+android:launchMode : Specify how an activity should be launched.  [enum]
+android:screenOrientation : Specify the orientation an activity should be run in.  [enum]
+android:configChanges : Specify one or more configuration changes that the activity will  handle itself.  [flag]
+android:permission : Specify a permission that a client is required to have in order  to use the associated object.  [string]
+android:multiprocess : Specify whether a component is allowed to have multiple instances  of itself running in different processes.  [boolean]
+android:process : Specify a specific process that the associated code is to run  in.  [string]
+android:taskAffinity : Specify a task name that activities have an "affinity" to.  [string]
+android:allowTaskReparenting : Specify that an activity can be moved out of a task it is in  to the task it has an affinity for when appropriate.  [boolean]
+android:finishOnTaskLaunch : Specify whether an activity should be finished when its task  is brought to the foreground by relaunching from the home screen.  [boolean]
+android:finishOnCloseSystemDialogs : Specify whether an activity should be finished when a "close  system windows" request has been made.  [boolean]
+android:clearTaskOnLaunch : Specify whether an activity's task should be cleared when it  is re-launched from the home screen.  [boolean]
+android:noHistory : Specify whether an activity should be kept in its history stack.  [boolean]
+android:alwaysRetainTaskState : Specify whether an acitivty's task state should always be maintained  by the system, or if it is allowed to reset the task to its initial  state in certain situations.  [boolean]
+android:stateNotNeeded : Indicates that an Activity does not need to have its freeze state  (as returned by onSaveInstanceState retained in order to be restarted.  [boolean]
+android:excludeFromRecents : Indicates that an Activity should be excluded from the list of  recently launched activities.  [boolean]
+android:enabled : Specify whether the activity is enabled or not (that is, can  be instantiated by the system).  [boolean]
+android:exported : Flag indicating whether the given application component is available  to other applications.  [boolean]
+android:windowSoftInputMode : Specify the default soft-input mode for the main window of this  activity.  [flag]
+android:immersive : Flag declaring this activity to be 'immersive'; immersive activities  should not be interrupted with other activities or notifications.  [boolean]
+android:hardwareAccelerated : <p>Flag indicating whether the application's rendering should  be hardware accelerated if possible.  [boolean]