aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBananeweizen <Bananeweizen@gmx.de>2013-05-29 22:43:59 -0700
committerBananeweizen <Bananeweizen@gmx.de>2013-05-29 22:43:59 -0700
commit2145e897a26752602f613d8b055d14ceeca17ee6 (patch)
treea9c4ccf6e1c5167d37e2baf8125d36a99da8fc5f
parent5b3a2c3f858538788fdbeb91919f1827ab9bb154 (diff)
parent898a59e1156399819a870f39b07d5ec7fa991a1e (diff)
downloadcgeo-2145e897a26752602f613d8b055d14ceeca17ee6.zip
cgeo-2145e897a26752602f613d8b055d14ceeca17ee6.tar.gz
cgeo-2145e897a26752602f613d8b055d14ceeca17ee6.tar.bz2
Merge pull request #2795 from campbeb/fix2443
Fix #2443 - Support Samsung multi window
-rw-r--r--main/AndroidManifest.xml16
-rw-r--r--main/res/values/dimens.xml4
2 files changed, 19 insertions, 1 deletions
diff --git a/main/AndroidManifest.xml b/main/AndroidManifest.xml
index 95bbe8e..27b5081 100644
--- a/main/AndroidManifest.xml
+++ b/main/AndroidManifest.xml
@@ -25,7 +25,20 @@
android:backupAgent="cgeo.geocaching.backup.CentralBackupAgent"
android:allowBackup="true" >
<uses-library android:name="com.google.android.maps" android:required="false" />
- <meta-data
+
+ <!-- Samsung Multi-Window support -->
+ <uses-library android:name="com.sec.android.app.multiwindow" android:required="false" />
+ <meta-data
+ android:name="com.sec.android.support.multiwindow"
+ android:value="true" />
+ <meta-data
+ android:name="com.sec.android.multiwindow.DEFAULT_SIZE_W"
+ android:resource="@dimen/app_defaultsize_w" />
+ <meta-data
+ android:name="com.sec.android.multiwindow.DEFAULT_SIZE_H"
+ android:resource="@dimen/app_defaultsize_h" />
+
+ <meta-data
android:name="android.app.default_searchable"
android:value=".SearchActivity" />
<meta-data
@@ -40,6 +53,7 @@
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
+ <category android:name="android.intent.category.MULTIWINDOW_LAUNCHER" />
</intent-filter>
</activity>
<activity
diff --git a/main/res/values/dimens.xml b/main/res/values/dimens.xml
index 051f73f..1c1c47c 100644
--- a/main/res/values/dimens.xml
+++ b/main/res/values/dimens.xml
@@ -3,4 +3,8 @@
<dimen name="actionbar_height">45dip</dimen>
<dimen name="actionbar_separator_height">37dip</dimen>
<dimen name="actionbar_separator_width">2dip</dimen>
+
+ <!-- Dimensions for Samsung Multi-Window support -->
+ <dimen name="app_defaultsize_w">632.0dip</dimen>
+ <dimen name="app_defaultsize_h">598.0dip</dimen>
</resources>