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
This commit is contained in:
Dominik Riebeling 2011-06-04 10:36:34 +00:00
parent 73d0e14f44
commit 26a92fa9e1
2 changed files with 10 additions and 2 deletions

View file

@ -68,7 +68,7 @@ JAVAC_OPTS += -implicit:none -classpath $(ANDROID_PLATFORM)/android.jar:$(BUILDD
.PHONY: .PHONY:
$(MANIFEST): $(MANIFEST_SRC) $(DIRS) $(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) $(R_JAVA) $(AP_): $(MANIFEST) $(RES) | $(DIRS)
$(call PRINTS,AAPT $(subst $(BUILDDIR)/,,$@))$(AAPT) package -f -m \ $(call PRINTS,AAPT $(subst $(BUILDDIR)/,,$@))$(AAPT) package -f -m \

10
tools/configure vendored
View file

@ -28,6 +28,7 @@ sharedir=
thread_support="ASSEMBLER_THREADS" thread_support="ASSEMBLER_THREADS"
app_lcd_width= app_lcd_width=
app_lcd_height= app_lcd_height=
app_lcd_orientation=
# #
# Begin Function Definitions # Begin Function Definitions
# #
@ -100,7 +101,12 @@ app_set_lcd_size () {
app_lcd_height="$ARG_LCDHEIGHT" app_lcd_height="$ARG_LCDHEIGHT"
fi fi
if [ -z "$app_lcd_height" ]; then app_lcd_height="480"; 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_LCDWIDTH=$app_lcd_width
ARG_LCDHEIGHT=$app_lcd_height ARG_LCDHEIGHT=$app_lcd_height
@ -3715,6 +3721,7 @@ sed > Makefile \
-e "s<@PREFIX@<$ARG_PREFIX<g" \ -e "s<@PREFIX@<$ARG_PREFIX<g" \
-e "s<@CMDLINE@<$cmdline<g" \ -e "s<@CMDLINE@<$cmdline<g" \
-e "s<@SDLCONFIG@<$sdl<g" \ -e "s<@SDLCONFIG@<$sdl<g" \
-e "s<@LCDORIENTATION@<$lcd_orientation<g" \
<<EOF <<EOF
## Automatically generated. http://www.rockbox.org/ ## Automatically generated. http://www.rockbox.org/
@ -3784,6 +3791,7 @@ export ROCKBOX_SHARE_PATH=@sharepath@
export ROCKBOX_BINARY_PATH=@binpath@ export ROCKBOX_BINARY_PATH=@binpath@
export ROCKBOX_LIBRARY_PATH=@libpath@ export ROCKBOX_LIBRARY_PATH=@libpath@
export SDLCONFIG=@SDLCONFIG@ export SDLCONFIG=@SDLCONFIG@
export LCDORIENTATION=@LCDORIENTATION@
CONFIGURE_OPTIONS=@CMDLINE@ CONFIGURE_OPTIONS=@CMDLINE@