Merge branch 'release/0.5-M7'

CHANGES.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 0.5-M7
+
+This milestone updates the embedded Android SDK to version 24.4.1.
+
+* [461942](https://bugs.eclipse.org/bugs/show_bug.cgi?id=461942) Update to latest Android SDK support libraries
+
 ## 0.5-M6
 
 This milestone adds a field in the DDMS preference page for selecting the debug port.

android-core/plugins/org.eclipse.andmore.base/.classpath

@@ -3,14 +3,16 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/"/>
+	<classpathentry exported="true" kind="lib" path="libs/annotations.jar"/>
 	<classpathentry exported="true" kind="lib" path="libs/common.jar" sourcepath="/common"/>
-	<classpathentry exported="true" kind="lib" path="libs/guava-15.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/guava-17.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="libs/httpmime-4.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="libs/kxml2-2.3.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="libs/layoutlib-api.jar" sourcepath="/layoutlib-api"/>
 	<classpathentry exported="true" kind="lib" path="libs/sdklib.jar" sourcepath="/sdklib"/>
 	<classpathentry exported="true" kind="lib" path="libs/sdkstats.jar" sourcepath="/sdkstats"/>
 	<classpathentry exported="true" kind="lib" path="libs/dvlib.jar" sourcepath="/dvlib"/>
 	<classpathentry exported="true" kind="lib" path="libs/sdk-common.jar" sourcepath="/sdk-common"/>
+	<classpathentry exported="true" kind="lib" path="libs/gson-2.2.4.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

android-core/plugins/org.eclipse.andmore.base/META-INF/MANIFEST.MF

@@ -13,15 +13,17 @@ Require-Bundle: org.eclipse.ui,
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: Eclipse Andmore
 Bundle-ClassPath: .,
+ libs/annotations.jar,
  libs/common.jar,
- libs/guava-15.0.jar,
+ libs/guava-17.0.jar,
  libs/httpmime-4.1.jar,
  libs/kxml2-2.3.0.jar,
  libs/layoutlib-api.jar,
  libs/sdklib.jar,
  libs/sdkstats.jar,
  libs/dvlib.jar,
- libs/sdk-common.jar
+ libs/sdk-common.jar,
+ libs/gson-2.2.4.jar
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: com.android,
  com.android.annotations,
@@ -36,6 +38,7 @@ Export-Package: com.android,
  com.android.ide.common.resources,
  com.android.ide.common.resources.configuration,
  com.android.ide.common.sdk,
+ com.android.ide.common.util,
  com.android.ide.common.xml,
  com.android.io,
  com.android.layoutlib.api,
@@ -56,7 +59,6 @@ Export-Package: com.android,
  com.android.sdklib.repository,
  com.android.sdklib.repository.descriptors,
  com.android.sdklib.repository.local,
- com.android.sdklib.repository.remote,
  com.android.sdklib.util,
  com.android.sdkstats,
  com.android.util,

android-core/plugins/org.eclipse.andmore.gldebugger/src/org/eclipse/andmore/gltrace/CollectTraceAction.java

@@ -49,6 +49,7 @@
 import org.eclipse.ui.WorkbenchException;
 import org.eclipse.ui.ide.IDE;
 
+import java.io.Closeable;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.FileNotFoundException;
@@ -250,7 +251,7 @@ public static void startTracing(Shell shell, TraceOptions traceOptions, int port
 		} catch (IOException e) {
 			MessageDialog.openError(shell, "OpenGL Trace",
 					"Unable to connect to remote GL Trace Server: " + e.getMessage());
-			Closeables.closeQuietly(fos);
+			closeQuietly(fos);
 			return;
 		}
 
@@ -263,7 +264,7 @@ public static void startTracing(Shell shell, TraceOptions traceOptions, int port
 			MessageDialog.openError(shell, "OpenGL Trace",
 					"Unexpected error while setting trace options: " + e.getMessage());
 			closeSocket(socket);
-			Closeables.closeQuietly(fos);
+			closeQuietly(fos);
 			return;
 		}
 
@@ -279,6 +280,14 @@ public static void startTracing(Shell shell, TraceOptions traceOptions, int port
 		traceCommandWriter.close();
 		closeSocket(socket);
 	}
+
+	private static void closeQuietly(Closeable closeable) {
+		try {
+			closeable.close();
+		} catch (Exception e) {
+			// do nothing
+		}
+	}
 
 	private static void closeSocket(Socket socket) {
 		try {

android-core/plugins/org.eclipse.andmore.integration.tests/src/org/eclipse/andmore/integration/tests/functests/layoutRendering/ApiDemosRenderingTest.java

@@ -25,6 +25,7 @@
 import com.android.ide.common.rendering.api.HardwareConfig;
 import com.android.ide.common.rendering.api.ILayoutPullParser;
 import com.android.ide.common.rendering.api.IProjectCallback;
+import com.android.ide.common.rendering.api.LayoutlibCallback;
 import com.android.ide.common.rendering.api.RenderSession;
 import com.android.ide.common.rendering.api.ResourceReference;
 import com.android.ide.common.rendering.api.ResourceValue;
@@ -62,6 +63,7 @@
 import com.android.resources.ResourceType;
 import com.android.resources.ScreenOrientation;
 import com.android.resources.ScreenRatio;
+import com.android.resources.ScreenRound;
 import com.android.resources.ScreenSize;
 import com.android.resources.TouchScreen;
 import com.android.sdklib.IAndroidTarget;
@@ -104,7 +106,7 @@ public ILayoutPullParser getParser(String layoutName) {
 		}
 	}
 
-	private final static class ProjectCallBack implements IProjectCallback {
+	private final static class ProjectCallBack extends LayoutlibCallback {
 		// resource id counter.
 		// We start at 0x7f000000 to avoid colliding with the framework id
 		// since we have no access to the project R.java and we need to generate
@@ -177,6 +179,12 @@ public ILayoutPullParser getParser(ResourceValue layoutResource) {
 		public ActionBarCallback getActionBarCallback() {
 			return new ActionBarCallback();
 		}
+
+		@Override
+		public boolean supports(int ideFeature) {
+			// TODO Auto-generated method stub
+			return false;
+		}
 	}
 
 	@Test
@@ -264,7 +272,7 @@ protected ResourceItem createResourceItem(String name) {
 
 			HardwareConfig hardwareConfig = new HardwareConfig(320, 480, Density.MEDIUM, 160, // xdpi
 					160, // ydpi
-					ScreenSize.NORMAL, ScreenOrientation.PORTRAIT, false /*
+					ScreenSize.NORMAL, ScreenOrientation.PORTRAIT, ScreenRound.NOTROUND, false /*
 																		 * software
 																		 * buttons
 																		 */);

android-core/plugins/org.eclipse.andmore.integration.tests/src/org/eclipse/andmore/internal/editors/layout/refactoring/testdata/completion1-expected-completion11.txt

@@ -45,6 +45,7 @@ Code completion in completion1.xml for ^<TextView:
 <TabWidget ></TabWidget>
 <TableLayout ></TableLayout>
 <TableRow ></TableRow>
+<TextClock />
 <TextSwitcher ></TextSwitcher>
 <TextView />
 <TextureView />

android-core/plugins/org.eclipse.andmore.integration.tests/src/org/eclipse/andmore/internal/editors/layout/refactoring/testdata/completion1-expected-completion12.txt

@@ -45,6 +45,7 @@ Code completion in completion1.xml for btn_default">^</FrameLayout>:
 <TabWidget ></TabWidget>
 <TableLayout ></TableLayout>
 <TableRow ></TableRow>
+<TextClock />
 <TextSwitcher ></TextSwitcher>
 <TextView />
 <TextureView />

android-core/plugins/org.eclipse.andmore.integration.tests/src/org/eclipse/andmore/internal/editors/layout/refactoring/testdata/completion1-expected-completion39.txt

@@ -140,13 +140,15 @@ 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:textAlignment : Alignment of the text.  [integer, enum]
+android:textDirection : Defines the direction of the text.  [integer, enum]
+android:textAlignment : Defines the alignment of the text.  [integer, enum]
 android:importantForAccessibility : Controls how this View is important for accessibility which is  if it fires accessibility events and if it is reported to accessibility  services that query the screen.  [integer, enum]
+android:accessibilityLiveRegion : Indicates to accessibility services whether the user should be  notified when this view changes.  [integer, enum]
+android:labelFor : Specifies the id of a view for which this view serves as a label  for accessibility purposes.  [integer]
 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_gravity : Standard gravity constant that a child supplies 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-core/plugins/org.eclipse.andmore.integration.tests/src/org/eclipse/andmore/internal/editors/layout/refactoring/testdata/completion12-expected-completion75.txt

@@ -65,9 +65,11 @@ 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:textAlignment : Alignment of the text.  [integer, enum]
+android:textDirection : Defines the direction of the text.  [integer, enum]
+android:textAlignment : Defines the alignment of the text.  [integer, enum]
 android:importantForAccessibility : Controls how this View is important for accessibility which is  if it fires accessibility events and if it is reported to accessibility  services that query the screen.  [integer, enum]
+android:accessibilityLiveRegion : Indicates to accessibility services whether the user should be  notified when this view changes.  [integer, enum]
+android:labelFor : Specifies the id of a view for which this view serves as a label  for accessibility purposes.  [integer]
 android:layout_toLeftOf : Positions the right edge of this view to the left of the given  anchor view ID.  [reference]
 android:layout_toRightOf : Positions the left edge of this view to the right of the given  anchor view ID.  [reference]
 android:layout_above : Positions the bottom edge of this view above the given anchor  view ID.  [reference]
@@ -85,6 +87,12 @@ android:layout_centerInParent : If true, centers this child horizontally and ver
 android:layout_centerHorizontal : If true, centers this child horizontally within its parent.  [boolean]
 android:layout_centerVertical : If true, centers this child vertically within its parent.  [boolean]
 android:layout_alignWithParentIfMissing : If set to true, the parent will be used as the anchor when the  anchor cannot be be found for layout_toLeftOf, layout_toRightOf,  etc.  [boolean]
+android:layout_toStartOf : Positions the end edge of this view to the start of the given  anchor view ID.  [reference]
+android:layout_toEndOf : Positions the start edge of this view to the end of the given  anchor view ID.  [reference]
+android:layout_alignStart : Makes the start edge of this view match the start edge of the  given anchor view ID.  [reference]
+android:layout_alignEnd : Makes the end edge of this view match the end edge of the given  anchor view ID.  [reference]
+android:layout_alignParentStart : If true, makes the start edge of this view match the start edge  of the parent.  [boolean]
+android:layout_alignParentEnd : If true, makes the end edge of this view match the end edge of  the parent.  [boolean]
 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_margin : Specifies extra space on the left, top, right and bottom sides  of this view.  [dimension]

android-core/plugins/org.eclipse.andmore.integration.tests/src/org/eclipse/andmore/internal/editors/layout/refactoring/testdata/completion5-expected-completion40.txt

@@ -140,13 +140,15 @@ 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:textAlignment : Alignment of the text.  [integer, enum]
+android:textDirection : Defines the direction of the text.  [integer, enum]
+android:textAlignment : Defines the alignment of the text.  [integer, enum]
 android:importantForAccessibility : Controls how this View is important for accessibility which is  if it fires accessibility events and if it is reported to accessibility  services that query the screen.  [integer, enum]
+android:accessibilityLiveRegion : Indicates to accessibility services whether the user should be  notified when this view changes.  [integer, enum]
+android:labelFor : Specifies the id of a view for which this view serves as a label  for accessibility purposes.  [integer]
 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_gravity : Standard gravity constant that a child supplies 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-core/plugins/org.eclipse.andmore.integration.tests/src/org/eclipse/andmore/internal/editors/layout/refactoring/testdata/completion8-expected-completion44.txt

@@ -2,7 +2,7 @@ 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_gravity : Standard gravity constant that a child supplies 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-core/plugins/org.eclipse.andmore.integration.tests/src/org/eclipse/andmore/internal/editors/layout/refactoring/testdata/completion9-expected-completion64.txt

@@ -45,6 +45,7 @@ Code completion in completion9.xml for ^<Button:
 <TabWidget ></TabWidget>
 <TableLayout ></TableLayout>
 <TableRow ></TableRow>
+<TextClock />
 <TextSwitcher ></TextSwitcher>
 <TextView />
 <TextureView />

android-core/plugins/org.eclipse.andmore.integration.tests/src/org/eclipse/andmore/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:gravity : Specifies how an object should position its content, on both  the X and Y axes, within its own bounds.  [flag]
 android:groupIndicator : Indicator shown beside the group View.  [reference]