mirror of
https://github.com/iSoron/uhabits.git
synced 2025-12-06 01:08:50 -06:00
Merge branch 'hotfix/1.6.2'
This commit is contained in:
@@ -21,8 +21,8 @@
|
||||
<manifest
|
||||
package="org.isoron.uhabits"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:versionCode="24"
|
||||
android:versionName="1.6.1">
|
||||
android:versionCode="25"
|
||||
android:versionName="1.6.2">
|
||||
|
||||
<uses-permission android:name="android.permission.VIBRATE"/>
|
||||
|
||||
|
||||
@@ -44,7 +44,7 @@ public class DateFormats
|
||||
{
|
||||
Locale locale = Locale.getDefault();
|
||||
|
||||
if (SDK_INT >= JELLY_BEAN)
|
||||
if (SDK_INT >= JELLY_BEAN_MR2)
|
||||
skeleton = getBestDateTimePattern(locale, skeleton);
|
||||
|
||||
return fromSkeleton(skeleton, locale);
|
||||
|
||||
Reference in New Issue
Block a user