summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2014-11-28 18:05:15 +0100
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2014-12-01 14:38:35 +0100
commit9a88a502a101082ede63c3773d2d5905f44f9063 (patch)
treedf407cff1b2cc3cf63e1907e82cd5f07cdb4a76c
parentfbcc860f28bbd062855359c635dd67420d6e8c9e (diff)
downloadqtquickcontrols-9a88a502a101082ede63c3773d2d5905f44f9063.tar.gz
Document how to select a specific Android theme
Change-Id: If6d72a65b01453e2f2ea76026ec158c98e80421e Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com> Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
-rw-r--r--src/controls/doc/images/qtquickcontrols-example-gallery-android-dark.pngbin0 -> 25771 bytes
-rw-r--r--src/controls/doc/src/qtquickcontrols-platformnotes.qdoc21
2 files changed, 20 insertions, 1 deletions
diff --git a/src/controls/doc/images/qtquickcontrols-example-gallery-android-dark.png b/src/controls/doc/images/qtquickcontrols-example-gallery-android-dark.png
new file mode 100644
index 00000000..7e27b466
--- /dev/null
+++ b/src/controls/doc/images/qtquickcontrols-example-gallery-android-dark.png
Binary files differ
diff --git a/src/controls/doc/src/qtquickcontrols-platformnotes.qdoc b/src/controls/doc/src/qtquickcontrols-platformnotes.qdoc
index 2d852445..8c6c5c19 100644
--- a/src/controls/doc/src/qtquickcontrols-platformnotes.qdoc
+++ b/src/controls/doc/src/qtquickcontrols-platformnotes.qdoc
@@ -41,10 +41,29 @@
\note The Android style requires Android 3.0 (API level 11) or later.
- It is automatically selected and deployed on Android. See \l{Getting Started
+ The style is automatically selected and deployed on Android. See \l{Getting Started
with Qt for Android} and \l{Deploying an Application on Android} for
more details on the Android essentials.
+ \section2 Android Themes
+
+ Applications may choose a specific \l{http://developer.android.com/design/style/themes.html}
+ {Android theme} by specifying it in \l{AndroidManifest.xml}.
+
+ \image qtquickcontrols-example-gallery-android-dark.png
+
+ The following example sets a dark Holo theme, and the result can be
+ seen in the screenshot above.
+
+ \code
+ <manifest ...>
+ <application ... android:theme="@android:style/Theme.Holo">
+ ...
+ </application>
+ ...
+ </manifest>
+ \endcode
+
\section2 Action Bar
The \l{http://developer.android.com/guide/topics/ui/actionbar.html}