Эх сурвалжийг харах

Merge pull request #1486 from Bubu/no_jars

remove all prebuilt jars
Mario Đanić 7 жил өмнө
parent
commit
a7635caa61
53 өөрчлөгдсөн 1319 нэмэгдсэн , 165 устгасан
  1. 8 19
      THIRD_PARTY.txt
  2. 1 2
      build.gradle
  3. BIN
      libs/disklrucache-2.0.2.jar
  4. BIN
      libs/touch-image-view.jar
  5. 34 0
      src/main/java/com/ortiz/touch/ExtendedViewPager.java
  6. 1276 0
      src/main/java/com/ortiz/touch/TouchImageView.java
  7. BIN
      src/main/res/drawable-hdpi/ic_done_white.png
  8. BIN
      src/main/res/drawable-mdpi/ic_done_white.png
  9. BIN
      src/main/res/drawable-xhdpi/ic_done_white.png
  10. BIN
      src/main/res/drawable-xxxhdpi/ic_done_white.png
  11. 0 2
      src/main/res/values-ar/strings.xml
  12. 0 4
      src/main/res/values-ast/strings.xml
  13. 0 2
      src/main/res/values-bg-rBG/strings.xml
  14. 0 3
      src/main/res/values-ca/strings.xml
  15. 0 4
      src/main/res/values-cs-rCZ/strings.xml
  16. 0 2
      src/main/res/values-da/strings.xml
  17. 0 4
      src/main/res/values-de-rDE/strings.xml
  18. 0 4
      src/main/res/values-de/strings.xml
  19. 0 4
      src/main/res/values-el/strings.xml
  20. 0 4
      src/main/res/values-en-rGB/strings.xml
  21. 0 4
      src/main/res/values-es-rAR/strings.xml
  22. 0 4
      src/main/res/values-es-rCO/strings.xml
  23. 0 4
      src/main/res/values-es-rMX/strings.xml
  24. 0 4
      src/main/res/values-es/strings.xml
  25. 0 1
      src/main/res/values-eu/strings.xml
  26. 0 2
      src/main/res/values-fa/strings.xml
  27. 0 3
      src/main/res/values-fi-rFI/strings.xml
  28. 0 4
      src/main/res/values-fr/strings.xml
  29. 0 1
      src/main/res/values-he/strings.xml
  30. 0 4
      src/main/res/values-hu-rHU/strings.xml
  31. 0 4
      src/main/res/values-id/strings.xml
  32. 0 4
      src/main/res/values-is/strings.xml
  33. 0 4
      src/main/res/values-it/strings.xml
  34. 0 2
      src/main/res/values-ja-rJP/strings.xml
  35. 0 3
      src/main/res/values-ko/strings.xml
  36. 0 4
      src/main/res/values-lt-rLT/strings.xml
  37. 0 2
      src/main/res/values-lv/strings.xml
  38. 0 4
      src/main/res/values-nb-rNO/strings.xml
  39. 0 4
      src/main/res/values-nl/strings.xml
  40. 0 4
      src/main/res/values-pl/strings.xml
  41. 0 4
      src/main/res/values-pt-rBR/strings.xml
  42. 0 2
      src/main/res/values-ro/strings.xml
  43. 0 4
      src/main/res/values-ru/strings.xml
  44. 0 2
      src/main/res/values-sk-rSK/strings.xml
  45. 0 4
      src/main/res/values-sl/strings.xml
  46. 0 4
      src/main/res/values-sq/strings.xml
  47. 0 4
      src/main/res/values-sr/strings.xml
  48. 0 4
      src/main/res/values-sv/strings.xml
  49. 0 4
      src/main/res/values-tr/strings.xml
  50. 0 4
      src/main/res/values-zh-rCN/strings.xml
  51. 0 4
      src/main/res/values-zh-rTW/strings.xml
  52. 0 1
      src/main/res/values/dims.xml
  53. 0 4
      src/main/res/values/strings.xml

+ 8 - 19
THIRD_PARTY.txt

@@ -37,43 +37,32 @@ that govern this software, for the purposes they are being used.
 
 The third party software included and used by this project is:
 
- * Apache JackRabbit 2.12.4.
+ * Apache JackRabbit 2.12.4. (included by the android-library project)
    Copyright (C) 2004-2016 The Apache Software Foundation.
    Licensed under Apache License, Version 2.0.
-   The jar file must be included in the Nextcloud client APK.
+   The library is included in the Nextcloud client APK.
    See http://jackrabbit.apache.org/
  
- * Transifex client.
-   Copyright (C) Transifex.
-   Licensed under GNU General Public License.
-   Placed at third_party/transifex-client.
-   Used as a helper tool, not included in the Nextcloud client APK.
-   Original license document included at third_party/transifex-client/LICENSE.
-   See http://help.transifex.com/features/client/
-   
  * TouchImageView, 1.2.0. commit 6dbeac4f11936185ba374c73144ac431c23c9aab
    Copyright (c) 2014 Michael Ortiz
    Licensed under MIT License
-   JAR file libs/touch-image-view.jar has been generated by ownCloud Inc., including without 
-   modifications com.ortiz.touch.ExtendedViewPager and com.ortiz.touch.TouchImageView classes. 
+   This library is in the source code.
    See https://github.com/MikeOrtiz/TouchImageView
  
- * floatingactionbutton 1.10.1.
+ * floatingactionbutton 1.10.21.
    Copyright (c) 2014 Jerzy Chalupski
    Licensed under Apache License, Version 2.0.
-   The jar file must be included in the Nextcloud client APK.
+   The library is included in the Nextcloud client APK.
    See https://github.com/futuresimple/android-floating-action-button 
  
  * AndroidSVG 1.2.1.
    Copyright (c) 2014 Paul LeBeau
    Licensed under Apache License, Version 2.0.
-   placed at libs/androidsvg-1.2.1.jar
-   The jar file must be included in the Nextcloud client APK.
+   The library is included in the Nextcloud client APK.
    See https://github.com/BigBadaboom/androidsvg
    
  * Disk LRU Cache 2.0.2.
    Copyright (c) 2013 Jake Wharton 
    Licensed under Apache License, Version 2.0.
-   placed at libs/disklrucache-2.0.2.jar
-   The jar file must be included in the Nextcloud client APK.
-   See https://github.com/JakeWharton/DiskLruCache
+   The library is be included in the Nextcloud client APK.
+   See https://github.com/JakeWharton/DiskLruCache

+ 1 - 2
build.gradle

@@ -14,7 +14,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-rc2'
+        classpath 'com.android.tools.build:gradle:3.0.0'
         classpath 'com.google.gms:google-services:3.0.0'
     }
 }
@@ -185,7 +185,6 @@ android {
 
 dependencies {
     /// dependencies for app building
-    implementation name: 'touch-image-view'
     implementation 'com.android.support:multidex:1.0.2'
     compile 'com.github.nextcloud:android-library:1.0.31'
     implementation "com.android.support:support-v4:${supportLibraryVersion}"

BIN
libs/disklrucache-2.0.2.jar


BIN
libs/touch-image-view.jar


+ 34 - 0
src/main/java/com/ortiz/touch/ExtendedViewPager.java

@@ -0,0 +1,34 @@
+package com.ortiz.touch;
+
+import android.content.Context;
+import android.support.v4.view.ViewPager;
+import android.util.AttributeSet;
+import android.view.View;
+
+
+public class ExtendedViewPager extends ViewPager {
+
+	public ExtendedViewPager(Context context) {
+	    super(context);
+	}
+	
+	public ExtendedViewPager(Context context, AttributeSet attrs) {
+	    super(context, attrs);
+	}
+	
+	@Override
+	protected boolean canScroll(View v, boolean checkV, int dx, int x, int y) {
+	    if (v instanceof TouchImageView) {
+	    	//
+	    	// canScrollHorizontally is not supported for Api < 14. To get around this issue,
+	    	// ViewPager is extended and canScrollHorizontallyFroyo, a wrapper around
+	    	// canScrollHorizontally supporting Api >= 8, is called.
+	    	//
+	        return ((TouchImageView) v).canScrollHorizontallyFroyo(-dx);
+	        
+	    } else {
+	        return super.canScroll(v, checkV, dx, x, y);
+	    }
+	}
+
+}

+ 1276 - 0
src/main/java/com/ortiz/touch/TouchImageView.java

@@ -0,0 +1,1276 @@
+/*
+ * TouchImageView.java
+ * By: Michael Ortiz
+ * Updated By: Patrick Lackemacher
+ * Updated By: Babay88
+ * Updated By: @ipsilondev
+ * Updated By: hank-cp
+ * Updated By: singpolyma
+ * -------------------
+ * Extends Android ImageView to include pinch zooming, panning, fling and double tap zoom.
+ */
+
+package com.ortiz.touch;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.content.res.Configuration;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Matrix;
+import android.graphics.PointF;
+import android.graphics.RectF;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
+import android.os.Bundle;
+import android.os.Parcelable;
+import android.support.v7.widget.AppCompatImageView;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.GestureDetector;
+import android.view.MotionEvent;
+import android.view.ScaleGestureDetector;
+import android.view.View;
+import android.view.animation.AccelerateDecelerateInterpolator;
+import android.widget.OverScroller;
+import android.widget.Scroller;
+
+public class TouchImageView extends AppCompatImageView {
+	
+	private static final String DEBUG = "DEBUG";
+	
+	//
+	// SuperMin and SuperMax multipliers. Determine how much the image can be
+	// zoomed below or above the zoom boundaries, before animating back to the
+	// min/max zoom boundary.
+	//
+	private static final float SUPER_MIN_MULTIPLIER = .75f;
+	private static final float SUPER_MAX_MULTIPLIER = 1.25f;
+
+    //
+    // Scale of image ranges from minScale to maxScale, where minScale == 1
+    // when the image is stretched to fit view.
+    //
+    private float normalizedScale;
+    
+    //
+    // Matrix applied to image. MSCALE_X and MSCALE_Y should always be equal.
+    // MTRANS_X and MTRANS_Y are the other values used. prevMatrix is the matrix
+    // saved prior to the screen rotating.
+    //
+	private Matrix matrix, prevMatrix;
+
+    private static enum State { NONE, DRAG, ZOOM, FLING, ANIMATE_ZOOM };
+    private State state;
+
+    private float minScale;
+    private float maxScale;
+    private float superMinScale;
+    private float superMaxScale;
+    private float[] m;
+    
+    private Context context;
+    private Fling fling;
+    
+    private ScaleType mScaleType;
+    
+    private boolean imageRenderedAtLeastOnce;
+    private boolean onDrawReady;
+    
+    private ZoomVariables delayedZoomVariables;
+
+    //
+    // Size of view and previous view size (ie before rotation)
+    //
+    private int viewWidth, viewHeight, prevViewWidth, prevViewHeight;
+    
+    //
+    // Size of image when it is stretched to fit view. Before and After rotation.
+    //
+    private float matchViewWidth, matchViewHeight, prevMatchViewWidth, prevMatchViewHeight;
+    
+    private ScaleGestureDetector mScaleDetector;
+    private GestureDetector mGestureDetector;
+    private GestureDetector.OnDoubleTapListener doubleTapListener = null;
+    private OnTouchListener userTouchListener = null;
+    private OnTouchImageViewListener touchImageViewListener = null;
+
+    public TouchImageView(Context context) {
+        super(context);
+        sharedConstructing(context);
+    }
+
+    public TouchImageView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        sharedConstructing(context);
+    }
+    
+    public TouchImageView(Context context, AttributeSet attrs, int defStyle) {
+    	super(context, attrs, defStyle);
+    	sharedConstructing(context);
+    }
+    
+    private void sharedConstructing(Context context) {
+        super.setClickable(true);
+        this.context = context;
+        mScaleDetector = new ScaleGestureDetector(context, new ScaleListener());
+        mGestureDetector = new GestureDetector(context, new GestureListener());
+        matrix = new Matrix();
+        prevMatrix = new Matrix();
+        m = new float[9];
+        normalizedScale = 1;
+        if (mScaleType == null) {
+        	mScaleType = ScaleType.FIT_CENTER;
+        }
+        minScale = 1;
+        maxScale = 3;
+        superMinScale = SUPER_MIN_MULTIPLIER * minScale;
+        superMaxScale = SUPER_MAX_MULTIPLIER * maxScale;
+        setImageMatrix(matrix);
+        setScaleType(ScaleType.MATRIX);
+        setState(State.NONE);
+        onDrawReady = false;
+        super.setOnTouchListener(new PrivateOnTouchListener());
+    }
+
+    @Override
+    public void setOnTouchListener(View.OnTouchListener l) {
+        userTouchListener = l;
+    }
+    
+    public void setOnTouchImageViewListener(OnTouchImageViewListener l) {
+    	touchImageViewListener = l;
+    }
+
+    public void setOnDoubleTapListener(GestureDetector.OnDoubleTapListener l) {
+        doubleTapListener = l;
+    }
+
+    @Override
+    public void setImageResource(int resId) {
+    	super.setImageResource(resId);
+    	savePreviousImageValues();
+    	fitImageToView();
+    }
+    
+    @Override
+    public void setImageBitmap(Bitmap bm) {
+    	super.setImageBitmap(bm);
+    	savePreviousImageValues();
+    	fitImageToView();
+    }
+    
+    @Override
+    public void setImageDrawable(Drawable drawable) {
+    	super.setImageDrawable(drawable);
+    	savePreviousImageValues();
+    	fitImageToView();
+    }
+    
+    @Override
+    public void setImageURI(Uri uri) {
+    	super.setImageURI(uri);
+    	savePreviousImageValues();
+    	fitImageToView();
+    }
+    
+    @Override
+    public void setScaleType(ScaleType type) {
+    	if (type == ScaleType.FIT_START || type == ScaleType.FIT_END) {
+    		throw new UnsupportedOperationException("TouchImageView does not support FIT_START or FIT_END");
+    	}
+    	if (type == ScaleType.MATRIX) {
+    		super.setScaleType(ScaleType.MATRIX);
+    		
+    	} else {
+    		mScaleType = type;
+    		if (onDrawReady) {
+    			//
+    			// If the image is already rendered, scaleType has been called programmatically
+    			// and the TouchImageView should be updated with the new scaleType.
+    			//
+    			setZoom(this);
+    		}
+    	}
+    }
+    
+    @Override
+    public ScaleType getScaleType() {
+    	return mScaleType;
+    }
+    
+    /**
+     * Returns false if image is in initial, unzoomed state. False, otherwise.
+     * @return true if image is zoomed
+     */
+    public boolean isZoomed() {
+    	return normalizedScale != 1;
+    }
+    
+    /**
+     * Return a Rect representing the zoomed image.
+     * @return rect representing zoomed image
+     */
+    public RectF getZoomedRect() {
+    	if (mScaleType == ScaleType.FIT_XY) {
+    		throw new UnsupportedOperationException("getZoomedRect() not supported with FIT_XY");
+    	}
+    	PointF topLeft = transformCoordTouchToBitmap(0, 0, true);
+    	PointF bottomRight = transformCoordTouchToBitmap(viewWidth, viewHeight, true);
+    	
+    	float w = getDrawable().getIntrinsicWidth();
+    	float h = getDrawable().getIntrinsicHeight();
+    	return new RectF(topLeft.x / w, topLeft.y / h, bottomRight.x / w, bottomRight.y / h);
+    }
+    
+    /**
+     * Save the current matrix and view dimensions
+     * in the prevMatrix and prevView variables.
+     */
+    private void savePreviousImageValues() {
+    	if (matrix != null && viewHeight != 0 && viewWidth != 0) {
+	    	matrix.getValues(m);
+	    	prevMatrix.setValues(m);
+	    	prevMatchViewHeight = matchViewHeight;
+	        prevMatchViewWidth = matchViewWidth;
+	        prevViewHeight = viewHeight;
+	        prevViewWidth = viewWidth;
+    	}
+    }
+    
+    @Override
+    public Parcelable onSaveInstanceState() {
+    	Bundle bundle = new Bundle();
+    	bundle.putParcelable("instanceState", super.onSaveInstanceState());
+    	bundle.putFloat("saveScale", normalizedScale);
+    	bundle.putFloat("matchViewHeight", matchViewHeight);
+    	bundle.putFloat("matchViewWidth", matchViewWidth);
+    	bundle.putInt("viewWidth", viewWidth);
+    	bundle.putInt("viewHeight", viewHeight);
+    	matrix.getValues(m);
+    	bundle.putFloatArray("matrix", m);
+    	bundle.putBoolean("imageRendered", imageRenderedAtLeastOnce);
+    	return bundle;
+    }
+    
+    @Override
+    public void onRestoreInstanceState(Parcelable state) {
+      	if (state instanceof Bundle) {
+	        Bundle bundle = (Bundle) state;
+	        normalizedScale = bundle.getFloat("saveScale");
+	        m = bundle.getFloatArray("matrix");
+	        prevMatrix.setValues(m);
+	        prevMatchViewHeight = bundle.getFloat("matchViewHeight");
+	        prevMatchViewWidth = bundle.getFloat("matchViewWidth");
+	        prevViewHeight = bundle.getInt("viewHeight");
+	        prevViewWidth = bundle.getInt("viewWidth");
+	        imageRenderedAtLeastOnce = bundle.getBoolean("imageRendered");
+	        super.onRestoreInstanceState(bundle.getParcelable("instanceState"));
+	        return;
+      	}
+
+      	super.onRestoreInstanceState(state);
+    }
+    
+    @Override
+    protected void onDraw(Canvas canvas) {
+    	onDrawReady = true;
+    	imageRenderedAtLeastOnce = true;
+    	if (delayedZoomVariables != null) {
+    		setZoom(delayedZoomVariables.scale, delayedZoomVariables.focusX, delayedZoomVariables.focusY, delayedZoomVariables.scaleType);
+    		delayedZoomVariables = null;
+    	}
+    	super.onDraw(canvas);
+    }
+    
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+    	super.onConfigurationChanged(newConfig);
+    	savePreviousImageValues();
+    }
+    
+    /**
+     * Get the max zoom multiplier.
+     * @return max zoom multiplier.
+     */
+    public float getMaxZoom() {
+    	return maxScale;
+    }
+
+    /**
+     * Set the max zoom multiplier. Default value: 3.
+     * @param max max zoom multiplier.
+     */
+    public void setMaxZoom(float max) {
+        maxScale = max;
+        superMaxScale = SUPER_MAX_MULTIPLIER * maxScale;
+    }
+    
+    /**
+     * Get the min zoom multiplier.
+     * @return min zoom multiplier.
+     */
+    public float getMinZoom() {
+    	return minScale;
+    }
+    
+    /**
+     * Get the current zoom. This is the zoom relative to the initial
+     * scale, not the original resource.
+     * @return current zoom multiplier.
+     */
+    public float getCurrentZoom() {
+    	return normalizedScale;
+    }
+    
+    /**
+     * Set the min zoom multiplier. Default value: 1.
+     * @param min min zoom multiplier.
+     */
+    public void setMinZoom(float min) {
+    	minScale = min;
+    	superMinScale = SUPER_MIN_MULTIPLIER * minScale;
+    }
+    
+    /**
+     * Reset zoom and translation to initial state.
+     */
+    public void resetZoom() {
+    	normalizedScale = 1;
+    	fitImageToView();
+    }
+    
+    /**
+     * Set zoom to the specified scale. Image will be centered by default.
+     * @param scale
+     */
+    public void setZoom(float scale) {
+    	setZoom(scale, 0.5f, 0.5f);
+    }
+    
+    /**
+     * Set zoom to the specified scale. Image will be centered around the point
+     * (focusX, focusY). These floats range from 0 to 1 and denote the focus point
+     * as a fraction from the left and top of the view. For example, the top left 
+     * corner of the image would be (0, 0). And the bottom right corner would be (1, 1).
+     * @param scale
+     * @param focusX
+     * @param focusY
+     */
+    public void setZoom(float scale, float focusX, float focusY) {
+    	setZoom(scale, focusX, focusY, mScaleType);
+    }
+    
+    /**
+     * Set zoom to the specified scale. Image will be centered around the point
+     * (focusX, focusY). These floats range from 0 to 1 and denote the focus point
+     * as a fraction from the left and top of the view. For example, the top left 
+     * corner of the image would be (0, 0). And the bottom right corner would be (1, 1).
+     * @param scale
+     * @param focusX
+     * @param focusY
+     * @param scaleType
+     */
+    public void setZoom(float scale, float focusX, float focusY, ScaleType scaleType) {
+    	//
+    	// setZoom can be called before the image is on the screen, but at this point, 
+    	// image and view sizes have not yet been calculated in onMeasure. Thus, we should
+    	// delay calling setZoom until the view has been measured.
+    	//
+    	if (!onDrawReady) {
+    		delayedZoomVariables = new ZoomVariables(scale, focusX, focusY, scaleType);
+    		return;
+    	}
+    	
+    	if (scaleType != mScaleType) {
+    		setScaleType(scaleType);
+    	}
+    	resetZoom();
+    	scaleImage(scale, viewWidth / 2, viewHeight / 2, true);
+    	matrix.getValues(m);
+    	m[Matrix.MTRANS_X] = -((focusX * getImageWidth()) - (viewWidth * 0.5f));
+    	m[Matrix.MTRANS_Y] = -((focusY * getImageHeight()) - (viewHeight * 0.5f));
+    	matrix.setValues(m);
+    	fixTrans();
+    	setImageMatrix(matrix);
+    }
+    
+    /**
+     * Set zoom parameters equal to another TouchImageView. Including scale, position,
+     * and ScaleType.
+     * @param img
+     */
+    public void setZoom(TouchImageView img) {
+    	PointF center = img.getScrollPosition();
+    	setZoom(img.getCurrentZoom(), center.x, center.y, img.getScaleType());
+    }
+    
+    /**
+     * Return the point at the center of the zoomed image. The PointF coordinates range
+     * in value between 0 and 1 and the focus point is denoted as a fraction from the left 
+     * and top of the view. For example, the top left corner of the image would be (0, 0). 
+     * And the bottom right corner would be (1, 1).
+     * @return PointF representing the scroll position of the zoomed image.
+     */
+    public PointF getScrollPosition() {
+    	Drawable drawable = getDrawable();
+    	if (drawable == null) {
+    		return null;
+    	}
+    	int drawableWidth = drawable.getIntrinsicWidth();
+        int drawableHeight = drawable.getIntrinsicHeight();
+        
+        PointF point = transformCoordTouchToBitmap(viewWidth / 2, viewHeight / 2, true);
+        point.x /= drawableWidth;
+        point.y /= drawableHeight;
+        return point;
+    }
+    
+    /**
+     * Set the focus point of the zoomed image. The focus points are denoted as a fraction from the
+     * left and top of the view. The focus points can range in value between 0 and 1. 
+     * @param focusX
+     * @param focusY
+     */
+    public void setScrollPosition(float focusX, float focusY) {
+    	setZoom(normalizedScale, focusX, focusY);
+    }
+    
+    /**
+     * Performs boundary checking and fixes the image matrix if it 
+     * is out of bounds.
+     */
+    private void fixTrans() {
+        matrix.getValues(m);
+        float transX = m[Matrix.MTRANS_X];
+        float transY = m[Matrix.MTRANS_Y];
+        
+        float fixTransX = getFixTrans(transX, viewWidth, getImageWidth());
+        float fixTransY = getFixTrans(transY, viewHeight, getImageHeight());
+        
+        if (fixTransX != 0 || fixTransY != 0) {
+            matrix.postTranslate(fixTransX, fixTransY);
+        }
+    }
+    
+    /**
+     * When transitioning from zooming from focus to zoom from center (or vice versa)
+     * the image can become unaligned within the view. This is apparent when zooming
+     * quickly. When the content size is less than the view size, the content will often
+     * be centered incorrectly within the view. fixScaleTrans first calls fixTrans() and 
+     * then makes sure the image is centered correctly within the view.
+     */
+    private void fixScaleTrans() {
+    	fixTrans();
+    	matrix.getValues(m);
+    	if (getImageWidth() < viewWidth) {
+    		m[Matrix.MTRANS_X] = (viewWidth - getImageWidth()) / 2;
+    	}
+    	
+    	if (getImageHeight() < viewHeight) {
+    		m[Matrix.MTRANS_Y] = (viewHeight - getImageHeight()) / 2;
+    	}
+    	matrix.setValues(m);
+    }
+
+    private float getFixTrans(float trans, float viewSize, float contentSize) {
+        float minTrans, maxTrans;
+
+        if (contentSize <= viewSize) {
+            minTrans = 0;
+            maxTrans = viewSize - contentSize;
+            
+        } else {
+            minTrans = viewSize - contentSize;
+            maxTrans = 0;
+        }
+
+        if (trans < minTrans)
+            return -trans + minTrans;
+        if (trans > maxTrans)
+            return -trans + maxTrans;
+        return 0;
+    }
+    
+    private float getFixDragTrans(float delta, float viewSize, float contentSize) {
+        if (contentSize <= viewSize) {
+            return 0;
+        }
+        return delta;
+    }
+    
+    private float getImageWidth() {
+    	return matchViewWidth * normalizedScale;
+    }
+    
+    private float getImageHeight() {
+    	return matchViewHeight * normalizedScale;
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        Drawable drawable = getDrawable();
+        if (drawable == null || drawable.getIntrinsicWidth() == 0 || drawable.getIntrinsicHeight() == 0) {
+        	setMeasuredDimension(0, 0);
+        	return;
+        }
+        
+        int drawableWidth = drawable.getIntrinsicWidth();
+        int drawableHeight = drawable.getIntrinsicHeight();
+        int widthSize = MeasureSpec.getSize(widthMeasureSpec);
+        int widthMode = MeasureSpec.getMode(widthMeasureSpec);
+        int heightSize = MeasureSpec.getSize(heightMeasureSpec);
+        int heightMode = MeasureSpec.getMode(heightMeasureSpec);
+        viewWidth = setViewSize(widthMode, widthSize, drawableWidth);
+        viewHeight = setViewSize(heightMode, heightSize, drawableHeight);
+        
+        //
+        // Set view dimensions
+        //
+        setMeasuredDimension(viewWidth, viewHeight);
+        
+        //
+        // Fit content within view
+        //
+        fitImageToView();
+    }
+    
+    /**
+     * If the normalizedScale is equal to 1, then the image is made to fit the screen. Otherwise,
+     * it is made to fit the screen according to the dimensions of the previous image matrix. This
+     * allows the image to maintain its zoom after rotation.
+     */
+    private void fitImageToView() {
+    	Drawable drawable = getDrawable();
+        if (drawable == null || drawable.getIntrinsicWidth() == 0 || drawable.getIntrinsicHeight() == 0) {
+        	return;
+        }
+        if (matrix == null || prevMatrix == null) {
+        	return;
+        }
+        
+        int drawableWidth = drawable.getIntrinsicWidth();
+        int drawableHeight = drawable.getIntrinsicHeight();
+    	
+    	//
+    	// Scale image for view
+    	//
+        float scaleX = (float) viewWidth / drawableWidth;
+        float scaleY = (float) viewHeight / drawableHeight;
+        
+        switch (mScaleType) {
+        case CENTER:
+        	scaleX = scaleY = 1;
+        	break;
+        	
+        case CENTER_CROP:
+        	scaleX = scaleY = Math.max(scaleX, scaleY);
+        	break;
+        	
+        case CENTER_INSIDE:
+        	scaleX = scaleY = Math.min(1, Math.min(scaleX, scaleY));
+        	
+        case FIT_CENTER:
+        	scaleX = scaleY = Math.min(scaleX, scaleY);
+        	break;
+        	
+        case FIT_XY:
+        	break;
+        	
+    	default:
+    		//
+    		// FIT_START and FIT_END not supported
+    		//
+    		throw new UnsupportedOperationException("TouchImageView does not support FIT_START or FIT_END");
+        	
+        }
+
+        //
+        // Center the image
+        //
+        float redundantXSpace = viewWidth - (scaleX * drawableWidth);
+        float redundantYSpace = viewHeight - (scaleY * drawableHeight);
+        matchViewWidth = viewWidth - redundantXSpace;
+        matchViewHeight = viewHeight - redundantYSpace;
+        if (!isZoomed() && !imageRenderedAtLeastOnce) {
+        	//
+        	// Stretch and center image to fit view
+        	//
+        	matrix.setScale(scaleX, scaleY);
+        	matrix.postTranslate(redundantXSpace / 2, redundantYSpace / 2);
+        	normalizedScale = 1;
+        	
+        } else {
+        	//
+        	// These values should never be 0 or we will set viewWidth and viewHeight
+        	// to NaN in translateMatrixAfterRotate. To avoid this, call savePreviousImageValues
+        	// to set them equal to the current values.
+        	//
+        	if (prevMatchViewWidth == 0 || prevMatchViewHeight == 0) {
+        		savePreviousImageValues();
+        	}
+        	
+        	prevMatrix.getValues(m);
+        	
+        	//
+        	// Rescale Matrix after rotation
+        	//
+        	m[Matrix.MSCALE_X] = matchViewWidth / drawableWidth * normalizedScale;
+        	m[Matrix.MSCALE_Y] = matchViewHeight / drawableHeight * normalizedScale;
+        	
+        	//
+        	// TransX and TransY from previous matrix
+        	//
+            float transX = m[Matrix.MTRANS_X];
+            float transY = m[Matrix.MTRANS_Y];
+            
+            //
+            // Width
+            //
+            float prevActualWidth = prevMatchViewWidth * normalizedScale;
+            float actualWidth = getImageWidth();
+            translateMatrixAfterRotate(Matrix.MTRANS_X, transX, prevActualWidth, actualWidth, prevViewWidth, viewWidth, drawableWidth);
+            
+            //
+            // Height
+            //
+            float prevActualHeight = prevMatchViewHeight * normalizedScale;
+            float actualHeight = getImageHeight();
+            translateMatrixAfterRotate(Matrix.MTRANS_Y, transY, prevActualHeight, actualHeight, prevViewHeight, viewHeight, drawableHeight);
+            
+            //
+            // Set the matrix to the adjusted scale and translate values.
+            //
+            matrix.setValues(m);
+        }
+        fixTrans();
+        setImageMatrix(matrix);
+    }
+    
+    /**
+     * Set view dimensions based on layout params
+     * 
+     * @param mode 
+     * @param size
+     * @param drawableWidth
+     * @return
+     */
+    private int setViewSize(int mode, int size, int drawableWidth) {
+    	int viewSize;
+    	switch (mode) {
+		case MeasureSpec.EXACTLY:
+			viewSize = size;
+			break;
+			
+		case MeasureSpec.AT_MOST:
+			viewSize = Math.min(drawableWidth, size);
+			break;
+			
+		case MeasureSpec.UNSPECIFIED:
+			viewSize = drawableWidth;
+			break;
+			
+		default:
+			viewSize = size;
+		 	break;
+		}
+    	return viewSize;
+    }
+    
+    /**
+     * After rotating, the matrix needs to be translated. This function finds the area of image 
+     * which was previously centered and adjusts translations so that is again the center, post-rotation.
+     * 
+     * @param axis Matrix.MTRANS_X or Matrix.MTRANS_Y
+     * @param trans the value of trans in that axis before the rotation
+     * @param prevImageSize the width/height of the image before the rotation
+     * @param imageSize width/height of the image after rotation
+     * @param prevViewSize width/height of view before rotation
+     * @param viewSize width/height of view after rotation
+     * @param drawableSize width/height of drawable
+     */
+    private void translateMatrixAfterRotate(int axis, float trans, float prevImageSize, float imageSize, int prevViewSize, int viewSize, int drawableSize) {
+    	if (imageSize < viewSize) {
+        	//
+        	// The width/height of image is less than the view's width/height. Center it.
+        	//
+        	m[axis] = (viewSize - (drawableSize * m[Matrix.MSCALE_X])) * 0.5f;
+        	
+        } else if (trans > 0) {
+        	//
+        	// The image is larger than the view, but was not before rotation. Center it.
+        	//
+        	m[axis] = -((imageSize - viewSize) * 0.5f);
+        	
+        } else {
+        	//
+        	// Find the area of the image which was previously centered in the view. Determine its distance
+        	// from the left/top side of the view as a fraction of the entire image's width/height. Use that percentage
+        	// to calculate the trans in the new view width/height.
+        	//
+        	float percentage = (Math.abs(trans) + (0.5f * prevViewSize)) / prevImageSize;
+        	m[axis] = -((percentage * imageSize) - (viewSize * 0.5f));
+        }
+    }
+    
+    private void setState(State state) {
+    	this.state = state;
+    }
+    
+    public boolean canScrollHorizontallyFroyo(int direction) {
+        return canScrollHorizontally(direction);
+    }
+    
+    @Override
+    public boolean canScrollHorizontally(int direction) {
+    	matrix.getValues(m);
+    	float x = m[Matrix.MTRANS_X];
+    	
+    	if (getImageWidth() < viewWidth) {
+    		return false;
+    		
+    	} else if (x >= -1 && direction < 0) {
+    		return false;
+    		
+    	} else if (Math.abs(x) + viewWidth + 1 >= getImageWidth() && direction > 0) {
+    		return false;
+    	}
+    	
+    	return true;
+    }
+    
+    /**
+     * Gesture Listener detects a single click or long click and passes that on
+     * to the view's listener.
+     * @author Ortiz
+     *
+     */
+    private class GestureListener extends GestureDetector.SimpleOnGestureListener {
+    	
+        @Override
+        public boolean onSingleTapConfirmed(MotionEvent e)
+        {
+            if(doubleTapListener != null) {
+            	return doubleTapListener.onSingleTapConfirmed(e);
+            }
+        	return performClick();
+        }
+        
+        @Override
+        public void onLongPress(MotionEvent e)
+        {
+        	performLongClick();
+        }
+        
+        @Override
+        public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY)
+        {
+        	if (fling != null) {
+        		//
+        		// If a previous fling is still active, it should be cancelled so that two flings
+        		// are not run simultaenously.
+        		//
+        		fling.cancelFling();
+        	}
+        	fling = new Fling((int) velocityX, (int) velocityY);
+        	compatPostOnAnimation(fling);
+        	return super.onFling(e1, e2, velocityX, velocityY);
+        }
+        
+        @Override
+        public boolean onDoubleTap(MotionEvent e) {
+        	boolean consumed = false;
+            if(doubleTapListener != null) {
+            	consumed = doubleTapListener.onDoubleTap(e);
+            }
+        	if (state == State.NONE) {
+	        	float targetZoom = (normalizedScale == minScale) ? maxScale : minScale;
+	        	DoubleTapZoom doubleTap = new DoubleTapZoom(targetZoom, e.getX(), e.getY(), false);
+	        	compatPostOnAnimation(doubleTap);
+	        	consumed = true;
+        	}
+        	return consumed;
+        }
+
+        @Override
+        public boolean onDoubleTapEvent(MotionEvent e) {
+            if(doubleTapListener != null) {
+            	return doubleTapListener.onDoubleTapEvent(e);
+            }
+            return false;
+        }
+    }
+    
+    public interface OnTouchImageViewListener {
+    	public void onMove();
+    }
+    
+    /**
+     * Responsible for all touch events. Handles the heavy lifting of drag and also sends
+     * touch events to Scale Detector and Gesture Detector.
+     * @author Ortiz
+     *
+     */
+    private class PrivateOnTouchListener implements OnTouchListener {
+    	
+    	//
+        // Remember last point position for dragging
+        //
+        private PointF last = new PointF();
+    	
+    	@Override
+        public boolean onTouch(View v, MotionEvent event) {
+            mScaleDetector.onTouchEvent(event);
+            mGestureDetector.onTouchEvent(event);
+            PointF curr = new PointF(event.getX(), event.getY());
+            
+            if (state == State.NONE || state == State.DRAG || state == State.FLING) {
+	            switch (event.getAction()) {
+	                case MotionEvent.ACTION_DOWN:
+	                	last.set(curr);
+	                    if (fling != null)
+	                    	fling.cancelFling();
+	                    setState(State.DRAG);
+	                    break;
+	                    
+	                case MotionEvent.ACTION_MOVE:
+	                    if (state == State.DRAG) {
+	                        float deltaX = curr.x - last.x;
+	                        float deltaY = curr.y - last.y;
+	                        float fixTransX = getFixDragTrans(deltaX, viewWidth, getImageWidth());
+	                        float fixTransY = getFixDragTrans(deltaY, viewHeight, getImageHeight());
+	                        matrix.postTranslate(fixTransX, fixTransY);
+	                        fixTrans();
+	                        last.set(curr.x, curr.y);
+	                    }
+	                    break;
+	
+	                case MotionEvent.ACTION_UP:
+	                case MotionEvent.ACTION_POINTER_UP:
+	                    setState(State.NONE);
+	                    break;
+	            }
+            }
+            
+            setImageMatrix(matrix);
+            
+            //
+    		// User-defined OnTouchListener
+    		//
+    		if(userTouchListener != null) {
+    			userTouchListener.onTouch(v, event);
+    		}
+            
+    		//
+    		// OnTouchImageViewListener is set: TouchImageView dragged by user.
+    		//
+    		if (touchImageViewListener != null) {
+    			touchImageViewListener.onMove();
+    		}
+    		
+            //
+            // indicate event was handled
+            //
+            return true;
+        }
+    }
+
+    /**
+     * ScaleListener detects user two finger scaling and scales image.
+     * @author Ortiz
+     *
+     */
+    private class ScaleListener extends ScaleGestureDetector.SimpleOnScaleGestureListener {
+        @Override
+        public boolean onScaleBegin(ScaleGestureDetector detector) {
+            setState(State.ZOOM);
+            return true;
+        }
+
+        @Override
+        public boolean onScale(ScaleGestureDetector detector) {
+        	scaleImage(detector.getScaleFactor(), detector.getFocusX(), detector.getFocusY(), true);
+        	
+        	//
+        	// OnTouchImageViewListener is set: TouchImageView pinch zoomed by user.
+        	//
+        	if (touchImageViewListener != null) {
+        		touchImageViewListener.onMove();
+        	}
+            return true;
+        }
+        
+        @Override
+        public void onScaleEnd(ScaleGestureDetector detector) {
+        	super.onScaleEnd(detector);
+        	setState(State.NONE);
+        	boolean animateToZoomBoundary = false;
+        	float targetZoom = normalizedScale;
+        	if (normalizedScale > maxScale) {
+        		targetZoom = maxScale;
+        		animateToZoomBoundary = true;
+        		
+        	} else if (normalizedScale < minScale) {
+        		targetZoom = minScale;
+        		animateToZoomBoundary = true;
+        	}
+        	
+        	if (animateToZoomBoundary) {
+	        	DoubleTapZoom doubleTap = new DoubleTapZoom(targetZoom, viewWidth / 2, viewHeight / 2, true);
+	        	compatPostOnAnimation(doubleTap);
+        	}
+        }
+    }
+    
+    private void scaleImage(double deltaScale, float focusX, float focusY, boolean stretchImageToSuper) {
+    	
+    	float lowerScale, upperScale;
+    	if (stretchImageToSuper) {
+    		lowerScale = superMinScale;
+    		upperScale = superMaxScale;
+    		
+    	} else {
+    		lowerScale = minScale;
+    		upperScale = maxScale;
+    	}
+    	
+    	float origScale = normalizedScale;
+        normalizedScale *= deltaScale;
+        if (normalizedScale > upperScale) {
+            normalizedScale = upperScale;
+            deltaScale = upperScale / origScale;
+        } else if (normalizedScale < lowerScale) {
+            normalizedScale = lowerScale;
+            deltaScale = lowerScale / origScale;
+        }
+        
+        matrix.postScale((float) deltaScale, (float) deltaScale, focusX, focusY);
+        fixScaleTrans();
+    }
+    
+    /**
+     * DoubleTapZoom calls a series of runnables which apply
+     * an animated zoom in/out graphic to the image.
+     * @author Ortiz
+     *
+     */
+    private class DoubleTapZoom implements Runnable {
+    	
+    	private long startTime;
+    	private static final float ZOOM_TIME = 500;
+    	private float startZoom, targetZoom;
+    	private float bitmapX, bitmapY;
+    	private boolean stretchImageToSuper;
+    	private AccelerateDecelerateInterpolator interpolator = new AccelerateDecelerateInterpolator();
+    	private PointF startTouch;
+    	private PointF endTouch;
+
+    	DoubleTapZoom(float targetZoom, float focusX, float focusY, boolean stretchImageToSuper) {
+    		setState(State.ANIMATE_ZOOM);
+    		startTime = System.currentTimeMillis();
+    		this.startZoom = normalizedScale;
+    		this.targetZoom = targetZoom;
+    		this.stretchImageToSuper = stretchImageToSuper;
+    		PointF bitmapPoint = transformCoordTouchToBitmap(focusX, focusY, false);
+    		this.bitmapX = bitmapPoint.x;
+    		this.bitmapY = bitmapPoint.y;
+    		
+    		//
+    		// Used for translating image during scaling
+    		//
+    		startTouch = transformCoordBitmapToTouch(bitmapX, bitmapY);
+    		endTouch = new PointF(viewWidth / 2, viewHeight / 2);
+    	}
+
+		@Override
+		public void run() {
+			float t = interpolate();
+			double deltaScale = calculateDeltaScale(t);
+			scaleImage(deltaScale, bitmapX, bitmapY, stretchImageToSuper);
+			translateImageToCenterTouchPosition(t);
+			fixScaleTrans();
+			setImageMatrix(matrix);
+			
+			//
+			// OnTouchImageViewListener is set: double tap runnable updates listener
+			// with every frame.
+			//
+			if (touchImageViewListener != null) {
+				touchImageViewListener.onMove();
+			}
+			
+			if (t < 1f) {
+				//
+				// We haven't finished zooming
+				//
+				compatPostOnAnimation(this);
+				
+			} else {
+				//
+				// Finished zooming
+				//
+				setState(State.NONE);
+			}
+		}
+		
+		/**
+		 * Interpolate between where the image should start and end in order to translate
+		 * the image so that the point that is touched is what ends up centered at the end
+		 * of the zoom.
+		 * @param t
+		 */
+		private void translateImageToCenterTouchPosition(float t) {
+			float targetX = startTouch.x + t * (endTouch.x - startTouch.x);
+			float targetY = startTouch.y + t * (endTouch.y - startTouch.y);
+			PointF curr = transformCoordBitmapToTouch(bitmapX, bitmapY);
+			matrix.postTranslate(targetX - curr.x, targetY - curr.y);
+		}
+		
+		/**
+		 * Use interpolator to get t
+		 * @return
+		 */
+		private float interpolate() {
+			long currTime = System.currentTimeMillis();
+			float elapsed = (currTime - startTime) / ZOOM_TIME;
+			elapsed = Math.min(1f, elapsed);
+			return interpolator.getInterpolation(elapsed);
+		}
+		
+		/**
+		 * Interpolate the current targeted zoom and get the delta
+		 * from the current zoom.
+		 * @param t
+		 * @return
+		 */
+		private double calculateDeltaScale(float t) {
+			double zoom = startZoom + t * (targetZoom - startZoom);
+			return zoom / normalizedScale;
+		}
+    }
+    
+    /**
+     * This function will transform the coordinates in the touch event to the coordinate 
+     * system of the drawable that the imageview contain
+     * @param x x-coordinate of touch event
+     * @param y y-coordinate of touch event
+     * @param clipToBitmap Touch event may occur within view, but outside image content. True, to clip return value
+     * 			to the bounds of the bitmap size.
+     * @return Coordinates of the point touched, in the coordinate system of the original drawable.
+     */
+    private PointF transformCoordTouchToBitmap(float x, float y, boolean clipToBitmap) {
+         matrix.getValues(m);
+         float origW = getDrawable().getIntrinsicWidth();
+         float origH = getDrawable().getIntrinsicHeight();
+         float transX = m[Matrix.MTRANS_X];
+         float transY = m[Matrix.MTRANS_Y];
+         float finalX = ((x - transX) * origW) / getImageWidth();
+         float finalY = ((y - transY) * origH) / getImageHeight();
+         
+         if (clipToBitmap) {
+        	 finalX = Math.min(Math.max(finalX, 0), origW);
+        	 finalY = Math.min(Math.max(finalY, 0), origH);
+         }
+         
+         return new PointF(finalX , finalY);
+    }
+    
+    /**
+     * Inverse of transformCoordTouchToBitmap. This function will transform the coordinates in the
+     * drawable's coordinate system to the view's coordinate system.
+     * @param bx x-coordinate in original bitmap coordinate system
+     * @param by y-coordinate in original bitmap coordinate system
+     * @return Coordinates of the point in the view's coordinate system.
+     */
+    private PointF transformCoordBitmapToTouch(float bx, float by) {
+        matrix.getValues(m);        
+        float origW = getDrawable().getIntrinsicWidth();
+        float origH = getDrawable().getIntrinsicHeight();
+        float px = bx / origW;
+        float py = by / origH;
+        float finalX = m[Matrix.MTRANS_X] + getImageWidth() * px;
+        float finalY = m[Matrix.MTRANS_Y] + getImageHeight() * py;
+        return new PointF(finalX , finalY);
+    }
+    
+    /**
+     * Fling launches sequential runnables which apply
+     * the fling graphic to the image. The values for the translation
+     * are interpolated by the Scroller.
+     * @author Ortiz
+     *
+     */
+    private class Fling implements Runnable {
+    	
+        CompatScroller scroller;
+    	int currX, currY;
+    	
+    	Fling(int velocityX, int velocityY) {
+    		setState(State.FLING);
+    		scroller = new CompatScroller(context);
+    		matrix.getValues(m);
+    		
+    		int startX = (int) m[Matrix.MTRANS_X];
+    		int startY = (int) m[Matrix.MTRANS_Y];
+    		int minX, maxX, minY, maxY;
+    		
+    		if (getImageWidth() > viewWidth) {
+    			minX = viewWidth - (int) getImageWidth();
+    			maxX = 0;
+    			
+    		} else {
+    			minX = maxX = startX;
+    		}
+    		
+    		if (getImageHeight() > viewHeight) {
+    			minY = viewHeight - (int) getImageHeight();
+    			maxY = 0;
+    			
+    		} else {
+    			minY = maxY = startY;
+    		}
+    		
+    		scroller.fling(startX, startY, (int) velocityX, (int) velocityY, minX,
+                    maxX, minY, maxY);
+    		currX = startX;
+    		currY = startY;
+    	}
+    	
+    	public void cancelFling() {
+    		if (scroller != null) {
+    			setState(State.NONE);
+    			scroller.forceFinished(true);
+    		}
+    	}
+    	
+		@Override
+		public void run() {
+			
+			//
+			// OnTouchImageViewListener is set: TouchImageView listener has been flung by user.
+			// Listener runnable updated with each frame of fling animation.
+			//
+			if (touchImageViewListener != null) {
+				touchImageViewListener.onMove();
+			}
+			
+			if (scroller.isFinished()) {
+        		scroller = null;
+        		return;
+        	}
+			
+			if (scroller.computeScrollOffset()) {
+	        	int newX = scroller.getCurrX();
+	            int newY = scroller.getCurrY();
+	            int transX = newX - currX;
+	            int transY = newY - currY;
+	            currX = newX;
+	            currY = newY;
+	            matrix.postTranslate(transX, transY);
+	            fixTrans();
+	            setImageMatrix(matrix);
+	            compatPostOnAnimation(this);
+        	}
+		}
+    }
+    
+    @TargetApi(Build.VERSION_CODES.GINGERBREAD)
+	private class CompatScroller {
+    	Scroller scroller;
+    	OverScroller overScroller;
+    	boolean isPreGingerbread;
+    	
+    	public CompatScroller(Context context) {
+    		if (VERSION.SDK_INT < VERSION_CODES.GINGERBREAD) {
+    			isPreGingerbread = true;
+    			scroller = new Scroller(context);
+    			
+    		} else {
+    			isPreGingerbread = false;
+    			overScroller = new OverScroller(context);
+    		}
+    	}
+    	
+    	public void fling(int startX, int startY, int velocityX, int velocityY, int minX, int maxX, int minY, int maxY) {
+    		if (isPreGingerbread) {
+    			scroller.fling(startX, startY, velocityX, velocityY, minX, maxX, minY, maxY);
+    		} else {
+    			overScroller.fling(startX, startY, velocityX, velocityY, minX, maxX, minY, maxY);
+    		}
+    	}
+    	
+    	public void forceFinished(boolean finished) {
+    		if (isPreGingerbread) {
+    			scroller.forceFinished(finished);
+    		} else {
+    			overScroller.forceFinished(finished);
+    		}
+    	}
+    	
+    	public boolean isFinished() {
+    		if (isPreGingerbread) {
+    			return scroller.isFinished();
+    		} else {
+    			return overScroller.isFinished();
+    		}
+    	}
+    	
+    	public boolean computeScrollOffset() {
+    		if (isPreGingerbread) {
+    			return scroller.computeScrollOffset();
+    		} else {
+    			overScroller.computeScrollOffset();
+    			return overScroller.computeScrollOffset();
+    		}
+    	}
+    	
+    	public int getCurrX() {
+    		if (isPreGingerbread) {
+    			return scroller.getCurrX();
+    		} else {
+    			return overScroller.getCurrX();
+    		}
+    	}
+    	
+    	public int getCurrY() {
+    		if (isPreGingerbread) {
+    			return scroller.getCurrY();
+    		} else {
+    			return overScroller.getCurrY();
+    		}
+    	}
+    }
+    
+    @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
+	private void compatPostOnAnimation(Runnable runnable) {
+    	if (VERSION.SDK_INT >= VERSION_CODES.JELLY_BEAN) {
+            postOnAnimation(runnable);
+            
+        } else {
+            postDelayed(runnable, 1000/60);
+        }
+    }
+    
+    private class ZoomVariables {
+    	public float scale;
+    	public float focusX;
+    	public float focusY;
+    	public ScaleType scaleType;
+    	
+    	public ZoomVariables(float scale, float focusX, float focusY, ScaleType scaleType) {
+    		this.scale = scale;
+    		this.focusX = focusX;
+    		this.focusY = focusY;
+    		this.scaleType = scaleType;
+    	}
+    }
+    
+    private void printMatrixInfo() {
+    	float[] n = new float[9];
+    	matrix.getValues(n);
+    	Log.d(DEBUG, "Scale: " + n[Matrix.MSCALE_X] + " TransX: " + n[Matrix.MTRANS_X] + " TransY: " + n[Matrix.MTRANS_Y]);
+    }
+}

BIN
src/main/res/drawable-hdpi/ic_done_white.png


BIN
src/main/res/drawable-mdpi/ic_done_white.png


BIN
src/main/res/drawable-xhdpi/ic_done_white.png


BIN
src/main/res/drawable-xxxhdpi/ic_done_white.png


+ 0 - 2
src/main/res/values-ar/strings.xml

@@ -232,7 +232,6 @@
 
     <string name="placeholder_sentence">هذه مساحة محجوزة</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filetype">صورة PNG</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 مساء</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -283,7 +282,6 @@
 
     <string name="forbidden_permissions_copy">لنسخ هذا الملف</string>
 
-    <string name="prefs_category_instant_uploading">تحميلات تلقائية</string>
     <string name="prefs_category_details">تفاصيل</string>
 
 	<string name="shared_subject_header">المشاركات</string>

+ 0 - 4
src/main/res/values-ast/strings.xml

@@ -250,7 +250,6 @@
 
     <string name="placeholder_sentence">Esto ye un marcador de posición</string>
     <string name="placeholder_filename">MarcadorDePosicion.txt</string>
-    <string name="placeholder_filetype">Imaxe PNG</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -268,7 +267,6 @@
     <string name="preview_image_description">Previsualización d\'imaxe</string>
     <string name="preview_image_error_unknown_format">Nun pue amosase la imaxe</string>
     <string name="error__upload__local_file_not_copied">Nun se pudo copiar %1$s al ficheru llocal %2$s</string>
-    <string name="prefs_instant_upload_path_title">Carpeta de xuba nel intre</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">Usar socarpetes</string>
     <string name="share_link_file_no_exist">Nun pue compartise. Por favor, comprueba si\'l ficheru esiste</string>
 	<string name="share_link_file_error">Hebo un fallu mientres s\'intentaba compartir esti ficheru o carpeta</string>
@@ -349,10 +347,8 @@
     <string name="copy_file_error">Asocedió un fallú entrín s\'intentaba copiar esta carpeta o ficheru</string>
     <string name="forbidden_permissions_copy">pa copiar esti ficheru</string>
 
-    <string name="prefs_category_instant_uploading">Xubes nel intre</string>
     <string name="prefs_category_details">Detalles</string>
 
-	<string name="prefs_instant_video_upload_path_title">Carpeta Vídeo pa xubes nel intre</string>
     <string name="sync_folder_failed_content">La sincronización de la carpeta %1$s nun pudo completase</string>
 
 	<string name="shared_subject_header">compartíu</string>

+ 0 - 2
src/main/res/values-bg-rBG/strings.xml

@@ -234,7 +234,6 @@
 
     <string name="preview_image_description">Преглед на изображението</string>
     <string name="error__upload__local_file_not_copied">%1$s не може да бъде копиран в локалната папка %2$s</string>
-    <string name="prefs_instant_upload_path_title">Папка за незабавно качените</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">Ползване на подпапки</string>
     <string name="prefs_instant_upload_path_use_subfolders_summary">Съхраняване в подпапки, разделени по година и месец</string>
 
@@ -288,7 +287,6 @@
     <string name="copy_file_error">Възникна грешка при опита за копиране на файла или папката</string>
     <string name="forbidden_permissions_copy">да копира този файл</string>
 
-    <string name="prefs_category_instant_uploading">Незабавни качвания</string>
     <string name="prefs_category_details">Детайли</string>
 
 	<string name="sync_folder_failed_content">Синхронизацията на папка %1$s не може да бъде завършена</string>

+ 0 - 3
src/main/res/values-ca/strings.xml

@@ -292,7 +292,6 @@
 
     <string name="placeholder_sentence">Això és un text variable</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filetype">Imatge PNG</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -312,7 +311,6 @@
     <string name="preview_image_description">Visualització prèvia d\'imatge</string>
     <string name="preview_image_error_unknown_format">No es pot mostrar la imatge</string>
     <string name="error__upload__local_file_not_copied">%1$s no s\'ha pogut copiar a la carpeta local %2$s</string>
-    <string name="prefs_instant_upload_path_title">Carpeta de pujada instantània</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">Feu servir subcarpetes</string>
     <string name="prefs_instant_upload_path_use_subfolders_summary">Desar a subcarpetes ordenades per any i mes</string>
 
@@ -371,7 +369,6 @@
     <string name="copy_file_error">Hi ha hagut un error en copiar aquest fitxer o carpeta</string>
     <string name="forbidden_permissions_copy">per copiar aquest fitxer</string>
 
-    <string name="prefs_category_instant_uploading">Pujada instantània</string>
     <string name="prefs_category_details">Detalls</string>
 
 	<string name="sync_folder_failed_content">La sincronització de la carpeta %1$s no s\'ha pogut completar</string>

+ 0 - 4
src/main/res/values-cs-rCZ/strings.xml

@@ -320,7 +320,6 @@
 
     <string name="placeholder_sentence">Zástupný text</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filetype">Obrázek PNG</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -342,7 +341,6 @@
     <string name="preview_image_error_no_local_file">K náhledu není žádný místní soubor</string>
 
     <string name="error__upload__local_file_not_copied">%1$s nelze zkopírovat do místního adresáře %2$s</string>
-    <string name="prefs_instant_upload_path_title">Adresář pro okamžité nahrání</string>
     <string name="prefs_synced_folders_local_path_title">Místní složka</string>
     <string name="prefs_synced_folders_remote_path_title">Vzdálená složka</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">Používat podadresáře</string>
@@ -438,10 +436,8 @@
     <string name="copy_file_error">Při pokusu o zkopírování tohoto souboru či adresáře došlo k chybě</string>
     <string name="forbidden_permissions_copy">pro zkopírování tohoto souboru</string>
 
-    <string name="prefs_category_instant_uploading">Okamžitá odesílání</string>
     <string name="prefs_category_details">Podrobnosti</string>
 
-	<string name="prefs_instant_video_upload_path_title">Adresář pro okamžité nahrání videa</string>
     <string name="sync_folder_failed_content">Synchronizaci adresáře %1$s nelze dokončit</string>
 
 	<string name="shared_subject_header">sdílené</string>

+ 0 - 2
src/main/res/values-da/strings.xml

@@ -247,7 +247,6 @@
 
     <string name="placeholder_sentence">Dette er en pladsholder</string>
     <string name="placeholder_filename">pladsholder.txt</string>
-    <string name="placeholder_filetype">PNG billede</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -267,7 +266,6 @@
     <string name="preview_image_error_no_local_file">Der er ingen lokalfil at forhåndsvise</string>
 
     <string name="error__upload__local_file_not_copied">%1$s kunne ikke kopieres til %2$s lokale mappe</string>
-    <string name="prefs_instant_upload_path_title">Øjeblikkelig opload mappe</string>
     <string name="prefs_synced_folders_local_path_title">Lokal mappe</string>
     <string name="prefs_synced_folders_remote_path_title">Ekstern mappe</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">Benyt undermapper</string>

+ 0 - 4
src/main/res/values-de-rDE/strings.xml

@@ -322,7 +322,6 @@
 
     <string name="placeholder_sentence">Dies ist ein Platzhalter</string>
     <string name="placeholder_filename">platzhalter.txt</string>
-    <string name="placeholder_filetype">PNG-Bild</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">18.5.2012 12:23</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -344,7 +343,6 @@
     <string name="preview_image_error_no_local_file">Keine lokale Datei für die Vorschau vorhanden</string>
 
     <string name="error__upload__local_file_not_copied">%1$s konnte nicht in den lokalen %2$s Ordner kopiert werden</string>
-    <string name="prefs_instant_upload_path_title">Sofort-Upload-Ordner</string>
     <string name="prefs_synced_folders_local_path_title">Lokaler Ordner</string>
     <string name="prefs_synced_folders_remote_path_title">Remote-Ordner</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">Unterordner benutzen</string>
@@ -440,10 +438,8 @@
     <string name="copy_file_error">Es ist ein Fehler beim Kopieren der Datei oder des Ordners aufgetreten.</string>
     <string name="forbidden_permissions_copy">diese Datei zu kopieren</string>
 
-    <string name="prefs_category_instant_uploading">sofort hochladen</string>
     <string name="prefs_category_details">Details</string>
 
-	<string name="prefs_instant_video_upload_path_title">Video Speicherpfad wählen</string>
     <string name="sync_folder_failed_content">Bei der Synchronisation konnte %1$s Ordner nicht fertig gestellt werden</string>
 
 	<string name="shared_subject_header">geteilt</string>

+ 0 - 4
src/main/res/values-de/strings.xml

@@ -322,7 +322,6 @@
 
     <string name="placeholder_sentence">Dies ist ein Platzhalter</string>
     <string name="placeholder_filename">platzhalter.txt</string>
-    <string name="placeholder_filetype">PNG-Bild</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">18.5.2012 12:23</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -344,7 +343,6 @@
     <string name="preview_image_error_no_local_file">Keine lokale Datei für die Vorschau vorhanden </string>
 
     <string name="error__upload__local_file_not_copied">%1$s konnte nicht in den lokalen %2$s Ordner kopiert werden</string>
-    <string name="prefs_instant_upload_path_title">Sofort-Upload-Ordner</string>
     <string name="prefs_synced_folders_local_path_title">Lokaler Ordner</string>
     <string name="prefs_synced_folders_remote_path_title">Remote-Ordner</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">Unterordner benutzen</string>
@@ -440,10 +438,8 @@
     <string name="copy_file_error">Es ist ein Fehler beim Kopieren der Datei oder des Ordners aufgetreten.</string>
     <string name="forbidden_permissions_copy">diese Datei zu kopieren</string>
 
-    <string name="prefs_category_instant_uploading">sofort hochladen</string>
     <string name="prefs_category_details">Details</string>
 
-	<string name="prefs_instant_video_upload_path_title">Video Speicherpfad wählen</string>
     <string name="sync_folder_failed_content">Bei der Synchronisation konnte %1$s Ordner nicht fertig gestellt werden</string>
 
 	<string name="shared_subject_header">geteilt</string>

+ 0 - 4
src/main/res/values-el/strings.xml

@@ -292,7 +292,6 @@
 
     <string name="placeholder_sentence">Αυτό είναι ένα σημείο placeholder</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filetype">Εικόνα PNG</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -314,7 +313,6 @@
     <string name="preview_image_error_no_local_file">Δεν υπάρχει τοπικό αρχείο για προβολή</string>
 
     <string name="error__upload__local_file_not_copied">Το %1$s δεν μπόρεσε να αντιγραφεί στον τοπικό φάκελο %2$s</string>
-    <string name="prefs_instant_upload_path_title">Φάκελος άμεσης μεταφόρτωσης</string>
     <string name="prefs_synced_folders_local_path_title">Τοπικός φάκελος</string>
     <string name="prefs_synced_folders_remote_path_title">Απομακρυσμένος φάκελος</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">Χρήση υποφακέλων</string>
@@ -408,10 +406,8 @@
     <string name="copy_file_error">Παρουσιάστηκε σφάλμα κατά την προσπάθεια αντιγραφής αυτού του αρχείου ή φακέλου</string>
     <string name="forbidden_permissions_copy">για αντιγραφή αυτού του αρχείου</string>
 
-    <string name="prefs_category_instant_uploading">Άμεσες μεταφορτώσεις</string>
     <string name="prefs_category_details">Λεπτομέρειες</string>
 
-	<string name="prefs_instant_video_upload_path_title">Φάκελος άμεσης μεταφόρτωσης βίντεο</string>
     <string name="sync_folder_failed_content">Ο συγχρονισμός του φακέλου %1$s δεν μπόρεσε να ολοκληρωθεί</string>
 
 	<string name="shared_subject_header">διαμοιρασμένα</string>

+ 0 - 4
src/main/res/values-en-rGB/strings.xml

@@ -321,7 +321,6 @@
 
     <string name="placeholder_sentence">This is a placeholder</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filetype">PNG image</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -343,7 +342,6 @@
     <string name="preview_image_error_no_local_file">There is no local file to preview</string>
 
     <string name="error__upload__local_file_not_copied">%1$s could not be copied to %2$s local folder</string>
-    <string name="prefs_instant_upload_path_title">Instant upload folder</string>
     <string name="prefs_synced_folders_local_path_title">Local folder</string>
     <string name="prefs_synced_folders_remote_path_title">Remote folder</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">Use subfolders</string>
@@ -439,10 +437,8 @@
     <string name="copy_file_error">An error occurred while trying to copy this file or folder</string>
     <string name="forbidden_permissions_copy">to copy this file</string>
 
-    <string name="prefs_category_instant_uploading">Instant uploads</string>
     <string name="prefs_category_details">Details</string>
 
-	<string name="prefs_instant_video_upload_path_title">Video folder for instant uploads</string>
     <string name="sync_folder_failed_content">Synchronisation of %1$s folder could not be completed</string>
 
 	<string name="shared_subject_header">shared</string>

+ 0 - 4
src/main/res/values-es-rAR/strings.xml

@@ -289,7 +289,6 @@
 
     <string name="placeholder_sentence">Este es un marcador de posición</string>
     <string name="placeholder_filename">marcadordeposición.txt</string>
-    <string name="placeholder_filetype">Imagen PNG</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -309,7 +308,6 @@
     <string name="preview_image_description">Vista previa de imagen</string>
     <string name="preview_image_error_unknown_format">No es posible mostrar la imagen</string>
     <string name="error__upload__local_file_not_copied">%1$s no pudo ser copiado a la carpeta local %2$s</string>
-    <string name="prefs_instant_upload_path_title">Carpeta de carga instantánea</string>
     <string name="prefs_synced_folders_local_path_title">Carpeta local</string>
     <string name="prefs_synced_folders_remote_path_title">Carpeta remota</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">Usar sub carpetas</string>
@@ -403,10 +401,8 @@
     <string name="copy_file_error">Se presentó un error al intentar copiar este archivo o carpeta</string>
     <string name="forbidden_permissions_copy">para copiar este archivo</string>
 
-    <string name="prefs_category_instant_uploading">Cargas instantáneas</string>
     <string name="prefs_category_details">Detalles</string>
 
-	<string name="prefs_instant_video_upload_path_title">Carpeta de video para cargas instantáneas</string>
     <string name="sync_folder_failed_content">La sincronización de %1$s carpeta no se pudo completar</string>
 
 	<string name="shared_subject_header">compartido</string>

+ 0 - 4
src/main/res/values-es-rCO/strings.xml

@@ -321,7 +321,6 @@
 
     <string name="placeholder_sentence">Este es un marcador de posición</string>
     <string name="placeholder_filename">marcadordeposición.txt</string>
-    <string name="placeholder_filetype">Imagen PNG</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -343,7 +342,6 @@
     <string name="preview_image_error_no_local_file">No existe un archivo local a previsualizar</string>
 
     <string name="error__upload__local_file_not_copied">%1$s no pudo ser copiado a la carpeta local %2$s</string>
-    <string name="prefs_instant_upload_path_title">Carpeta de carga automática</string>
     <string name="prefs_synced_folders_local_path_title">Carpeta local</string>
     <string name="prefs_synced_folders_remote_path_title">Carpeta remota</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">Usar sub carpetas</string>
@@ -439,10 +437,8 @@
     <string name="copy_file_error">Se presentó un error al intentar copiar este archivo o carpeta</string>
     <string name="forbidden_permissions_copy">para copiar este archivo</string>
 
-    <string name="prefs_category_instant_uploading">Cargas automáticas</string>
     <string name="prefs_category_details">Detalles</string>
 
-	<string name="prefs_instant_video_upload_path_title">Carpeta de video para cargas automáticas</string>
     <string name="sync_folder_failed_content">La sincronización de %1$s carpeta no se pudo completar</string>
 
 	<string name="shared_subject_header">compartido</string>

+ 0 - 4
src/main/res/values-es-rMX/strings.xml

@@ -321,7 +321,6 @@
 
     <string name="placeholder_sentence">Este es un marcador de posición</string>
     <string name="placeholder_filename">marcadordeposición.txt</string>
-    <string name="placeholder_filetype">Imagen PNG</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -343,7 +342,6 @@
     <string name="preview_image_error_no_local_file">No existe un archivo local a previsualizar</string>
 
     <string name="error__upload__local_file_not_copied">%1$s no pudo ser copiado a la carpeta local %2$s</string>
-    <string name="prefs_instant_upload_path_title">Carpeta de carga automática</string>
     <string name="prefs_synced_folders_local_path_title">Carpeta local</string>
     <string name="prefs_synced_folders_remote_path_title">Carpeta remota</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">Usar sub carpetas</string>
@@ -439,10 +437,8 @@
     <string name="copy_file_error">Se presentó un error al intentar copiar este archivo o carpeta</string>
     <string name="forbidden_permissions_copy">para copiar este archivo</string>
 
-    <string name="prefs_category_instant_uploading">Cargas automáticas</string>
     <string name="prefs_category_details">Detalles</string>
 
-	<string name="prefs_instant_video_upload_path_title">Carpeta de video para cargas automáticas</string>
     <string name="sync_folder_failed_content">La sincronización de %1$s carpeta no se pudo completar</string>
 
 	<string name="shared_subject_header">compartido</string>

+ 0 - 4
src/main/res/values-es/strings.xml

@@ -301,7 +301,6 @@
 
     <string name="placeholder_sentence">Esto es un marcador de posición</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filetype">Imagen PNG</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">18/05/2012 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -323,7 +322,6 @@
     <string name="preview_image_error_no_local_file">No hay archivo local para previsualizar</string>
 
     <string name="error__upload__local_file_not_copied">%1$s no se ha podido copiar a la carpeta local %2$s</string>
-    <string name="prefs_instant_upload_path_title">Carpeta para subida instantánea</string>
     <string name="prefs_synced_folders_local_path_title">Carpeta local</string>
     <string name="prefs_synced_folders_remote_path_title">Carpeta remota</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">Usar subcarpetas</string>
@@ -417,10 +415,8 @@
     <string name="copy_file_error">Hubo un error al tratar de copiar este archivo o carpeta</string>
     <string name="forbidden_permissions_copy">copiar este archivo</string>
 
-    <string name="prefs_category_instant_uploading">Subidas instantáneas</string>
     <string name="prefs_category_details">Detalles</string>
 
-	<string name="prefs_instant_video_upload_path_title">Carpeta para subida instantáneo de vídeos</string>
     <string name="sync_folder_failed_content">La sincronización de la carpeta %1$s no se ha podido completar</string>
 
 	<string name="shared_subject_header">compartido</string>

+ 0 - 1
src/main/res/values-eu/strings.xml

@@ -295,7 +295,6 @@ Mesedez, baimendu berriz</string>
 
     <string name="placeholder_sentence">Hau leku-marka da</string>
     <string name="placeholder_filename">kokalekua.txt</string>
-    <string name="placeholder_filetype">PNG irudia</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>

+ 0 - 2
src/main/res/values-fa/strings.xml

@@ -277,7 +277,6 @@
 
     <string name="placeholder_sentence">این یک حفره است.</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filetype">تصویر PNG</string>
     <string name="placeholder_filesize">389 کیلو بایت</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 بعد از ظهر</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -298,7 +297,6 @@
     <string name="preview_image_error_no_local_file">هیچ فایل محلی برای پیش نمایش وجود ندارد</string>
 
     <string name="error__upload__local_file_not_copied">کپی %1$s به پوشه محلی %2$s امکان پذیر نیست</string>
-    <string name="prefs_instant_upload_path_title">پوشه آپلود فوری</string>
     <string name="prefs_synced_folders_local_path_title">پوشه محلی</string>
     <string name="prefs_synced_folders_remote_path_title">پوشه از راه دور</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">استفاده از زیر پوشه</string>

+ 0 - 3
src/main/res/values-fi-rFI/strings.xml

@@ -268,7 +268,6 @@
     <string name="ssl_validator_null_cert">Varmennetta ei voi näyttää.</string>
     <string name="ssl_validator_no_info_about_error">- Ei lisätietoja virheestä</string>
 
-    <string name="placeholder_filetype">PNG-kuva</string>
     <string name="placeholder_filesize">389 kt</string>
     <string name="placeholder_media_time">12:23:45</string>
 
@@ -284,7 +283,6 @@
     <string name="preview_sorry">Anteeksi</string>
     <string name="preview_image_description">Kuvan esikatselu</string>
     <string name="preview_image_error_unknown_format">Kuvan näyttäminen ei onnistunut</string>
-    <string name="prefs_instant_upload_path_title">Välitön lähetys kansio</string>
     <string name="prefs_synced_folders_local_path_title">Paikallinen kansio</string>
     <string name="prefs_synced_folders_remote_path_title">Etäkansio</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">Käytä alikansioita</string>
@@ -355,7 +353,6 @@
     <string name="copy_file_error">Tätä tiedostoa tai kansiota kopioitaessa tapahtui virhe</string>
     <string name="forbidden_permissions_copy">kopioida tämä tiedosto</string>
 
-    <string name="prefs_category_instant_uploading">Välittömät lähetykset</string>
     <string name="prefs_category_details">Tiedot</string>
 
 	<string name="sync_folder_failed_content">Kansion %1$s synkronointia ei voitu suorittaa kokonaan</string>

+ 0 - 4
src/main/res/values-fr/strings.xml

@@ -323,7 +323,6 @@ Attention la suppression est irréversible.</string>
 
     <string name="placeholder_sentence">Ceci est un espace réservé</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filetype">Image PNG</string>
     <string name="placeholder_filesize">389 Ko</string>
     <string name="placeholder_timestamp">18/05/2012 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -345,7 +344,6 @@ Attention la suppression est irréversible.</string>
     <string name="preview_image_error_no_local_file">Il n\'y a aucun fichier local à prévisualiser</string>
 
     <string name="error__upload__local_file_not_copied">%1$s n\'a pas pu être copié dans le dossier local %2$s</string>
-    <string name="prefs_instant_upload_path_title">Téléversement immédiat du dossier</string>
     <string name="prefs_synced_folders_local_path_title">Dossier local</string>
     <string name="prefs_synced_folders_remote_path_title">Dossier distant</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">Utiliser des sous-dossiers</string>
@@ -441,10 +439,8 @@ Attention la suppression est irréversible.</string>
     <string name="copy_file_error">Une erreur est survenue lors de la copie de ce fichier ou dossier</string>
     <string name="forbidden_permissions_copy">de copier ce fichier</string>
 
-    <string name="prefs_category_instant_uploading">Téléversement immédiat</string>
     <string name="prefs_category_details">Préférences</string>
 
-	<string name="prefs_instant_video_upload_path_title">Téléversement immédiat du dossier vidéos</string>
     <string name="sync_folder_failed_content">La synchronisation du dossier %1$s n\'a pas pu être terminée</string>
 
 	<string name="shared_subject_header">a partagé</string>

+ 0 - 1
src/main/res/values-he/strings.xml

@@ -266,7 +266,6 @@
     <string name="copy_file_error">אירעה שגיאה בזמן ניסיון להעתיק את הקובץ או התיקייה</string>
     <string name="forbidden_permissions_copy">להעתיק את הקובץ הזה</string>
 
-    <string name="prefs_category_instant_uploading">העלאות מיידיות</string>
     <string name="prefs_category_details">פרטים</string>
 
 	<string name="sync_folder_failed_content">לא ניתן להשלים סנכרון של %1$s תיקיות</string>

+ 0 - 4
src/main/res/values-hu-rHU/strings.xml

@@ -321,7 +321,6 @@
 
     <string name="placeholder_sentence">Ez egy helyőrző</string>
     <string name="placeholder_filename">helyörző.txt</string>
-    <string name="placeholder_filetype">PNG kép</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -344,7 +343,6 @@
     <string name="preview_image_error_no_local_file">Nincs helyi fájl az előnézethez</string>
 
     <string name="error__upload__local_file_not_copied">%1$s nem lehet másolni a %2$s helyi mappába</string>
-    <string name="prefs_instant_upload_path_title">Azonnali feltöltés mappa</string>
     <string name="prefs_synced_folders_local_path_title">Helyi mappa</string>
     <string name="prefs_synced_folders_remote_path_title">Távoli mappa</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">Almappák használata</string>
@@ -440,10 +438,8 @@
     <string name="copy_file_error">Hiba történt a fájl vagy mappa másolása közben</string>
     <string name="forbidden_permissions_copy">a fájl másolása</string>
 
-    <string name="prefs_category_instant_uploading">Azonnali feltöltések</string>
     <string name="prefs_category_details">Részletek</string>
 
-	<string name="prefs_instant_video_upload_path_title">Videó mappa az instant feltöltéshez</string>
     <string name="sync_folder_failed_content">%1$s mappa szinkronizációját nem lehet végrehajtani</string>
 
 	<string name="shared_subject_header">megosztva</string>

+ 0 - 4
src/main/res/values-id/strings.xml

@@ -291,7 +291,6 @@
 
     <string name="placeholder_sentence">Ini adalah placeholder</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filetype">Gambar PNG</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">18/05/2012 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -310,7 +309,6 @@
     <string name="preview_image_description">Pratilik gambar</string>
     <string name="preview_image_error_unknown_format">Gambar ini tidak dapat ditampilkan</string>
     <string name="error__upload__local_file_not_copied">%1$s tidak dapat disalin ke folder lokal %2$s</string>
-    <string name="prefs_instant_upload_path_title">Folder unggah cepat</string>
     <string name="prefs_synced_folders_local_path_title">Berkas lokal</string>
     <string name="prefs_synced_folders_remote_path_title">Folder remot</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">Gunakan subfolder</string>
@@ -404,10 +402,8 @@
     <string name="copy_file_error">Terjadi kesalahan ketika mencoba menyalin berkas atau folder ini</string>
     <string name="forbidden_permissions_copy">untuk menyalin berkas ini</string>
 
-    <string name="prefs_category_instant_uploading">Unggah cepat</string>
     <string name="prefs_category_details">Rincian</string>
 
-	<string name="prefs_instant_video_upload_path_title">Folder untuk mengunggah video cepat</string>
     <string name="sync_folder_failed_content">Sinkronisasi folder %1$s tidak dapat diselesaikan</string>
 
 	<string name="shared_subject_header">dibagikan</string>

+ 0 - 4
src/main/res/values-is/strings.xml

@@ -292,7 +292,6 @@ Smelltu hér til að fá þér einn frá þjónustuaðila.</string>
 
     <string name="placeholder_sentence">Þetta er frátökutákn</string>
     <string name="placeholder_filename">frátökutákn.txt</string>
-    <string name="placeholder_filetype">PNG-mynd</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 EH</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -314,7 +313,6 @@ Smelltu hér til að fá þér einn frá þjónustuaðila.</string>
     <string name="preview_image_error_no_local_file">Það er engin staðvær skrá til að forskoða</string>
 
     <string name="error__upload__local_file_not_copied">%1$s var ekki hægt að afrita í staðværu %2$s möppuna</string>
-    <string name="prefs_instant_upload_path_title">Mappa fyrir beinar innsendingar</string>
     <string name="prefs_synced_folders_local_path_title">Staðvær mappa</string>
     <string name="prefs_synced_folders_remote_path_title">Fjartengd mappa</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">Nota undirmöppur</string>
@@ -408,10 +406,8 @@ Smelltu hér til að fá þér einn frá þjónustuaðila.</string>
     <string name="copy_file_error">Villa kom upp við að reyna að afrita þessa skrá eða möppu</string>
     <string name="forbidden_permissions_copy">til að afrita þessa skrá</string>
 
-    <string name="prefs_category_instant_uploading">Beinar innsendingar</string>
     <string name="prefs_category_details">Nánar</string>
 
-	<string name="prefs_instant_video_upload_path_title">Mappa fyrir beinar innsendingar myndskeiða</string>
     <string name="sync_folder_failed_content">Ekki var hægt að ljúka samstillingu á %1$s möppunni</string>
 
 	<string name="shared_subject_header">deilt</string>

+ 0 - 4
src/main/res/values-it/strings.xml

@@ -321,7 +321,6 @@
 
     <string name="placeholder_sentence">Questo è un segnaposto</string>
     <string name="placeholder_filename">segnaposto.txt</string>
-    <string name="placeholder_filetype">Immagine PNG</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -343,7 +342,6 @@
     <string name="preview_image_error_no_local_file">Non esiste un file locale per l\'anteprima</string>
 
     <string name="error__upload__local_file_not_copied">%1$s non può essere copiato nella cartella locale %2$s</string>
-    <string name="prefs_instant_upload_path_title">Cartella caricamenti istantanei</string>
     <string name="prefs_synced_folders_local_path_title">Cartella locale</string>
     <string name="prefs_synced_folders_remote_path_title">Cartella remota</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">Usa sottocartelle</string>
@@ -439,10 +437,8 @@
     <string name="copy_file_error">Si è verificato un errore durante il tentativo di copiare il file o la cartella</string>
     <string name="forbidden_permissions_copy">per copiare questo file</string>
 
-    <string name="prefs_category_instant_uploading">Caricamenti istantanei</string>
     <string name="prefs_category_details">Dettagli</string>
 
-	<string name="prefs_instant_video_upload_path_title">Cartella dei video per caricamento automatico</string>
     <string name="sync_folder_failed_content">La sincronizzazione della cartella %1$s non può essere completata</string>
 
 	<string name="shared_subject_header">condiviso</string>

+ 0 - 2
src/main/res/values-ja-rJP/strings.xml

@@ -268,7 +268,6 @@
 
     <string name="preview_image_description">イメージプレビュー</string>
     <string name="error__upload__local_file_not_copied">%1$s は、ローカルフォルダー %2$s  にコピーできませんでした。</string>
-    <string name="prefs_instant_upload_path_title">自動アップロードフォルダー</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">サブフォルダーを利用</string>
     <string name="prefs_instant_upload_path_use_subfolders_summary">年と月を元にしたサブフォルダーに保存</string>
 
@@ -323,7 +322,6 @@
     <string name="copy_file_error">このファイルまたはフォルダーをコピーする際にエラーが発生しました</string>
     <string name="forbidden_permissions_copy">このファイルをコピー</string>
 
-    <string name="prefs_category_instant_uploading">自動アップロード</string>
     <string name="prefs_category_details">詳細</string>
 
 	<string name="sync_folder_failed_content">%1$s フォルダーの同期が完了しませんでした。</string>

+ 0 - 3
src/main/res/values-ko/strings.xml

@@ -257,7 +257,6 @@
 
     <string name="placeholder_sentence">이것은 자리 비움자입니다</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filetype">PNG 이미지</string>
     <string name="placeholder_filesize">389KB</string>
     <string name="placeholder_timestamp">2012년 05월 18일 오후 12:23</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -277,7 +276,6 @@
     <string name="preview_image_error_no_local_file">미리 볼 로컬 파일 없음</string>
 
     <string name="error__upload__local_file_not_copied">%1$s을(를) 로컬 폴더 %2$s(으)로 복사할 수 없습니다</string>
-    <string name="prefs_instant_upload_path_title">즉시 업로드 폴더</string>
     <string name="prefs_synced_folders_local_path_title">로컬 폴더</string>
     <string name="prefs_synced_folders_remote_path_title">원격 폴더</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">하위 폴더 사용</string>
@@ -341,7 +339,6 @@
     <string name="copy_file_error">이 파일이나 폴더를 복사할 수 없습니다</string>
     <string name="forbidden_permissions_copy">이 파일을 복사할</string>
 
-    <string name="prefs_category_instant_uploading">즉시 업로드</string>
     <string name="prefs_category_details">자세한 정보</string>
 
 	<string name="sync_folder_failed_content">%1$s  폴더의 동기화를 완료할 수 없습니다</string>

+ 0 - 4
src/main/res/values-lt-rLT/strings.xml

@@ -293,7 +293,6 @@
 
     <string name="placeholder_sentence">Rezervas</string>
     <string name="placeholder_filename">rezervas.txt</string>
-    <string name="placeholder_filetype">PNG paveikslas</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -315,7 +314,6 @@
     <string name="preview_image_error_no_local_file">Nėra vietinio failo peržiūrai</string>
 
     <string name="error__upload__local_file_not_copied">%1$s negali būti nukopijuota į %2$s vietinį aplanką</string>
-    <string name="prefs_instant_upload_path_title">Momentinis įkėlimo aplankas</string>
     <string name="prefs_synced_folders_local_path_title">Aplankas vietinis</string>
     <string name="prefs_synced_folders_remote_path_title">Nuotolinis aplankas</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">Nuotolinis poaplankis</string>
@@ -409,10 +407,8 @@
     <string name="copy_file_error">Klaida kopijuojant failą ar aplanką</string>
     <string name="forbidden_permissions_copy">kopijuoti failo</string>
 
-    <string name="prefs_category_instant_uploading">Momentiniai video įkėlimai</string>
     <string name="prefs_category_details">Informacija</string>
 
-	<string name="prefs_instant_video_upload_path_title">Vaizdo aplankas momentiniams įkėlimams</string>
     <string name="sync_folder_failed_content">%1$s sinchronizavimas negali būti užbaigtas.</string>
 
 	<string name="shared_subject_header">Dalinamasi</string>

+ 0 - 2
src/main/res/values-lv/strings.xml

@@ -210,7 +210,6 @@
 
     <string name="preview_image_description">Attēla priekšskatījums</string>
     <string name="error__upload__local_file_not_copied">%1$s nevar kopēt uz %2$s lokālo mapi</string>
-    <string name="prefs_instant_upload_path_title">Tūlītējas augšupielādes mepe</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">Lietot apakšmapi</string>
     <string name="share_link_file_no_exist">Nevar koplietot. Lūdzu, pārbaudiet, vai fails pastāv</string>
 	<string name="share_link_file_error">Radās kļūda, mēģinot koplietot šo failu vai mapi</string>
@@ -260,7 +259,6 @@
     <string name="copy_file_error">Radās kļūda, mēģinot kopēt šo failu vai mapi</string>
     <string name="forbidden_permissions_copy">lai kopētu šo datni</string>
 
-    <string name="prefs_category_instant_uploading">Tūlītējas augšupielādes</string>
     <string name="prefs_category_details">Detaļas</string>
 
 	<string name="shared_subject_header">koplietots</string>

+ 0 - 4
src/main/res/values-nb-rNO/strings.xml

@@ -320,7 +320,6 @@
 
     <string name="placeholder_sentence">Dette er en plassholder</string>
     <string name="placeholder_filename">plassholder.txt</string>
-    <string name="placeholder_filetype">PNG-bilde</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">18.05.2012 12:23</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -342,7 +341,6 @@
     <string name="preview_image_error_no_local_file">Ingen lokal fil å forhåndsvise</string>
 
     <string name="error__upload__local_file_not_copied">%1$s kunne ikke kopieres til lokal mappe %2$s</string>
-    <string name="prefs_instant_upload_path_title">Mappe for umiddelbar opplasting</string>
     <string name="prefs_synced_folders_local_path_title">Lokal mappe</string>
     <string name="prefs_synced_folders_remote_path_title">Mappe på tjener</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">Bruk undermapper</string>
@@ -438,10 +436,8 @@
     <string name="copy_file_error">En feil oppstod ved kopiering av denne filen eller mappen</string>
     <string name="forbidden_permissions_copy">å kopiere denne filen</string>
 
-    <string name="prefs_category_instant_uploading">Umiddelbare opplastinger</string>
     <string name="prefs_category_details">Detaljer</string>
 
-	<string name="prefs_instant_video_upload_path_title">Mappe for umiddelbar opplasting av filmer</string>
     <string name="sync_folder_failed_content">Synkronisering av %1$s mappe kunne ikke fullføres</string>
 
 	<string name="shared_subject_header">delt</string>

+ 0 - 4
src/main/res/values-nl/strings.xml

@@ -322,7 +322,6 @@ Kies er eentje van een provider.</string>
 
     <string name="placeholder_sentence">Dit is een plaatshouder</string>
     <string name="placeholder_filename">plaatshouder.txt</string>
-    <string name="placeholder_filetype">PNG afbeelding</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -344,7 +343,6 @@ Kies er eentje van een provider.</string>
     <string name="preview_image_error_no_local_file">Er is geen lokaal bestand om te bekijken</string>
 
     <string name="error__upload__local_file_not_copied">%1$s kon niet worden gekopieerd naar de lokale map %2$s</string>
-    <string name="prefs_instant_upload_path_title">Directe-uploadmap</string>
     <string name="prefs_synced_folders_local_path_title">Lokale map</string>
     <string name="prefs_synced_folders_remote_path_title">Externe map</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">Gebruik submappen</string>
@@ -440,10 +438,8 @@ Kies er eentje van een provider.</string>
     <string name="copy_file_error">Er trad een fout op bij het kopiëren van dit bestand of deze map</string>
     <string name="forbidden_permissions_copy">om dit bestand te kopiëren</string>
 
-    <string name="prefs_category_instant_uploading">Direct uploaden</string>
     <string name="prefs_category_details">Details</string>
 
-	<string name="prefs_instant_video_upload_path_title">Directe-uploadmap voor video\'s</string>
     <string name="sync_folder_failed_content">Synchronisatie van map %1$s kon niet worden voltooid</string>
 
 	<string name="shared_subject_header">gedeeld</string>

+ 0 - 4
src/main/res/values-pl/strings.xml

@@ -321,7 +321,6 @@
 
     <string name="placeholder_sentence">Tekst zastępczy</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filetype">obraz PNG</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -343,7 +342,6 @@
     <string name="preview_image_error_no_local_file">Brak lokalnego pliku do podglądu</string>
 
     <string name="error__upload__local_file_not_copied">%1$s nie może zostać skopiowany do lokalnego folderu %2$s</string>
-    <string name="prefs_instant_upload_path_title">Folder natychmiastowego wysyłania</string>
     <string name="prefs_synced_folders_local_path_title">Katalog lokalny</string>
     <string name="prefs_synced_folders_remote_path_title">Katalog zdalny</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">Używaj podfolderów</string>
@@ -439,10 +437,8 @@
     <string name="copy_file_error">Wystąpił błąd podczas próby kopiowania tego pliku lub folderu</string>
     <string name="forbidden_permissions_copy">by skopiować ten plik</string>
 
-    <string name="prefs_category_instant_uploading">Natychmiastowe wysłanie</string>
     <string name="prefs_category_details">Szczegóły</string>
 
-	<string name="prefs_instant_video_upload_path_title">Folder wideo do natychmiastowego wysyłania</string>
     <string name="sync_folder_failed_content">Synchronizacja folderu %1$s nie może zostać zakończona</string>
 
 	<string name="shared_subject_header">udostępniony</string>

+ 0 - 4
src/main/res/values-pt-rBR/strings.xml

@@ -321,7 +321,6 @@
 
     <string name="placeholder_sentence">Este é um espaço reservado</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filetype">Imagem PNG</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -343,7 +342,6 @@
     <string name="preview_image_error_no_local_file">Não há arquivos locais para mostrar</string>
 
     <string name="error__upload__local_file_not_copied">%1$s não pôde ser copiado para pasta local %2$s</string>
-    <string name="prefs_instant_upload_path_title">Pasta de envio automático</string>
     <string name="prefs_synced_folders_local_path_title">Pasta local</string>
     <string name="prefs_synced_folders_remote_path_title">Pasta remota</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">Usar subpastas</string>
@@ -439,10 +437,8 @@
     <string name="copy_file_error">Ocorreu um erro ao tentar copiar este arquivo ou pasta</string>
     <string name="forbidden_permissions_copy">copiar este arquivo</string>
 
-    <string name="prefs_category_instant_uploading">Envio automático</string>
     <string name="prefs_category_details">Detalhes</string>
 
-	<string name="prefs_instant_video_upload_path_title">Pasta de vídeo para envios automáticos</string>
     <string name="sync_folder_failed_content">A sincronização da pasta %1$s não pôde ser finalizada</string>
 
 	<string name="shared_subject_header">compartilhado</string>

+ 0 - 2
src/main/res/values-ro/strings.xml

@@ -217,7 +217,6 @@
 
     <string name="preview_image_description">Previzualizare imagine</string>
     <string name="error__upload__local_file_not_copied">%1$s nu a putut fi copiat in dosarul local %2$s </string>
-    <string name="prefs_instant_upload_path_title">Dosar pentru încărcare instantă</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">Folosește subdosare</string>
     <string name="prefs_instant_upload_path_use_subfolders_summary">Stocați in subdosar bazat pe an și lună</string>
 
@@ -272,7 +271,6 @@
     <string name="copy_file_error">A apărut o eroare în timpul copierii fișierului sau dosarului </string>
     <string name="forbidden_permissions_copy">să copiați acest fișier</string>
 
-    <string name="prefs_category_instant_uploading">Încărcări instantanee</string>
     <string name="prefs_category_details">Detalii</string>
 
 	<string name="sync_folder_failed_content">Sincronizarea dosarului %1$s nu a putut fi finalizată</string>

+ 0 - 4
src/main/res/values-ru/strings.xml

@@ -321,7 +321,6 @@
 
     <string name="placeholder_sentence">Это заполнитель</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filetype">Изображение PNG</string>
     <string name="placeholder_filesize">389 КБ</string>
     <string name="placeholder_timestamp">2012/05/18 12:23</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -343,7 +342,6 @@
     <string name="preview_image_error_no_local_file">Отсутствует локальный файл для создания миниатюры</string>
 
     <string name="error__upload__local_file_not_copied">%1$s невозможно скопировать в локальный каталог %2$s </string>
-    <string name="prefs_instant_upload_path_title">Каталог для немедленной выгрузки</string>
     <string name="prefs_synced_folders_local_path_title">Локальная папка</string>
     <string name="prefs_synced_folders_remote_path_title">Папка на сервере</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">Создавать вложенные папки</string>
@@ -439,10 +437,8 @@
     <string name="copy_file_error">Произошла ошибка при попытке копирования этого файла или каталога</string>
     <string name="forbidden_permissions_copy">для копирования этого файла</string>
 
-    <string name="prefs_category_instant_uploading">Немедленная выгрузка</string>
     <string name="prefs_category_details">Дополнительные</string>
 
-	<string name="prefs_instant_video_upload_path_title">Каталог для немедленной загрузки видео</string>
     <string name="sync_folder_failed_content">Синхронизация каталога %1$s не может быть завершена</string>
 
 	<string name="shared_subject_header">поделился</string>

+ 0 - 2
src/main/res/values-sk-rSK/strings.xml

@@ -243,7 +243,6 @@
 
     <string name="preview_image_description">Ukážka obrazu</string>
     <string name="error__upload__local_file_not_copied">%1$s nemožno skopírovať do lokálneho priečinka %2$s</string>
-    <string name="prefs_instant_upload_path_title">Priečinok pre okamžité nahratie</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">Použi podpriečinky</string>
     <string name="prefs_instant_upload_path_use_subfolders_summary">Ulož v podpriečinkoch podľa roku a mesiaca</string>
 
@@ -298,7 +297,6 @@
     <string name="copy_file_error">Počas kopírovania súboru alebo zložky sa vyskytla chyba</string>
     <string name="forbidden_permissions_copy">kopírovať súbor</string>
 
-    <string name="prefs_category_instant_uploading">Okamžité nahratia</string>
     <string name="prefs_category_details">Podrobnosti</string>
 
 	<string name="sync_folder_failed_content">Synchronizáciu priečinka %1$s nebolo možné dokončiť</string>

+ 0 - 4
src/main/res/values-sl/strings.xml

@@ -291,7 +291,6 @@
 
     <string name="placeholder_sentence">To je vsebnik predmetov</string>
     <string name="placeholder_filename">vsebnik.txt</string>
-    <string name="placeholder_filetype">PNG slika</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -311,7 +310,6 @@
     <string name="preview_image_description">Predogled slike</string>
     <string name="preview_image_error_unknown_format">Te slike ni mogoče prikazati</string>
     <string name="error__upload__local_file_not_copied">Datoteke %1$s ni mogoče kopirati v krajevno mapo %2$s</string>
-    <string name="prefs_instant_upload_path_title">Mapa za hipno nalaganje</string>
     <string name="prefs_synced_folders_local_path_title">Lokalna mapa</string>
     <string name="prefs_synced_folders_remote_path_title">Mapa na strežniku</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">Uporabi podmape</string>
@@ -405,10 +403,8 @@
     <string name="copy_file_error">Prišlo je do napake med kopiranjem datoteke v mapo</string>
     <string name="forbidden_permissions_copy">za kopiranje te datoteke</string>
 
-    <string name="prefs_category_instant_uploading">Hipno pošiljanje</string>
     <string name="prefs_category_details">Podrobnosti</string>
 
-	<string name="prefs_instant_video_upload_path_title">Mapa s posnetki za hipno nalaganje</string>
     <string name="sync_folder_failed_content">Usklajevanja mape %1$s ni mogoče zaključiti</string>
 
 	<string name="shared_subject_header">v souporabi</string>

+ 0 - 4
src/main/res/values-sq/strings.xml

@@ -317,7 +317,6 @@
 
     <string name="placeholder_sentence">Kjo është një vendmbajtëse</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filetype">Imazh PNG</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -339,7 +338,6 @@
     <string name="preview_image_error_no_local_file">Nuk ka skedar lokal për të shfaqur</string>
 
     <string name="error__upload__local_file_not_copied">%1$s s\’u kopjua dot te dosja vendore %2$s</string>
-    <string name="prefs_instant_upload_path_title">Dosja e ngarkimit të çastit </string>
     <string name="prefs_synced_folders_local_path_title">Dosje lokale</string>
     <string name="prefs_synced_folders_remote_path_title">Dosje remote</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">Përdorni nëndosjet</string>
@@ -435,10 +433,8 @@
     <string name="copy_file_error">Ndodhi një gabim teksa përpiqej të kopjohej ky skedar apo kjo dosje</string>
     <string name="forbidden_permissions_copy">për kopjim të kësaj kartele</string>
 
-    <string name="prefs_category_instant_uploading">Ngarkime të menjëhershme</string>
     <string name="prefs_category_details">Hollësi</string>
 
-	<string name="prefs_instant_video_upload_path_title">Dosja e ngarkimit të videove të çastit </string>
     <string name="sync_folder_failed_content">Sinkronizimi i i dosjes %1$s nuk u plotësua dot</string>
 
 	<string name="shared_subject_header">ndarë</string>

+ 0 - 4
src/main/res/values-sr/strings.xml

@@ -321,7 +321,6 @@
 
     <string name="placeholder_sentence">Ово је местодржач</string>
     <string name="placeholder_filename">чувамместо.txt</string>
-    <string name="placeholder_filetype">ПНГ слика</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 ПоП</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -343,7 +342,6 @@
     <string name="preview_image_error_no_local_file">Нема локалног фајла за преглед</string>
 
     <string name="error__upload__local_file_not_copied">%1$s се не може копирати у локалну фасциклу %2$s</string>
-    <string name="prefs_instant_upload_path_title">Фасцикла за брза отпремања</string>
     <string name="prefs_synced_folders_local_path_title">Локална фасцикла</string>
     <string name="prefs_synced_folders_remote_path_title">Удаљена фасцикла</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">Користи подфасцикле</string>
@@ -439,10 +437,8 @@
     <string name="copy_file_error">Грешка приликом копирања овог фајла или фасцикле</string>
     <string name="forbidden_permissions_copy">да копирате овај фајл</string>
 
-    <string name="prefs_category_instant_uploading">Брза отпремања</string>
     <string name="prefs_category_details">Подаци</string>
 
-	<string name="prefs_instant_video_upload_path_title">Фасцикла за видео записе за брзо отпремање</string>
     <string name="sync_folder_failed_content">Не могу да довршим синхронизацију фасцикле %1$s</string>
 
 	<string name="shared_subject_header">дељено</string>

+ 0 - 4
src/main/res/values-sv/strings.xml

@@ -292,7 +292,6 @@
 
     <string name="placeholder_sentence">Detta är en platshållare</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filetype">PNG-bild</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -314,7 +313,6 @@
     <string name="preview_image_error_no_local_file">Där finns ingen lokal fil att förhandsvisa</string>
 
     <string name="error__upload__local_file_not_copied">%1$s kunde inte kopieras till %2$s lokal mapp</string>
-    <string name="prefs_instant_upload_path_title">Sökväg för Automatisk uppladdning</string>
     <string name="prefs_synced_folders_local_path_title">Lokal mapp</string>
     <string name="prefs_synced_folders_remote_path_title">Extern mapp</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">Använd undermappar</string>
@@ -408,10 +406,8 @@
     <string name="copy_file_error">Ett fel uppstod, kunde inte kopiera filen eller mappen</string>
     <string name="forbidden_permissions_copy">att kopiera denna fil</string>
 
-    <string name="prefs_category_instant_uploading">Automatiska uppladdningar</string>
     <string name="prefs_category_details">Detaljer</string>
 
-	<string name="prefs_instant_video_upload_path_title">Videomapp för Automatisk uppladdning</string>
     <string name="sync_folder_failed_content">Synkronisering av %1$s mapp kunde inte slutföras</string>
 
 	<string name="shared_subject_header">delad</string>

+ 0 - 4
src/main/res/values-tr/strings.xml

@@ -322,7 +322,6 @@
 
     <string name="placeholder_sentence">Bu bir yer belirleyicidir</string>
     <string name="placeholder_filename">yerbelirleyici.txt</string>
-    <string name="placeholder_filetype">PNG Görseli</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 ÖS</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -344,7 +343,6 @@
     <string name="preview_image_error_no_local_file">Önizlenebilecek bir yerel dosya yok</string>
 
     <string name="error__upload__local_file_not_copied">%1$s, %2$s yerel klasörüne kopyalanamadı</string>
-    <string name="prefs_instant_upload_path_title">Anında yükleme klasörü</string>
     <string name="prefs_synced_folders_local_path_title">Yerel klasöre</string>
     <string name="prefs_synced_folders_remote_path_title">Uzak klasör</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">Alt klasörler kullanılsın</string>
@@ -440,10 +438,8 @@
     <string name="copy_file_error">Bu dosya ya da klasör kopyalanmaya çalışılırken bir sorun çıktı</string>
     <string name="forbidden_permissions_copy">bu dosyayı kopyalayın</string>
 
-    <string name="prefs_category_instant_uploading">Anında yüklemeler</string>
     <string name="prefs_category_details">Ayrıntılar</string>
 
-	<string name="prefs_instant_video_upload_path_title">Anında görüntü yükleme klasörü</string>
     <string name="sync_folder_failed_content">%1$s klasörünün eşitlemesi tamamlanamadı</string>
 
 	<string name="shared_subject_header">sizinle</string>

+ 0 - 4
src/main/res/values-zh-rCN/strings.xml

@@ -296,7 +296,6 @@
 
     <string name="placeholder_sentence">占位符</string>
     <string name="placeholder_filename">点位符.txt</string>
-    <string name="placeholder_filetype">PNG 图片</string>
     <string name="placeholder_filesize">389字节</string>
     <string name="placeholder_timestamp">2012/05/18 下午12:23 </string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -318,7 +317,6 @@
     <string name="preview_image_error_no_local_file">没有可预览的本地文件</string>
 
     <string name="error__upload__local_file_not_copied">无法复制 %1$s 到本地目录 %2$s</string>
-    <string name="prefs_instant_upload_path_title">实时上传文件夹</string>
     <string name="prefs_synced_folders_local_path_title">本地文件夹</string>
     <string name="prefs_synced_folders_remote_path_title">远端文件夹</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">使用子文件夹</string>
@@ -412,10 +410,8 @@
     <string name="copy_file_error">尝试复制这个文件或文件夹时发生了错误</string>
     <string name="forbidden_permissions_copy">复制这个文件</string>
 
-    <string name="prefs_category_instant_uploading">即时上传</string>
     <string name="prefs_category_details">详细信息</string>
 
-	<string name="prefs_instant_video_upload_path_title">用于即时上传的视频文件夹</string>
     <string name="sync_folder_failed_content"> %1$s同步未完成。</string>
 
 	<string name="shared_subject_header">已共享</string>

+ 0 - 4
src/main/res/values-zh-rTW/strings.xml

@@ -276,7 +276,6 @@
 
     <string name="placeholder_sentence">這是佔位內容</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filetype">PNG 圖檔</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -296,7 +295,6 @@
     <string name="preview_image_description">圖片預覽</string>
     <string name="preview_image_error_unknown_format">無法顯示圖像</string>
     <string name="error__upload__local_file_not_copied">%1$s 無法被複製到本地資料夾 %2$s</string>
-    <string name="prefs_instant_upload_path_title">即時上傳資料夾</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">使用子資料夾</string>
     <string name="prefs_instant_upload_path_use_subfolders_summary">依據年月存在子資料夾內</string>
 
@@ -389,10 +387,8 @@
     <string name="copy_file_error">嘗試複製檔案或資料夾時發生錯誤</string>
     <string name="forbidden_permissions_copy">複製這個檔案</string>
 
-    <string name="prefs_category_instant_uploading">即時上傳</string>
     <string name="prefs_category_details">詳細資料</string>
 
-	<string name="prefs_instant_video_upload_path_title">即時上傳的影片資料夾</string>
     <string name="sync_folder_failed_content">%1$s 資料夾的同步作業未完成</string>
 
 	<string name="shared_subject_header">已分享</string>

+ 0 - 1
src/main/res/values/dims.xml

@@ -60,7 +60,6 @@
     <dimen name="display_text_min_height">32dp</dimen>
     <dimen name="divider_height_independent">1dip</dimen>
     <dimen name="alternate_padding_independent">10dip</dimen>
-    <dimen name="standard_half_padding_independent">8dip</dimen>
     <dimen name="activity_row_layout_min_width_independent">196dip</dimen>
     <dimen name="user_icon_size_independent">40dip</dimen>
     <dimen name="drawer_header_text">14sp</dimen>

+ 0 - 4
src/main/res/values/strings.xml

@@ -330,7 +330,6 @@
 
     <string name="placeholder_sentence">This is a placeholder</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filetype">PNG image</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -352,7 +351,6 @@
     <string name="preview_image_error_no_local_file">There is no local file to preview</string>
 
     <string name="error__upload__local_file_not_copied">%1$s could not be copied to %2$s local folder</string>
-    <string name="prefs_instant_upload_path_title">Instant upload folder</string>
     <string name="prefs_synced_folders_local_path_title">Local folder</string>
     <string name="prefs_synced_folders_remote_path_title">Remote folder</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">Use subfolders</string>
@@ -448,10 +446,8 @@
     <string name="copy_file_error">An error occurred while trying to copy this file or folder</string>
     <string name="forbidden_permissions_copy">to copy this file</string>
 
-    <string name="prefs_category_instant_uploading">Instant uploads</string>
     <string name="prefs_category_details">Details</string>
 
-	<string name="prefs_instant_video_upload_path_title">Video folder for instant uploads</string>
     <string name="sync_folder_failed_content">Synchronization of %1$s folder could not be completed</string>
 
 	<string name="shared_subject_header">shared</string>