am 4b20aab: Merge change 1571 into donut
Merge commit '4b20aab7997b5180a3b118fde204e55652b7dcb6' * commit '4b20aab7997b5180a3b118fde204e55652b7dcb6': Move some classes that have non ready APIs to internal packages
This commit is contained in:
committed by
The Android Open Source Project
commit
b90f61cf02
@@ -16,9 +16,9 @@
|
|||||||
|
|
||||||
package com.android.ant;
|
package com.android.ant;
|
||||||
|
|
||||||
import com.android.sdklib.project.ApkConfigurationHelper;
|
import com.android.sdklib.internal.project.ApkConfigurationHelper;
|
||||||
import com.android.sdklib.project.ProjectProperties;
|
import com.android.sdklib.internal.project.ProjectProperties;
|
||||||
import com.android.sdklib.project.ProjectProperties.PropertyType;
|
import com.android.sdklib.internal.project.ProjectProperties.PropertyType;
|
||||||
|
|
||||||
import org.apache.tools.ant.BuildException;
|
import org.apache.tools.ant.BuildException;
|
||||||
import org.apache.tools.ant.Project;
|
import org.apache.tools.ant.Project;
|
||||||
|
|||||||
@@ -18,9 +18,9 @@ package com.android.ant;
|
|||||||
|
|
||||||
import com.android.apkbuilder.ApkBuilder;
|
import com.android.apkbuilder.ApkBuilder;
|
||||||
import com.android.apkbuilder.ApkBuilder.ApkFile;
|
import com.android.apkbuilder.ApkBuilder.ApkFile;
|
||||||
import com.android.sdklib.project.ApkConfigurationHelper;
|
import com.android.sdklib.internal.project.ApkConfigurationHelper;
|
||||||
import com.android.sdklib.project.ProjectProperties;
|
import com.android.sdklib.internal.project.ProjectProperties;
|
||||||
import com.android.sdklib.project.ProjectProperties.PropertyType;
|
import com.android.sdklib.internal.project.ProjectProperties.PropertyType;
|
||||||
|
|
||||||
import org.apache.tools.ant.BuildException;
|
import org.apache.tools.ant.BuildException;
|
||||||
import org.apache.tools.ant.Project;
|
import org.apache.tools.ant.Project;
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ import com.android.sdklib.IAndroidTarget;
|
|||||||
import com.android.sdklib.ISdkLog;
|
import com.android.sdklib.ISdkLog;
|
||||||
import com.android.sdklib.SdkManager;
|
import com.android.sdklib.SdkManager;
|
||||||
import com.android.sdklib.IAndroidTarget.IOptionalLibrary;
|
import com.android.sdklib.IAndroidTarget.IOptionalLibrary;
|
||||||
import com.android.sdklib.project.ProjectProperties;
|
import com.android.sdklib.internal.project.ProjectProperties;
|
||||||
|
|
||||||
import org.apache.tools.ant.BuildException;
|
import org.apache.tools.ant.BuildException;
|
||||||
import org.apache.tools.ant.Project;
|
import org.apache.tools.ant.Project;
|
||||||
|
|||||||
@@ -23,12 +23,12 @@ import com.android.sdklib.ISdkLog;
|
|||||||
import com.android.sdklib.SdkConstants;
|
import com.android.sdklib.SdkConstants;
|
||||||
import com.android.sdklib.SdkManager;
|
import com.android.sdklib.SdkManager;
|
||||||
import com.android.sdklib.IAndroidTarget.IOptionalLibrary;
|
import com.android.sdklib.IAndroidTarget.IOptionalLibrary;
|
||||||
import com.android.sdklib.avd.AvdManager;
|
import com.android.sdklib.internal.avd.AvdManager;
|
||||||
import com.android.sdklib.avd.HardwareProperties;
|
import com.android.sdklib.internal.avd.HardwareProperties;
|
||||||
import com.android.sdklib.avd.AvdManager.AvdInfo;
|
import com.android.sdklib.internal.avd.AvdManager.AvdInfo;
|
||||||
import com.android.sdklib.avd.HardwareProperties.HardwareProperty;
|
import com.android.sdklib.internal.avd.HardwareProperties.HardwareProperty;
|
||||||
import com.android.sdklib.project.ProjectCreator;
|
import com.android.sdklib.internal.project.ProjectCreator;
|
||||||
import com.android.sdklib.project.ProjectCreator.OutputLevel;
|
import com.android.sdklib.internal.project.ProjectCreator.OutputLevel;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package com.android.sdklib.avd;
|
package com.android.sdklib.internal.avd;
|
||||||
|
|
||||||
import com.android.prefs.AndroidLocation;
|
import com.android.prefs.AndroidLocation;
|
||||||
import com.android.prefs.AndroidLocation.AndroidLocationException;
|
import com.android.prefs.AndroidLocation.AndroidLocationException;
|
||||||
@@ -22,7 +22,7 @@ import com.android.sdklib.IAndroidTarget;
|
|||||||
import com.android.sdklib.ISdkLog;
|
import com.android.sdklib.ISdkLog;
|
||||||
import com.android.sdklib.SdkConstants;
|
import com.android.sdklib.SdkConstants;
|
||||||
import com.android.sdklib.SdkManager;
|
import com.android.sdklib.SdkManager;
|
||||||
import com.android.sdklib.avd.AvdManager.AvdInfo.AvdStatus;
|
import com.android.sdklib.internal.avd.AvdManager.AvdInfo.AvdStatus;
|
||||||
|
|
||||||
import java.io.BufferedReader;
|
import java.io.BufferedReader;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
@@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package com.android.sdklib.avd;
|
package com.android.sdklib.internal.avd;
|
||||||
|
|
||||||
import com.android.sdklib.ISdkLog;
|
import com.android.sdklib.ISdkLog;
|
||||||
|
|
||||||
@@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package com.android.sdklib.project;
|
package com.android.sdklib.internal.project;
|
||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
@@ -14,12 +14,12 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package com.android.sdklib.project;
|
package com.android.sdklib.internal.project;
|
||||||
|
|
||||||
import com.android.sdklib.IAndroidTarget;
|
import com.android.sdklib.IAndroidTarget;
|
||||||
import com.android.sdklib.ISdkLog;
|
import com.android.sdklib.ISdkLog;
|
||||||
import com.android.sdklib.SdkConstants;
|
import com.android.sdklib.SdkConstants;
|
||||||
import com.android.sdklib.project.ProjectProperties.PropertyType;
|
import com.android.sdklib.internal.project.ProjectProperties.PropertyType;
|
||||||
|
|
||||||
import org.w3c.dom.NodeList;
|
import org.w3c.dom.NodeList;
|
||||||
import org.xml.sax.InputSource;
|
import org.xml.sax.InputSource;
|
||||||
@@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package com.android.sdklib.project;
|
package com.android.sdklib.internal.project;
|
||||||
|
|
||||||
import com.android.sdklib.IAndroidTarget;
|
import com.android.sdklib.IAndroidTarget;
|
||||||
import com.android.sdklib.SdkManager;
|
import com.android.sdklib.SdkManager;
|
||||||
@@ -17,7 +17,7 @@
|
|||||||
package com.android.sdkuilib;
|
package com.android.sdkuilib;
|
||||||
|
|
||||||
import com.android.sdklib.IAndroidTarget;
|
import com.android.sdklib.IAndroidTarget;
|
||||||
import com.android.sdklib.avd.AvdManager.AvdInfo;
|
import com.android.sdklib.internal.avd.AvdManager.AvdInfo;
|
||||||
|
|
||||||
import org.eclipse.swt.SWT;
|
import org.eclipse.swt.SWT;
|
||||||
import org.eclipse.swt.events.ControlAdapter;
|
import org.eclipse.swt.events.ControlAdapter;
|
||||||
|
|||||||
Reference in New Issue
Block a user