summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2011-06-04 10:36:34 +0000
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2011-06-04 10:36:34 +0000
commit26a92fa9e17fc659ad1cd27b2365493df0d16950 (patch)
tree0716c42667a2663647ffe04c1a98a281f3d84f1e
parent73d0e14f4494b98e0c781934fbf19efa8d6d8418 (diff)
downloadrockbox-26a92fa9e17fc659ad1cd27b2365493df0d16950.tar.gz
rockbox-26a92fa9e17fc659ad1cd27b2365493df0d16950.tar.bz2
rockbox-26a92fa9e17fc659ad1cd27b2365493df0d16950.zip
Android: adjust screen orientation based on LCD size.
If the screen size specified is wider than higher specify the orientation as landscape in AndroidManifest.xml. This usually applies to tablets where Rockbox in portrait mode feels unnatural. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29951 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--android/android.make2
-rwxr-xr-xtools/configure10
2 files changed, 10 insertions, 2 deletions
diff --git a/android/android.make b/android/android.make
index f12b79750d..56b650a7af 100644
--- a/android/android.make
+++ b/android/android.make
@@ -68,7 +68,7 @@ JAVAC_OPTS += -implicit:none -classpath $(ANDROID_PLATFORM)/android.jar:$(BUILDD
.PHONY:
$(MANIFEST): $(MANIFEST_SRC) $(DIRS)
- $(call PRINTS,MANIFEST $(@F))sed -e 's/versionName="1.0"/versionName="$(SVNVERSION)"/' $(MANIFEST_SRC) > $(MANIFEST)
+ $(call PRINTS,MANIFEST $(@F))sed -e 's/versionName="1.0"/versionName="$(SVNVERSION)"/;s/screenOrientation="portrait"/screenOrientation="$(LCDORIENTATION)"/' $(MANIFEST_SRC) > $(MANIFEST)
$(R_JAVA) $(AP_): $(MANIFEST) $(RES) | $(DIRS)
$(call PRINTS,AAPT $(subst $(BUILDDIR)/,,$@))$(AAPT) package -f -m \
diff --git a/tools/configure b/tools/configure
index d988e75d63..461e00ce8f 100755
--- a/tools/configure
+++ b/tools/configure
@@ -28,6 +28,7 @@ sharedir=
thread_support="ASSEMBLER_THREADS"
app_lcd_width=
app_lcd_height=
+app_lcd_orientation=
#
# Begin Function Definitions
#
@@ -100,7 +101,12 @@ app_set_lcd_size () {
app_lcd_height="$ARG_LCDHEIGHT"
fi
if [ -z "$app_lcd_height" ]; then app_lcd_height="480"; fi
- echo "Selected $app_lcd_width x $app_lcd_height resolution"
+ if [ $app_lcd_width -gt $app_lcd_height ]; then
+ lcd_orientation="landscape"
+ else
+ lcd_orientation="portrait"
+ fi
+ echo "Selected $app_lcd_width x $app_lcd_height resolution ($lcd_orientation)"
ARG_LCDWIDTH=$app_lcd_width
ARG_LCDHEIGHT=$app_lcd_height
@@ -3715,6 +3721,7 @@ sed > Makefile \
-e "s<@PREFIX@<$ARG_PREFIX<g" \
-e "s<@CMDLINE@<$cmdline<g" \
-e "s<@SDLCONFIG@<$sdl<g" \
+ -e "s<@LCDORIENTATION@<$lcd_orientation<g" \
<<EOF
## Automatically generated. http://www.rockbox.org/
@@ -3784,6 +3791,7 @@ export ROCKBOX_SHARE_PATH=@sharepath@
export ROCKBOX_BINARY_PATH=@binpath@
export ROCKBOX_LIBRARY_PATH=@libpath@
export SDLCONFIG=@SDLCONFIG@
+export LCDORIENTATION=@LCDORIENTATION@
CONFIGURE_OPTIONS=@CMDLINE@