fix conflict
add and set test background
vad som helst
Add FrameLayout as parent to ImageView

Image is now zoomed in, don't know where to go from here
Change scaleType to center

Image is now zoomed in at center pos, nothing else
Replace RelativeLayout with FrameLayout

Only one of the two necessary. FramLayout as parent to ImageView seems necesary to get image zoom in working

Also fixed warning by adding image description
add id to image + planning comment
Try to implement solution -- force closes
Implement solution with working drag functionality but display problem

This solution uses the onTouch function instead of onDragWhatever and currently compiles and runs
However images are not displayed properly. background1.jpg does not show up while crazyface.jpg
is displayed, but only as a small frame.

background1.jpg does not show
Uncomment setLayoutParams

This change lets images be their full size but doesn't fix the issue of some images not displaying

All images larger than the screen dimensions seem to be not working
Implement displaying of large images by turning off hardware acceleration

Large images can now be displayed due to setting hardwareAccelerated to false in manifest

This means the app can now display a draggable wallpaper that is larger than screen size
TP5
Replace code with new suggestion
Working zoom and drag safepoint
Add way to discern a click from drag or zoom

By adding a boolean to control when a click should happen there's a way to show a toast message "plupp!" when a click is made.

However the window is way too small for this to be used for an actual marker in the current state.
Add scroll threshold

A value scroll threshold is added to give a larger window for click detection

However this hampers drag and zoom movement
Fix drag movement by moving drag functionality outside threshold control

This change means that a click is easily discernible from drag and zoom movements, and the drag and zoom functionality works as it should.

Next is to replace toast control message with marker functionality
Add more explanatory comments, prioirty onTouch function
Merge branch 'background'

Conflicts:
	testProject/res/values/strings.xml
	testProject/src/com/example/testproject/MainActivity.java