Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e56c006c authored by Brint E. Kriebel's avatar Brint E. Kriebel
Browse files

Merge branch 'cm-11.0' into stable/cm-11.0 

Conflicts:
	res/values-de/codeaurora_strings.xml
	res/values-fr/codeaurora_strings.xml
	res/values-lt/codeaurora_strings.xml

Change-Id: I0e79eeb4bd48a9ba9d36f8fe4fa17651822d442b
parents e8c335aa 0e166e36

gallerycommon/src/com/android/gallery3d/exif/ExifInterface.java

+9 −9
Original line number Diff line number Diff line
@@ -318,6 +318,13 @@ public class ExifInterface { 
    public static final int TAG_INTEROPERABILITY_INDEX =

        defineTag(IfdId.TYPE_IFD_INTEROPERABILITY, (short) 1);



    private static final String GPS_DATE_FORMAT_STR = "yyyy:MM:dd";

    private static final String DATETIME_FORMAT_STR = "yyyy:MM:dd kk:mm:ss";

    public static final DateFormat DATETIME_FORMAT = new SimpleDateFormat(DATETIME_FORMAT_STR);

    private final DateFormat mGPSDateStampFormat = new SimpleDateFormat(GPS_DATE_FORMAT_STR);

    private final Calendar mGPSTimeStampCalendar = Calendar

            .getInstance(TimeZone.getTimeZone("UTC"));



    /**

     * Tags that contain offset markers. These are included in the banned

     * defines.
@@ -1944,13 +1951,6 @@ public class ExifInterface { 
        return latLon;

    }



    private static final String GPS_DATE_FORMAT_STR = "yyyy:MM:dd";

    private static final String DATETIME_FORMAT_STR = "yyyy:MM:dd kk:mm:ss";

    private final DateFormat mDateTimeStampFormat = new SimpleDateFormat(DATETIME_FORMAT_STR);

    private final DateFormat mGPSDateStampFormat = new SimpleDateFormat(GPS_DATE_FORMAT_STR);

    private final Calendar mGPSTimeStampCalendar = Calendar

            .getInstance(TimeZone.getTimeZone("UTC"));



    /**

     * Creates, formats, and sets the DateTimeStamp tag for one of:

     * {@link #TAG_DATE_TIME}, {@link #TAG_DATE_TIME_DIGITIZED},
@@ -1964,8 +1964,8 @@ public class ExifInterface { 
    public boolean addDateTimeStampTag(int tagId, long timestamp, TimeZone timezone) {

        if (tagId == TAG_DATE_TIME || tagId == TAG_DATE_TIME_DIGITIZED

                || tagId == TAG_DATE_TIME_ORIGINAL) {

            mDateTimeStampFormat.setTimeZone(timezone);

            ExifTag t = buildTag(tagId, mDateTimeStampFormat.format(timestamp));

            DATETIME_FORMAT.setTimeZone(timezone);

            ExifTag t = buildTag(tagId, DATETIME_FORMAT.format(timestamp));

            if (t == null) {

                return false;

            }

gallerycommon/src/com/android/gallery3d/exif/ExifTag.java

+4 −6
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.gallery3d.exif;



import java.nio.charset.Charset;

import java.text.SimpleDateFormat;

import java.util.Arrays;

import java.util.Date;
@@ -102,8 +101,6 @@ public class ExifTag { 
    // Value offset in exif header.

    private int mOffset;



    private static final SimpleDateFormat TIME_FORMAT = new SimpleDateFormat("yyyy:MM:dd kk:mm:ss");



    /**

     * Returns true if the given IFD is a valid IFD.

     */
@@ -537,9 +534,10 @@ public class ExifTag { 
     * @return true on success

     */

    public boolean setTimeValue(long time) {

        // synchronized on TIME_FORMAT as SimpleDateFormat is not thread safe

        synchronized (TIME_FORMAT) {

            return setValue(TIME_FORMAT.format(new Date(time)));

        // synchronized on DATETIME_FORMAT as SimpleDateFormat is not thread

        // safe

        synchronized (ExifInterface.DATETIME_FORMAT) {

            return setValue(ExifInterface.DATETIME_FORMAT.format(new Date(time)));

        }

    }

res/values-ca/cm_strings.xml

0 → 100644
+20 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--Generated by crowdin.com-->

<!--

     Copyright (C) 2012-2014 The CyanogenMod Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

  <string name="record_time">Temps de gravació</string>

</resources>

res/values-cs/cm_strings.xml

0 → 100644
+20 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--Generated by crowdin.com-->

<!--

     Copyright (C) 2012-2014 The CyanogenMod Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

  <string name="record_time">Čas nahrávky</string>

</resources>

res/values-da/cm_strings.xml

0 → 100644
+20 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--Generated by crowdin.com-->

<!--

     Copyright (C) 2012-2014 The CyanogenMod Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

  <string name="record_time">Optagelsestidspunkt</string>

</resources>