Support multiple native surfaces on Android.

Support for multiple native surfaces is needed by applications that need
to mix raster windows with GL windows.
Rework the raster and opengl implementation, get rid of eglfs and
fbconvenience dependencies.
Create a single android platform plugin.

[ChangeLog][Android] Rework the raster and opengl implementation.
[ChangeLog][Android] Create a single android platform plugin.

Task-number: QTBUG-34650

Change-Id: I9b1ab51554823329dda8cfbf8fef27c38f917c7b
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>

1 files changed, 177 insertions, 0 deletions

diff --git a/src/plugins/platforms/android/qandroidsystemlocale.cpp b/src/plugins/platforms/android/qandroidsystemlocale.cpp
new file mode 100644
index 0000000000..a20f970a44
--- /dev/null
+++ b/src/plugins/platforms/android/qandroidsystemlocale.cpp
@@ -0,0 +1,177 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, 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, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qandroidsystemlocale.h"
+#include "androidjnimain.h"
+#include <QtCore/private/qjni_p.h>
+#include "qdatetime.h"
+#include "qstringlist.h"
+#include "qvariant.h"
+
+QT_BEGIN_NAMESPACE
+
+QAndroidSystemLocale::QAndroidSystemLocale() : m_locale(QLocale::C)
+{
+}
+
+void QAndroidSystemLocale::getLocaleFromJava() const
+{
+    QWriteLocker locker(&m_lock);
+
+    QJNIObjectPrivate javaLocaleObject;
+    QJNIObjectPrivate javaActivity(QtAndroid::activity());
+    if (javaActivity.isValid()) {
+        QJNIObjectPrivate resources = javaActivity.callObjectMethod("getResources", "()Landroid/content/res/Resources;");
+        QJNIObjectPrivate configuration = resources.callObjectMethod("getConfiguration", "()Landroid/content/res/Configuration;");
+
+        javaLocaleObject = configuration.getObjectField("locale", "Ljava/util/Locale;");
+    } else {
+        javaLocaleObject = QJNIObjectPrivate::callStaticObjectMethod("java/util/Locale", "getDefault", "()Ljava/util/Locale;");
+    }
+
+    QString languageCode = javaLocaleObject.callObjectMethod("getLanguage", "()Ljava/lang/String;").toString();
+    QString countryCode = javaLocaleObject.callObjectMethod("getCountry", "()Ljava/lang/String;").toString();
+
+    m_locale = QLocale(languageCode + QLatin1Char('_') + countryCode);
+}
+
+QVariant QAndroidSystemLocale::query(QueryType type, QVariant in) const
+{
+    if (type == LocaleChanged) {
+        getLocaleFromJava();
+        return QVariant();
+    }
+
+    QReadLocker locker(&m_lock);
+
+    switch (type) {
+    case DecimalPoint:
+        return m_locale.decimalPoint();
+    case GroupSeparator:
+        return m_locale.groupSeparator();
+    case ZeroDigit:
+        return m_locale.zeroDigit();
+    case NegativeSign:
+        return m_locale.negativeSign();
+    case DateFormatLong:
+        return m_locale.dateFormat(QLocale::LongFormat);
+    case DateFormatShort:
+        return m_locale.dateFormat(QLocale::ShortFormat);
+    case TimeFormatLong:
+        return m_locale.timeFormat(QLocale::LongFormat);
+    case TimeFormatShort:
+        return m_locale.timeFormat(QLocale::ShortFormat);
+    case DayNameLong:
+        return m_locale.dayName(in.toInt(), QLocale::LongFormat);
+    case DayNameShort:
+        return m_locale.dayName(in.toInt(), QLocale::ShortFormat);
+    case MonthNameLong:
+        return m_locale.monthName(in.toInt(), QLocale::LongFormat);
+    case MonthNameShort:
+        return m_locale.monthName(in.toInt(), QLocale::ShortFormat);
+    case StandaloneMonthNameLong:
+        return m_locale.standaloneMonthName(in.toInt(), QLocale::LongFormat);
+    case StandaloneMonthNameShort:
+        return m_locale.standaloneMonthName(in.toInt(), QLocale::ShortFormat);
+    case DateToStringLong:
+        return m_locale.toString(in.toDate(), QLocale::LongFormat);
+    case DateToStringShort:
+        return m_locale.toString(in.toDate(), QLocale::ShortFormat);
+    case TimeToStringLong:
+        return m_locale.toString(in.toTime(), QLocale::LongFormat);
+    case TimeToStringShort:
+        return m_locale.toString(in.toTime(), QLocale::ShortFormat);
+    case DateTimeFormatLong:
+        return m_locale.dateTimeFormat(QLocale::LongFormat);
+    case DateTimeFormatShort:
+        return m_locale.dateTimeFormat(QLocale::ShortFormat);
+    case DateTimeToStringLong:
+        return m_locale.toString(in.toDateTime(), QLocale::LongFormat);
+    case DateTimeToStringShort:
+        return m_locale.toString(in.toDateTime(), QLocale::ShortFormat);
+    case PositiveSign:
+        return m_locale.positiveSign();
+    case AMText:
+        return m_locale.amText();
+    case PMText:
+        return m_locale.pmText();
+    case FirstDayOfWeek:
+        return m_locale.firstDayOfWeek();
+    case CurrencySymbol:
+        return m_locale .currencySymbol(QLocale::CurrencySymbolFormat(in.toUInt()));
+    case CurrencyToString: {
+        switch (in.type()) {
+        case QVariant::Int:
+            return m_locale .toCurrencyString(in.toInt());
+        case QVariant::UInt:
+            return m_locale .toCurrencyString(in.toUInt());
+        case QVariant::Double:
+            return m_locale .toCurrencyString(in.toDouble());
+        case QVariant::LongLong:
+            return m_locale .toCurrencyString(in.toLongLong());
+        case QVariant::ULongLong:
+            return m_locale .toCurrencyString(in.toULongLong());
+        default:
+            break;
+        }
+        return QString();
+    }
+    case StringToStandardQuotation:
+        return m_locale.quoteString(in.value<QStringRef>());
+    case StringToAlternateQuotation:
+        return m_locale.quoteString(in.value<QStringRef>(), QLocale::AlternateQuotation);
+    case ListToSeparatedString:
+        return m_locale.createSeparatedList(in.value<QStringList>());
+    case LocaleChanged:
+        Q_ASSERT_X(false, Q_FUNC_INFO, "This can't happen.");
+    default:
+        break;
+    }
+    return QVariant();
+}
+
+QLocale QAndroidSystemLocale::fallbackUiLocale() const
+{
+    QReadLocker locker(&m_lock);
+    return m_locale;
+}
+
+QT_END_NAMESPACE