summaryrefslogtreecommitdiff
path: root/android/sdremote/AndroidManifest.xml
diff options
context:
space:
mode:
authorArtur Dryomov <artur.dryomov@gmail.com>2013-09-05 11:59:27 +0300
committerArtur Dryomov <artur.dryomov@gmail.com>2013-09-05 19:38:03 +0300
commit3c1c51020c07c748248d0c6e4ae33f3f37ce1390 (patch)
tree32ffc6d6d472cb3cd80dd2eb41b4407900628402 /android/sdremote/AndroidManifest.xml
parent36baf31d2baa30c34c05b042283845ed348be888 (diff)
Add the settings screen.
It contains options that can confuse user: * changing transitions using volume keys; * keeping screenon while presenting. Change-Id: I1a9cb9afdf1409fc78e713b899d68ae045db5cb7
Diffstat (limited to 'android/sdremote/AndroidManifest.xml')
-rw-r--r--android/sdremote/AndroidManifest.xml5
1 files changed, 5 insertions, 0 deletions
diff --git a/android/sdremote/AndroidManifest.xml b/android/sdremote/AndroidManifest.xml
index 109c1c27d962..7b80b6644d74 100644
--- a/android/sdremote/AndroidManifest.xml
+++ b/android/sdremote/AndroidManifest.xml
@@ -54,6 +54,11 @@
</activity>
<activity
+ android:name=".activity.SettingsActivity"
+ android:label="@string/title_settings">
+ </activity>
+
+ <activity
android:name=".activity.LicensesActivity"
android:label="@string/title_licenses">
</activity>