Merge "37688: Completion doesn't work with Library Project's resources"

23 files changed, 169 insertions, 17 deletions

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/uimodel/UiResourceAttributeNode.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/uimodel/UiResourceAttributeNode.java
index 4addbf0..bce3db4 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/uimodel/UiResourceAttributeNode.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/uimodel/UiResourceAttributeNode.java
@@ -25,6 +25,8 @@ import static com.android.SdkConstants.ATTR_STYLE;
 import static com.android.SdkConstants.PREFIX_RESOURCE_REF;
 import static com.android.SdkConstants.PREFIX_THEME_REF;
 
+import com.android.annotations.NonNull;
+import com.android.annotations.Nullable;
 import com.android.ide.common.api.IAttributeInfo;
 import com.android.ide.common.api.IAttributeInfo.Format;
 import com.android.ide.common.resources.ResourceItem;
@@ -36,6 +38,8 @@ import com.android.ide.eclipse.adt.internal.editors.descriptors.TextAttributeDes
 import com.android.ide.eclipse.adt.internal.editors.ui.SectionHelper;
 import com.android.ide.eclipse.adt.internal.resources.manager.ResourceManager;
 import com.android.ide.eclipse.adt.internal.sdk.AndroidTargetData;
+import com.android.ide.eclipse.adt.internal.sdk.ProjectState;
+import com.android.ide.eclipse.adt.internal.sdk.Sdk;
 import com.android.ide.eclipse.adt.internal.ui.ReferenceChooserDialog;
 import com.android.ide.eclipse.adt.internal.ui.ResourceChooser;
 import com.android.resources.ResourceType;
@@ -57,11 +61,14 @@ import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.TableWrapData;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.EnumSet;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -212,25 +219,89 @@ public class UiResourceAttributeNode extends UiTextAttributeNode {
         return computeResourceStringMatches(getUiParent().getEditor(), getDescriptor(), prefix);
     }
 
-    public static String[] computeResourceStringMatches(AndroidXmlEditor editor,
-            AttributeDescriptor attributeDescriptor, String prefix) {
-        ResourceRepository repository = null;
-        boolean isSystem = false;
+    /**
+     * Computes the set of resource string matches for a given resource prefix in a given editor
+     *
+     * @param editor the editor context
+     * @param descriptor the attribute descriptor, if any
+     * @param prefix the prefix, if any
+     * @return an array of resource string matches
+     */
+    @Nullable
+    public static String[] computeResourceStringMatches(
+            @NonNull AndroidXmlEditor editor,
+            @Nullable AttributeDescriptor descriptor,
+            @Nullable String prefix) {
 
         if (prefix == null || !prefix.regionMatches(1, ANDROID_PKG, 0, ANDROID_PKG.length())) {
             IProject project = editor.getProject();
             if (project != null) {
                 // get the resource repository for this project and the system resources.
-                repository = ResourceManager.getInstance().getProjectResources(project);
+                ResourceManager resourceManager = ResourceManager.getInstance();
+                ResourceRepository repository = resourceManager.getProjectResources(project);
+
+                List<IProject> libraries = null;
+                ProjectState projectState = Sdk.getProjectState(project);
+                if (projectState != null) {
+                    libraries = projectState.getFullLibraryProjects();
+                }
+
+                String[] projectMatches = computeResourceStringMatches(descriptor, prefix,
+                        repository, false);
+
+                if (libraries == null || libraries.isEmpty()) {
+                    return projectMatches;
+                }
+
+                // Also compute matches for each of the libraries, and combine them
+                Set<String> matches = new HashSet<String>(200);
+                for (String s : projectMatches) {
+                    matches.add(s);
+                }
+
+                for (IProject library : libraries) {
+                    repository = resourceManager.getProjectResources(library);
+                    projectMatches = computeResourceStringMatches(descriptor, prefix,
+                            repository, false);
+                    for (String s : projectMatches) {
+                        matches.add(s);
+                    }
+                }
+
+                String[] sorted = matches.toArray(new String[matches.size()]);
+                Arrays.sort(sorted);
+                return sorted;
             }
         } else {
             // If there's a prefix with "android:" in it, use the system resources
             // Non-public framework resources are filtered out later.
             AndroidTargetData data = editor.getTargetData();
-            repository = data.getFrameworkResources();
-            isSystem = true;
+            if (data != null) {
+                ResourceRepository repository = data.getFrameworkResources();
+                return computeResourceStringMatches(descriptor, prefix, repository, true);
+            }
         }
 
+        return null;
+    }
+
+    /**
+     * Computes the set of resource string matches for a given prefix and a
+     * given resource repository
+     *
+     * @param attributeDescriptor the attribute descriptor, if any
+     * @param prefix the prefix, if any
+     * @param repository the repository to seaerch in
+     * @param isSystem if true, the repository contains framework repository,
+     *            otherwise it contains project repositories
+     * @return an array of resource string matches
+     */
+    @NonNull
+    public static String[] computeResourceStringMatches(
+            @Nullable AttributeDescriptor attributeDescriptor,
+            @Nullable String prefix,
+            @NonNull ResourceRepository repository,
+            boolean isSystem) {
         // Get list of potential resource types, either specific to this project
         // or the generic list.
         Collection<ResourceType> resTypes = (repository != null) ?
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 8f6cd32..385f476 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
@@ -4,8 +4,8 @@ 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:fillEnabled : When set to true, the value of fillBefore is taken into account.  [boolean]
+android:fillBefore : When set to true or when fillEnabled is not 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]
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 5110e73..e12a66f 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
@@ -2,8 +2,8 @@ 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:fillEnabled : When set to true, the value of fillBefore is taken into account.  [boolean]
+android:fillBefore : When set to true or when fillEnabled is not 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]
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 8899193..99ae870 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
@@ -13,4 +13,7 @@ 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_hovered : State value for StateListDrawable, set when a pointer is hovering  over the view.  [boolean]
+android:state_drag_can_accept : State for StateListDrawable indicating that the Drawable is in  a view that is capable of accepting a drop of the content currently  being manipulated in a drag-and-drop operation.  [boolean]
+android:state_drag_hovered : State for StateListDrawable indicating that a drag operation  (for which the Drawable's view is a valid recipient) is currently  positioned over the Drawable.  [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-completion10.txt b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion1-expected-completion10.txt
index 68efdfb..973d95e 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion1-expected-completion10.txt
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion1-expected-completion10.txt
@@ -5,6 +5,7 @@ TableLayout
 TableRow
 TextSwitcher
 TextView
+TextureView
 TimePicker
 ToggleButton
 TwoLineListItem
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion1-expected-completion11.txt b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion1-expected-completion11.txt
index 701c608..8d25f95 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion1-expected-completion11.txt
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion1-expected-completion11.txt
@@ -15,6 +15,7 @@ Code completion in completion1.xml for ^<TextView:
 <ExpandableListView ></ExpandableListView>
 <FrameLayout ></FrameLayout>
 <Gallery />
+<GridLayout ></GridLayout>
 <GridView ></GridView>
 <HorizontalScrollView ></HorizontalScrollView>
 <ImageButton />
@@ -35,15 +36,18 @@ Code completion in completion1.xml for ^<TextView:
 <SearchView ></SearchView>
 <SeekBar />
 <SlidingDrawer ></SlidingDrawer> : SlidingDrawer specific attributes.
+<Space />
 <Spinner />
 <StackView ></StackView>
 <SurfaceView />
+<Switch />
 <TabHost ></TabHost>
 <TabWidget ></TabWidget>
 <TableLayout ></TableLayout>
 <TableRow ></TableRow>
 <TextSwitcher ></TextSwitcher>
 <TextView />
+<TextureView />
 <TimePicker />
 <ToggleButton />
 <TwoLineListItem />
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion1-expected-completion12.txt b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion1-expected-completion12.txt
index 9bf7169..a5fe067 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion1-expected-completion12.txt
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion1-expected-completion12.txt
@@ -15,6 +15,7 @@ Code completion in completion1.xml for btn_default">^</FrameLayout>:
 <ExpandableListView ></ExpandableListView>
 <FrameLayout ></FrameLayout>
 <Gallery />
+<GridLayout ></GridLayout>
 <GridView ></GridView>
 <HorizontalScrollView ></HorizontalScrollView>
 <ImageButton />
@@ -35,15 +36,18 @@ Code completion in completion1.xml for btn_default">^</FrameLayout>:
 <SearchView ></SearchView>
 <SeekBar />
 <SlidingDrawer ></SlidingDrawer> : SlidingDrawer specific attributes.
+<Space />
 <Spinner />
 <StackView ></StackView>
 <SurfaceView />
+<Switch />
 <TabHost ></TabHost>
 <TabWidget ></TabWidget>
 <TableLayout ></TableLayout>
 <TableRow ></TableRow>
 <TextSwitcher ></TextSwitcher>
 <TextView />
+<TextureView />
 <TimePicker />
 <ToggleButton />
 <TwoLineListItem />
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 281d7a0..0f940c2 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
@@ -52,6 +52,8 @@ android:drawableTop : The drawable to be drawn above the text.  [color, referenc
 android:drawableBottom : The drawable to be drawn below the text.  [color, reference]
 android:drawableLeft : The drawable to be drawn to the left of the text.  [color, reference]
 android:drawableRight : The drawable to be drawn to the right of the text.  [color, reference]
+android:drawableStart : The drawable to be drawn to the start of the text.  [color, reference]
+android:drawableEnd : The drawable to be drawn to the end of the text.  [color, reference]
 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]
@@ -69,8 +71,10 @@ android:textEditPasteWindowLayout : The layout of the view that is displayed on
 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:textEditSuggestionItemLayout : Layout of the TextView item that will populate the suggestion  popup window.  [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:textAllCaps : Present the text in ALL CAPS.  [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]
@@ -81,6 +85,8 @@ android:paddingLeft : Sets the padding, in pixels, of the left edge; see padding
 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:paddingStart : Sets the padding, in pixels, of the start edge; see padding.  [dimension]
+android:paddingEnd : Sets the padding, in pixels, of the end 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]
@@ -98,7 +104,8 @@ android:scrollbarTrackHorizontal : Defines the horizontal scrollbar track drawab
 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:fadingEdge : . * Deprecated: This attribute is deprecated and will be ignored  as of API level {@link android.os.Build.VERSION_CODES#ICE_CREAM_SANDWICH.  [flag]
+android:requiresFadingEdge : Defines which edges should be faded 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]
@@ -131,6 +138,8 @@ 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:layoutDirection : Defines the direction of layout drawing.  [enum]
+android:textDirection : Direction of the text.  [integer, 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]
@@ -140,3 +149,5 @@ android:layout_marginLeft : Specifies extra space on the left side of this view.
 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_marginStart : Specifies extra space on the start side of this view.  [dimension]
+android:layout_marginEnd : Specifies extra space on the end 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/completion11-expected-completion73.txt b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion11-expected-completion73.txt
index a2feb13..04cbbce 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion11-expected-completion73.txt
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion11-expected-completion73.txt
@@ -5,6 +5,8 @@ Code completion in completion11.xml for ?android:attr/Textapp^:
 ?android:attr/textAppearanceLarge
 ?android:attr/textAppearanceLargeInverse
 ?android:attr/textAppearanceLargePopupMenu
+?android:attr/textAppearanceListItem
+?android:attr/textAppearanceListItemSmall
 ?android:attr/textAppearanceMedium
 ?android:attr/textAppearanceMediumInverse
 ?android:attr/textAppearanceSearchResultSubtitle
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion2-expected-completion13a.txt b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion2-expected-completion13a.txt
index 323bb78..dd28c73 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion2-expected-completion13a.txt
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion2-expected-completion13a.txt
@@ -11,3 +11,5 @@ center
 fill
 clip_vertical
 clip_horizontal
+start
+end
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion2-expected-completion13c.txt b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion2-expected-completion13c.txt
index 3e292ce..0aebfed 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion2-expected-completion13c.txt
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion2-expected-completion13c.txt
@@ -10,3 +10,5 @@ bottom|center
 bottom|fill
 bottom|clip_vertical
 bottom|clip_horizontal
+bottom|start
+bottom|end
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 be3d8d5..300494e 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
@@ -52,6 +52,8 @@ android:drawableTop : The drawable to be drawn above the text.  [color, referenc
 android:drawableBottom : The drawable to be drawn below the text.  [color, reference]
 android:drawableLeft : The drawable to be drawn to the left of the text.  [color, reference]
 android:drawableRight : The drawable to be drawn to the right of the text.  [color, reference]
+android:drawableStart : The drawable to be drawn to the start of the text.  [color, reference]
+android:drawableEnd : The drawable to be drawn to the end of the text.  [color, reference]
 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]
@@ -69,8 +71,10 @@ android:textEditPasteWindowLayout : The layout of the view that is displayed on
 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:textEditSuggestionItemLayout : Layout of the TextView item that will populate the suggestion  popup window.  [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:textAllCaps : Present the text in ALL CAPS.  [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]
@@ -81,6 +85,8 @@ android:paddingLeft : Sets the padding, in pixels, of the left edge; see padding
 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:paddingStart : Sets the padding, in pixels, of the start edge; see padding.  [dimension]
+android:paddingEnd : Sets the padding, in pixels, of the end 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]
@@ -98,7 +104,8 @@ android:scrollbarTrackHorizontal : Defines the horizontal scrollbar track drawab
 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:fadingEdge : . * Deprecated: This attribute is deprecated and will be ignored  as of API level {@link android.os.Build.VERSION_CODES#ICE_CREAM_SANDWICH.  [flag]
+android:requiresFadingEdge : Defines which edges should be faded 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]
@@ -131,6 +138,8 @@ 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:layoutDirection : Defines the direction of layout drawing.  [enum]
+android:textDirection : Direction of the text.  [integer, 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]
@@ -140,3 +149,5 @@ android:layout_marginLeft : Specifies extra space on the left side of this view.
 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_marginStart : Specifies extra space on the start side of this view.  [dimension]
+android:layout_marginEnd : Specifies extra space on the end 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 14065df..c8d699f 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
@@ -5,3 +5,5 @@ android:layout_marginLeft : Specifies extra space on the left side of this view.
 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_marginStart : Specifies extra space on the start side of this view.  [dimension]
+android:layout_marginEnd : Specifies extra space on the end 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-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 dfdb6cb..041f826 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
@@ -5,3 +5,5 @@ android:layout_marginLeft : Specifies extra space on the left side of this view.
 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_marginStart : Specifies extra space on the start side of this view.  [dimension]
+android:layout_marginEnd : Specifies extra space on the end 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 5b0b44a..9dbe81e 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,4 +1,5 @@
 Code completion in completion8.xml for android:layo^ut_width="fill_parent":
+android:layoutDirection : Defines the direction of layout drawing.  [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]
@@ -8,3 +9,5 @@ android:layout_marginLeft : Specifies extra space on the left side of this view.
 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_marginStart : Specifies extra space on the start side of this view.  [dimension]
+android:layout_marginEnd : Specifies extra space on the end 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/completion9-expected-completion64.txt b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion9-expected-completion64.txt
index e889a29..be2096b 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion9-expected-completion64.txt
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completion9-expected-completion64.txt
@@ -15,6 +15,7 @@ Code completion in completion9.xml for ^<Button:
 <ExpandableListView ></ExpandableListView>
 <FrameLayout ></FrameLayout>
 <Gallery />
+<GridLayout ></GridLayout>
 <GridView ></GridView>
 <HorizontalScrollView ></HorizontalScrollView>
 <ImageButton />
@@ -35,15 +36,18 @@ Code completion in completion9.xml for ^<Button:
 <SearchView ></SearchView>
 <SeekBar />
 <SlidingDrawer ></SlidingDrawer> : SlidingDrawer specific attributes.
+<Space />
 <Spinner />
 <StackView ></StackView>
 <SurfaceView />
+<Switch />
 <TabHost ></TabHost>
 <TabWidget ></TabWidget>
 <TableLayout ></TableLayout>
 <TableRow ></TableRow>
 <TextSwitcher ></TextSwitcher>
 <TextView />
+<TextureView />
 <TimePicker />
 <ToggleButton />
 <TwoLineListItem />
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completionvalues1-expected-completion25.txt b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completionvalues1-expected-completion25.txt
index 5388541..b57246d 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completionvalues1-expected-completion25.txt
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completionvalues1-expected-completion25.txt
@@ -5,3 +5,4 @@ Code completion in completionvalues1.xml for textColor">^@color/title_color</ite
 @id/
 @layout/
 @string/
+@style/
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completionvalues1-expected-completion27.txt b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completionvalues1-expected-completion27.txt
index 5c870fe..22b636d 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completionvalues1-expected-completion27.txt
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completionvalues1-expected-completion27.txt
@@ -11,3 +11,5 @@ center
 fill
 clip_vertical
 clip_horizontal
+start
+end
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completionvalues1-expected-completion28.txt b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completionvalues1-expected-completion28.txt
index 183a7aa..2a85029 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completionvalues1-expected-completion28.txt
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/completionvalues1-expected-completion28.txt
@@ -11,3 +11,5 @@ center
 fill
 clip_vertical
 clip_horizontal
+start
+end
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 30e6c31..43cf419 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
@@ -2,6 +2,7 @@ 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:alignmentMode : When set to alignMargins, causes alignment to take place between  the outer boundary of a view, as defined by its margins.  [enum]
 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]
@@ -34,10 +35,13 @@ 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:clickColor : Color of the outline of click feedback.  [color]
 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:columnCount : The maxmimum number of columns to create when automatically positioning  children.  [integer]
+android:columnOrderPreserved : When set to true, forces column boundaries to appear in the same  order as column indices.  [boolean]
 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]
@@ -50,15 +54,18 @@ android:dateTextAppearance : The text appearance for the calendar dates.  [refer
 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:disableChildrenWhenDisabled : Whether this spinner should mark child views as enabled/disabled  when the spinner itself is enabled/disabled.  [boolean]
 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.  [color, reference]
+android:drawableEnd : The drawable to be drawn to the end of the text.  [color, reference]
 android:drawableLeft : The drawable to be drawn to the left of the text.  [color, reference]
 android:drawablePadding : The padding between the drawables and the text.  [dimension]
 android:drawableRight : The drawable to be drawn to the right of the text.  [color, reference]
+android:drawableStart : The drawable to be drawn to the start of the text.  [color, reference]
 android:drawableTop : The drawable to be drawn above the text.  [color, reference]
 android:drawingCacheQuality : Defines the quality of translucent drawing caches.  [enum]
 android:dropDownAnchor : View to anchor the auto-complete dropdown to.  [reference]
@@ -80,7 +87,7 @@ android:fadeDuration : Duration, in milliseconds, of the fade out effect after t
 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:fadingEdge : . * Deprecated: This attribute is deprecated and will be ignored  as of API level {@link android.os.Build.VERSION_CODES#ICE_CREAM_SANDWICH.  [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]
@@ -139,6 +146,7 @@ android:keepScreenOn : Controls whether the view's window should keep the screen
 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:layoutDirection : Defines the direction of layout drawing.  [enum]
 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]
@@ -179,8 +187,10 @@ android:overScrollHeader : Drawable to draw above list content.  [color, referen
 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:paddingEnd : Sets the padding, in pixels, of the end 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:paddingStart : Sets the padding, in pixels, of the start 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]
@@ -194,9 +204,13 @@ android:prompt : The prompt to display when the spinner's dialog is shown.  [ref
 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:requiresFadingEdge : Defines which edges should be faded on scrolling.  [flag]
+android:resOutColor : Color of the res-out outline.  [color]
 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:rowCount : The maxmimum number of rows to create when automatically positioning  children.  [integer]
+android:rowOrderPreserved : When set to true, forces row boundaries to appear in the same  order as row indices.  [boolean]
 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]
@@ -242,22 +256,28 @@ 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:switchMinWidth : Minimum width for the switch component  [dimension]
+android:switchPadding : Minimum space between the switch and caption text  [dimension]
+android:switchTextAppearance : TextAppearance style for text displayed on the switch thumb.  [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:textAllCaps : Present the text in ALL CAPS.  [boolean]
 android:textAppearance : Base text color, typeface, size, and style.  [reference]
 android:textColor : Text color.  [color, reference]
 android:textColorHighlight : Color of the text selection highlight.  [color, reference]
 android:textColorHint : Color of the hint text.  [color, reference]
 android:textColorLink : Text color for links.  [color, reference]
 android:textCursorDrawable : Reference to a drawable that will be drawn under the insertion  cursor.  [reference]
+android:textDirection : Direction of the text.  [integer, enum]
 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:textEditSuggestionItemLayout : Layout of the TextView item that will populate the suggestion  popup window.  [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]
@@ -268,10 +288,12 @@ android:textSelectHandleLeft : Reference to a drawable that will be used to disp
 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:thumb : Drawable to use as the "thumb" that switches back and forth.  [reference]
 android:thumbOffset : An offset for the thumb that allows it to extend out of the range  of the track.  [dimension]
+android:thumbTextPadding : Amount of padding on either side of text within the switch thumb.  [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:track : Drawable to use as the "track" that the switch thumb slides within.  [reference]
 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]
@@ -281,6 +303,7 @@ android:typeface : Typeface (normal, sans, serif, monospace) for the text.  [enu
 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.  [color, reference]
 android:unselectedAlpha : Sets the alpha on the items that are not selected.  [float]
+android:useDefaultMargins : When set to true, tells GridLayout to use default margins when  none are specified in a view's layout parameters.  [boolean]
 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]
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/manifest-expected-completion16.txt b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/manifest-expected-completion16.txt
index 4795c5c..f3367c7 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/manifest-expected-completion16.txt
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/manifest-expected-completion16.txt
@@ -3,6 +3,7 @@ application : The "application" tag describes application-level components conta
 compatible-screens
 instrumentation : Attributes that can be supplied in an AndroidManifest.xml "instrumentation"  tag, a child of the root manifest tag.
 original-package : Private tag to declare the original package name that this package  is based on.
+package-verifier : Attributes relating to a package verifier.
 permission : The "permission" tag declares a security permission that can be  used to control access from other packages to specific components  or features in your package (or other packages).
 permission-group : The "permission-group" tag declares a logical grouping of related  permissions.
 permission-tree : The "permission-tree" tag declares the base of a tree of permission  values: it declares that this package has ownership of the given  permission name, as well as all names underneath it (separated  by '.').
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 853d9a5..39de60c 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
@@ -3,7 +3,7 @@ android:name : Required name of the class implementing the activity, deriving  f
 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:icon : [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]
@@ -25,3 +25,4 @@ android:exported : Flag indicating whether the given application component is av
 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:uiOptions : Extra options for an activity's UI.  [flag]
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/manifest-expected-completion69.txt b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/manifest-expected-completion69.txt
index c60a305..0cc2abe 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/manifest-expected-completion69.txt
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/manifest-expected-completion69.txt
@@ -1,5 +1,5 @@
 Code completion in manifest.xml for <uses-sdk android:minSdkVersion="^11" />:
-16 : API 16: Android 4.1 (JellyBean)
+16 : API 16: Android 4.1 (Jelly Bean)
 15 : API 15: Android 4.0.3 (IceCreamSandwich)
 14 : API 14: Android 4.0 (IceCreamSandwich)
 13 : API 13: Android 3.2 (Honeycomb)