More Android fixes, add default android device.

Switch to new android assests scheme

Change-Id: I34bf52cbb085b76df66e40391160d189301aafd2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>

1 files changed, 68 insertions, 0 deletions

diff --git a/src/plugins/android/androiddevice.h b/src/plugins/android/androiddevice.h
new file mode 100644
index 0000000000..d5d31d02e8
--- /dev/null
+++ b/src/plugins/android/androiddevice.h
@@ -0,0 +1,68 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2012 BogDan Vatra <bog_dan_ro@yahoo.com>
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+**
+** GNU Lesser General Public License Usage
+**
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** Other Usage
+**
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**************************************************************************/
+
+#ifndef ANDROIDDEVICE_H
+#define ANDROIDDEVICE_H
+
+#include <projectexplorer/devicesupport/idevice.h>
+
+namespace Android {
+class AndroidPlugin; // needed for friend declaration
+
+namespace Internal {
+
+class AndroidDevice : public ProjectExplorer::IDevice
+{
+public:
+
+    ProjectExplorer::IDevice::DeviceInfo deviceInformation() const;
+
+    virtual QString displayType() const;
+    virtual ProjectExplorer::IDeviceWidget *createWidget();
+    virtual QList<Core::Id> actionIds() const;
+    virtual QString displayNameForActionId(Core::Id actionId) const;
+    virtual void executeAction(Core::Id actionId, QWidget *parent = 0) const;
+
+    virtual ProjectExplorer::IDevice::Ptr clone() const;
+
+
+protected:
+    friend class AndroidDeviceFactory;
+    friend class Android::AndroidPlugin;
+    AndroidDevice();
+    AndroidDevice(const AndroidDevice &other);
+};
+
+} // namespace Internal
+} // namespace Android
+
+#endif // ANDROIDDEVICE_H