Browse Source

gradle and dependency updates for android studio 3.2
remove deprecated tasker-related components

Andrew Dolgov 10 months ago
parent
commit
f569ea56b1
53 changed files with 13 additions and 1333 deletions
  1. 1 1
      build.gradle
  2. 2 2
      gradle/wrapper/gradle-wrapper.properties
  3. 9 10
      org.fox.ttrss/build.gradle
  4. 0 14
      org.fox.ttrss/src/main/AndroidManifest.xml
  5. 0 103
      org.fox.ttrss/src/main/java/org/fox/ttrss/tasker/TaskerReceiver.java
  6. 0 94
      org.fox.ttrss/src/main/java/org/fox/ttrss/tasker/TaskerSettingsActivity.java
  7. 0 1
      settings.gradle
  8. 0 22
      taskerlocaleapi/build.gradle
  9. 0 3
      taskerlocaleapi/lint.xml
  10. 0 13
      taskerlocaleapi/src/main/AndroidManifest.xml
  11. 0 90
      taskerlocaleapi/src/main/java/com/twofortyfouram/locale/BreadCrumber.java
  12. 0 48
      taskerlocaleapi/src/main/java/com/twofortyfouram/locale/Constants.java
  13. 0 195
      taskerlocaleapi/src/main/java/com/twofortyfouram/locale/Intent.java
  14. 0 123
      taskerlocaleapi/src/main/java/com/twofortyfouram/locale/PackageUtilities.java
  15. BIN
      taskerlocaleapi/src/main/res/drawable-hdpi-v14/twofortyfouram_locale_ic_menu_dontsave.png
  16. BIN
      taskerlocaleapi/src/main/res/drawable-hdpi-v14/twofortyfouram_locale_ic_menu_help.png
  17. BIN
      taskerlocaleapi/src/main/res/drawable-hdpi-v14/twofortyfouram_locale_ic_menu_save.png
  18. BIN
      taskerlocaleapi/src/main/res/drawable-ldpi-v14/twofortyfouram_locale_ic_menu_dontsave.png
  19. BIN
      taskerlocaleapi/src/main/res/drawable-ldpi-v14/twofortyfouram_locale_ic_menu_help.png
  20. BIN
      taskerlocaleapi/src/main/res/drawable-ldpi-v14/twofortyfouram_locale_ic_menu_save.png
  21. BIN
      taskerlocaleapi/src/main/res/drawable-mdpi-v14/twofortyfouram_locale_ic_menu_dontsave.png
  22. BIN
      taskerlocaleapi/src/main/res/drawable-mdpi-v14/twofortyfouram_locale_ic_menu_help.png
  23. BIN
      taskerlocaleapi/src/main/res/drawable-mdpi-v14/twofortyfouram_locale_ic_menu_save.png
  24. BIN
      taskerlocaleapi/src/main/res/drawable-xhdpi-v14/twofortyfouram_locale_ic_menu_dontsave.png
  25. BIN
      taskerlocaleapi/src/main/res/drawable-xhdpi-v14/twofortyfouram_locale_ic_menu_help.png
  26. BIN
      taskerlocaleapi/src/main/res/drawable-xhdpi-v14/twofortyfouram_locale_ic_menu_save.png
  27. 0 17
      taskerlocaleapi/src/main/res/drawable/twofortyfouram_locale_ic_menu_dontsave.xml
  28. 0 17
      taskerlocaleapi/src/main/res/drawable/twofortyfouram_locale_ic_menu_help.xml
  29. 0 17
      taskerlocaleapi/src/main/res/drawable/twofortyfouram_locale_ic_menu_save.xml
  30. 0 48
      taskerlocaleapi/src/main/res/menu/twofortyfouram_locale_help_save_dontsave.xml
  31. 0 23
      taskerlocaleapi/src/main/res/values-cs/strings-cs.xml
  32. 0 23
      taskerlocaleapi/src/main/res/values-de/strings-de.xml
  33. 0 23
      taskerlocaleapi/src/main/res/values-es/strings-es.xml
  34. 0 23
      taskerlocaleapi/src/main/res/values-fr/strings-fr.xml
  35. 0 19
      taskerlocaleapi/src/main/res/values-hdpi/integers.xml
  36. 0 23
      taskerlocaleapi/src/main/res/values-it/strings-it.xml
  37. 0 23
      taskerlocaleapi/src/main/res/values-ja/strings-ja.xml
  38. 0 23
      taskerlocaleapi/src/main/res/values-ko/strings-ko.xml
  39. 0 19
      taskerlocaleapi/src/main/res/values-ldpi/integers.xml
  40. 0 20
      taskerlocaleapi/src/main/res/values-mdpi/integers.xml
  41. 0 23
      taskerlocaleapi/src/main/res/values-nb/strings-nb.xml
  42. 0 23
      taskerlocaleapi/src/main/res/values-nl/strings-nl.xml
  43. 0 23
      taskerlocaleapi/src/main/res/values-pt-rBR/strings-pt-rBR.xml
  44. 0 23
      taskerlocaleapi/src/main/res/values-ru/strings-ru.xml
  45. 0 23
      taskerlocaleapi/src/main/res/values-sv/strings-sv.xml
  46. 0 23
      taskerlocaleapi/src/main/res/values-v11/styles.xml
  47. 0 23
      taskerlocaleapi/src/main/res/values-v14/styles.xml
  48. 0 26
      taskerlocaleapi/src/main/res/values-v9/styles.xml
  49. 0 23
      taskerlocaleapi/src/main/res/values-vi/strings-vi.xml
  50. 0 27
      taskerlocaleapi/src/main/res/values/id.xml
  51. 0 32
      taskerlocaleapi/src/main/res/values/strings-en.xml
  52. 0 26
      taskerlocaleapi/src/main/res/values/styles.xml
  53. 1 1
      tt-rss-android.iml

+ 1 - 1
build.gradle

@@ -5,7 +5,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.2.0'
     }
 }
 

+ 2 - 2
gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Sep 25 07:55:43 MSK 2018
+#Thu Sep 27 07:58:25 MSK 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

+ 9 - 10
org.fox.ttrss/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 27
-    buildToolsVersion "27.0.3"
+    buildToolsVersion "28.0.3"
 
     defaultConfig {
         applicationId "org.fox.ttrss"
@@ -47,9 +47,8 @@ android {
 }
 
 dependencies {
-    compile project(':taskerlocaleapi')
     compile files('libs/dashclock-api-r1.1.jar')
-    compile 'com.squareup.okhttp3:okhttp:3.8.0'
+    compile 'com.squareup.okhttp3:okhttp:3.10.0'
     compile('com.github.bumptech.glide:okhttp3-integration:1.5.0') {
         exclude group: 'glide-parent'
     }
@@ -57,13 +56,13 @@ dependencies {
     compile 'com.bogdwellers:pinchtozoom:0.1'
     compile 'com.github.bumptech.glide:glide:3.8.0'
     compile 'jp.wasabeef:glide-transformations:2.0.2'
-    compile 'com.android.support:recyclerview-v7:27.1.0'
-    compile 'com.android.support:cardview-v7:27.1.0'
-    compile 'com.android.support:support-v4:27.1.0'
-    compile 'com.android.support:appcompat-v7:27.1.0'
-    compile 'com.android.support:customtabs:27.1.0'
-    compile 'com.android.support:design:27.1.0'
-    compile 'com.google.code.gson:gson:2.8.0'
+    compile 'com.android.support:recyclerview-v7:27.1.1'
+    compile 'com.android.support:cardview-v7:27.1.1'
+    compile 'com.android.support:support-v4:27.1.1'
+    compile 'com.android.support:appcompat-v7:27.1.1'
+    compile 'com.android.support:customtabs:27.1.1'
+    compile 'com.android.support:design:27.1.1'
+    compile 'com.google.code.gson:gson:2.8.2'
     compile 'com.shamanland:fab:0.0.8'
     compile 'ch.acra:acra:4.9.1'
     compile 'com.ToxicBakery.viewpager.transforms:view-pager-transforms:[email protected]'

+ 0 - 14
org.fox.ttrss/src/main/AndroidManifest.xml

@@ -69,13 +69,6 @@
             android:name=".LogcatActivity"
             android:label="@string/logcat_title" >
         </activity>
-        <activity
-            android:name=".tasker.TaskerSettingsActivity"
-            android:label="@string/app_name" >
-            <intent-filter>
-                <action android:name="com.twofortyfouram.locale.intent.action.EDIT_SETTING" />
-            </intent-filter>
-        </activity>
         <activity
             android:name=".offline.OfflineActivity"
             android:label="@string/app_name" >
@@ -223,13 +216,6 @@
             </intent-filter>
         </receiver>
 
-        <receiver android:name=".tasker.TaskerReceiver" >
-            <intent-filter>
-                <action android:name="com.twofortyfouram.locale.intent.action.QUERY_CONDITION" />
-                <action android:name="com.twofortyfouram.locale.intent.action.FIRE_SETTING" />
-            </intent-filter>
-        </receiver>
-
         <receiver android:name=".widget.SmallWidgetProvider" >
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />

+ 0 - 103
org.fox.ttrss/src/main/java/org/fox/ttrss/tasker/TaskerReceiver.java

@@ -1,103 +0,0 @@
-package org.fox.ttrss.tasker;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.os.Build;
-import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.util.Log;
-import android.widget.Toast;
-
-import org.fox.ttrss.ApiCommon;
-import org.fox.ttrss.ApiRequest;
-import org.fox.ttrss.offline.OfflineDownloadService;
-import org.fox.ttrss.offline.OfflineUploadService;
-import org.fox.ttrss.util.SimpleLoginManager;
-
-public class TaskerReceiver extends BroadcastReceiver {
-	private final String TAG = this.getClass().getSimpleName();
-
-	@Override
-	public void onReceive(Context context, Intent intent) {
-		Log.d(TAG, "Got action: " + intent.getAction());
-		
-		final Context fContext = context;
-		
-		if (com.twofortyfouram.locale.Intent.ACTION_FIRE_SETTING.equals(intent.getAction())) {
-			
-			final Bundle settings = intent.getBundleExtra(com.twofortyfouram.locale.Intent.EXTRA_BUNDLE);
-			final int actionId = settings != null ? settings.getInt("actionId", -1) : -1;
-			
-			Log.d(TAG, "received action id=" + actionId);
-			
-			SimpleLoginManager loginMgr = new SimpleLoginManager() {
-				
-				@Override
-				protected void onLoginSuccess(int requestId, String sessionId, int apiLevel) {
-
-					switch (actionId) {
-					case TaskerSettingsActivity.ACTION_DOWNLOAD:
-						if (true) {
-							Intent intent = new Intent(fContext,
-									OfflineDownloadService.class);
-							intent.putExtra("sessionId", sessionId);
-							intent.putExtra("batchMode", true);
-
-							if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-								fContext.startForegroundService(intent);
-							} else {
-								fContext.startService(intent);
-							}
-						}
-						break;
-					case TaskerSettingsActivity.ACTION_UPLOAD:
-						if (true) {
-							Intent intent = new Intent(fContext,
-									OfflineUploadService.class);
-							intent.putExtra("sessionId", sessionId);
-							intent.putExtra("batchMode", true);
-
-							if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-								fContext.startForegroundService(intent);
-							} else {
-								fContext.startService(intent);
-							}
-
-						}						
-						break;
-					default:
-						Log.d(TAG, "unknown action id=" + actionId);
-					}					
-				}
-				
-				@Override
-				protected void onLoginFailed(int requestId, ApiRequest ar) {
-					Toast toast = Toast.makeText(fContext, fContext.getString(ar.getErrorMessage()), Toast.LENGTH_SHORT);
-					toast.show();
-				}
-				
-				@Override
-				protected void onLoggingIn(int requestId) {
-					//
-				}
-			};
-			
-			SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-			
-			String login = prefs.getString("login", "").trim();
-			String password = prefs.getString("password", "").trim();
-			String ttrssUrl = prefs.getString("ttrss_url", "").trim();
-			ApiCommon.trustAllHosts(prefs.getBoolean("ssl_trust_any", false), prefs.getBoolean("ssl_trust_any_host", false));
-			
-			if (ttrssUrl.equals("")) {
-				Toast toast = Toast.makeText(fContext, "Could not download articles: not configured?", Toast.LENGTH_SHORT);
-				toast.show();
-			} else {				
-				loginMgr.logIn(context, 1, login, password);
-			}			
-		}
-	}
-
-}

+ 0 - 94
org.fox.ttrss/src/main/java/org/fox/ttrss/tasker/TaskerSettingsActivity.java

@@ -1,94 +0,0 @@
-package org.fox.ttrss.tasker;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.RadioGroup;
-import android.widget.RadioGroup.OnCheckedChangeListener;
-
-import org.fox.ttrss.R;
-
-public class TaskerSettingsActivity extends Activity {
-	protected static final int ACTION_DOWNLOAD = 0;
-	protected static final int ACTION_UPLOAD = 1;
-
-	private final String TAG = this.getClass().getSimpleName();
-	
-	protected Bundle m_settings = new Bundle();
-	
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-	
-		Bundle settings = getIntent().getBundleExtra(com.twofortyfouram.locale.Intent.EXTRA_BUNDLE);
-		
-		int actionId = settings != null ? settings.getInt("actionId", -1) : -1;
-		
-		setContentView(R.layout.activity_tasker_settings);
-
-		RadioGroup radioGroup = (RadioGroup) findViewById(R.id.taskerActions);
-		
-		switch (actionId) {
-		case TaskerSettingsActivity.ACTION_DOWNLOAD:
-			radioGroup.check(R.id.actionDownload);
-			break;
-		case TaskerSettingsActivity.ACTION_UPLOAD:
-			radioGroup.check(R.id.actionUpload);
-			break;
-		default:
-			Log.d(TAG, "unknown action id=" + actionId);
-		}
-		
-		radioGroup.setOnCheckedChangeListener(new OnCheckedChangeListener() {			
-			@Override
-			public void onCheckedChanged(RadioGroup group, int checkedId) {
-				switch (checkedId) {
-				case R.id.actionDownload:
-					m_settings.putInt("actionId", ACTION_DOWNLOAD);					
-					break;
-				case R.id.actionUpload:
-					m_settings.putInt("actionId", ACTION_UPLOAD);
-					break;
-				}				
-			}
-		});
-		
-		Button button = (Button)findViewById(R.id.close_button);
-		
-		button.setOnClickListener(new OnClickListener() {			
-			@Override
-			public void onClick(View v) {
-				finish();				
-			}
-		});
-	}
-	
-	@Override
-    public void finish() {
-		final Intent intent = new Intent();
-
-		intent.putExtra(com.twofortyfouram.locale.Intent.EXTRA_BUNDLE, m_settings);
-		
-		String blurb = "?";
-		
-		switch (m_settings.getInt("actionId")) {
-		case TaskerSettingsActivity.ACTION_DOWNLOAD:
-			blurb = getString(R.string.download_articles_and_go_offline);
-			break;
-		case TaskerSettingsActivity.ACTION_UPLOAD:
-			blurb = getString(R.string.synchronize_read_articles_and_go_online);
-			break;
-		}
-		
-		intent.putExtra(com.twofortyfouram.locale.Intent.EXTRA_STRING_BLURB, blurb);
-		
-		setResult(RESULT_OK, intent);
-		
-		super.finish();
-	
-	}
-}

+ 0 - 1
settings.gradle

@@ -1,2 +1 @@
-include ':taskerlocaleapi'
 include ':org.fox.ttrss'

+ 0 - 22
taskerlocaleapi/build.gradle

@@ -1,22 +0,0 @@
-apply plugin: 'com.android.library'
-
-android {
-    compileSdkVersion 19
-    buildToolsVersion '25.0.0'
-
-    defaultConfig {
-        minSdkVersion 3
-        targetSdkVersion 17
-    }
-
-    lintOptions {
-         abortOnError false
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled  false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
-        }
-    }
-}

+ 0 - 3
taskerlocaleapi/lint.xml

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<lint>
-</lint>

+ 0 - 13
taskerlocaleapi/src/main/AndroidManifest.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.twofortyfouram.locale.api" >
-
-    <uses-sdk
-        android:minSdkVersion="3"
-        android:targetSdkVersion="17" />
-
-    <uses-feature
-        android:name="android.hardware.touchscreen"
-        android:required="false" />
-
-</manifest>

+ 0 - 90
taskerlocaleapi/src/main/java/com/twofortyfouram/locale/BreadCrumber.java

@@ -1,90 +0,0 @@
-/*
- * Copyright 2013 two forty four a.m. LLC <http://www.twofortyfouram.com>
- *
- * 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.
- */
-
-package com.twofortyfouram.locale;
-
-import android.content.Context;
-import android.content.Intent;
-import android.util.Log;
-
-import com.twofortyfouram.locale.api.R;
-
-/**
- * Utility class to generate a breadcrumb title string for {@code Activity} instances in Locale.
- * <p>
- * This class cannot be instantiated.
- */
-public final class BreadCrumber
-{
-    /**
-     * Static helper method to generate bread crumbs. Bread crumb strings will be properly formatted for the
-     * current language, including right-to-left languages, as long as the proper
-     * {@link com.twofortyfouram.locale.platform.R.string#twofortyfouram_locale_breadcrumb_format} string
-     * resources have been created.
-     *
-     * @param context {@code Context} for loading platform resources. Cannot be null.
-     * @param intent {@code Intent} to extract the bread crumb from.
-     * @param currentCrumb The last element of the bread crumb path.
-     * @return {@code String} presentation of the bread crumb. If the intent parameter is null, then this
-     *         method returns currentCrumb. If currentCrumb is null, then this method returns the empty string
-     *         "". If intent contains a private Serializable instances as an extra, then this method returns
-     *         the empty string "".
-     * @throws IllegalArgumentException if {@code context} is null.
-     */
-    public static CharSequence generateBreadcrumb(final Context context, final Intent intent,
-                                                  final String currentCrumb)
-    {
-        if (null == context)
-        {
-            throw new IllegalArgumentException("context cannot be null"); //$NON-NLS-1$
-        }
-
-        try
-        {
-            if (null == currentCrumb)
-            {
-                Log.w(Constants.LOG_TAG, "currentCrumb cannot be null"); //$NON-NLS-1$
-                return ""; //$NON-NLS-1$
-            }
-            if (null == intent)
-            {
-                Log.w(Constants.LOG_TAG, "intent cannot be null"); //$NON-NLS-1$
-                return currentCrumb;
-            }
-
-            /*
-             * Note: this is vulnerable to a private serializable attack, but the try-catch will solve that.
-             */
-            final String breadcrumbString = intent.getStringExtra(com.twofortyfouram.locale.Intent.EXTRA_STRING_BREADCRUMB);
-            if (null != breadcrumbString)
-            {
-                return context.getString(R.string.twofortyfouram_locale_breadcrumb_format, breadcrumbString, context.getString(R.string.twofortyfouram_locale_breadcrumb_separator), currentCrumb);
-            }
-            return currentCrumb;
-        }
-        catch (final Exception e)
-        {
-            Log.e(Constants.LOG_TAG, "Encountered error generating breadcrumb", e); //$NON-NLS-1$
-            return ""; //$NON-NLS-1$
-        }
-    }
-
-    /**
-     * Private constructor prevents instantiation.
-     *
-     * @throws UnsupportedOperationException because this class cannot be instantiated.
-     */
-    private BreadCrumber()
-    {
-        throw new UnsupportedOperationException("This class is non-instantiable"); //$NON-NLS-1$
-    }
-}

+ 0 - 48
taskerlocaleapi/src/main/java/com/twofortyfouram/locale/Constants.java

@@ -1,48 +0,0 @@
-/*
- * Copyright 2013 two forty four a.m. LLC <http://www.twofortyfouram.com>
- * 
- * 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.
- */
-
-package com.twofortyfouram.locale;
-
-/**
- * Utility class containing constants for the Locale Developer Platform.
- */
-/*
- * This class is NOT part of the public API.
- */
-/* package */final class Constants
-{
-    /**
-     * Log tag for logcat messages generated by the Locale Developer Platform
-     */
-    /*
-     * This is NOT a public API. Third party apps should NOT use this log tag for their own log messages.
-     */
-    /* package */static final String LOG_TAG = "LocaleApiLibrary"; //$NON-NLS-1$
-
-    /**
-     * String package name for Locale.
-     */
-    /*
-     * This is NOT a public API. Third parties should NOT rely on this being the only package name for Locale.
-     */
-    /* package */static final String LOCALE_PACKAGE = "com.twofortyfouram.locale"; //$NON-NLS-1$
-
-    /**
-     * Private constructor prevents instantiation
-     * 
-     * @throws UnsupportedOperationException because this class cannot be instantiated.
-     */
-    private Constants()
-    {
-        throw new UnsupportedOperationException("This class is non-instantiable"); //$NON-NLS-1$
-    }
-}

+ 0 - 195
taskerlocaleapi/src/main/java/com/twofortyfouram/locale/Intent.java

@@ -1,195 +0,0 @@
-/*
- * Copyright 2013 two forty four a.m. LLC <http://www.twofortyfouram.com>
- * 
- * 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.
- */
-
-package com.twofortyfouram.locale;
-
-import android.os.Parcelable;
-
-/**
- * Contains Intent constants necessary for interacting with the Locale Developer Platform.
- */
-public final class Intent
-{
-    /**
-     * Private constructor prevents instantiation.
-     * 
-     * @throws UnsupportedOperationException because this class cannot be instantiated.
-     */
-    private Intent()
-    {
-        throw new UnsupportedOperationException("This class is non-instantiable"); //$NON-NLS-1$
-    }
-
-    /**
-     * Ordered broadcast result code indicating that a plug-in condition's state is satisfied (true).
-     * 
-     * @see Intent#ACTION_QUERY_CONDITION
-     */
-    public static final int RESULT_CONDITION_SATISFIED = 16;
-
-    /**
-     * Ordered broadcast result code indicating that a plug-in condition's state is not satisfied (false).
-     * 
-     * @see Intent#ACTION_QUERY_CONDITION
-     */
-    public static final int RESULT_CONDITION_UNSATISFIED = 17;
-
-    /**
-     * Ordered broadcast result code indicating that a plug-in condition's state is unknown (neither true nor
-     * false).
-     * <p>
-     * If a condition returns UNKNOWN, then Locale will use the last known return value on a best-effort
-     * basis. Best-effort means that Locale may not persist known values forever (e.g. last known values could
-     * hypothetically be cleared after a device reboot or a restart of the Locale process. If
-     * there is no last known return value, then unknown is treated as not satisfied (false).
-     * <p>
-     * The purpose of an UNKNOWN result is to allow a plug-in condition more than 10 seconds to process a
-     * requery. A {@code BroadcastReceiver} must return within 10 seconds, otherwise it will be killed by
-     * Android. A plug-in that needs more than 10 seconds might initially return
-     * {@link #RESULT_CONDITION_UNKNOWN}, subsequently request a requery, and then return either
-     * {@link #RESULT_CONDITION_SATISFIED} or {@link #RESULT_CONDITION_UNSATISFIED}.
-     * 
-     * @see Intent#ACTION_QUERY_CONDITION
-     */
-    public static final int RESULT_CONDITION_UNKNOWN = 18;
-
-    /**
-     * {@code Intent} action {@code String} broadcast by Locale to create or edit a plug-in setting. When
-     * Locale broadcasts this {@code Intent}, it will be sent directly to the package and class of the
-     * plug-in's {@code Activity}. The {@code Intent} may contain a {@link #EXTRA_BUNDLE} that was previously
-     * set by the {@code Activity} result of {@link #ACTION_EDIT_SETTING}.
-     * <p>
-     * There SHOULD be only one {@code Activity} per APK that implements this {@code Intent}. If a single APK
-     * wishes to export multiple plug-ins, it MAY implement multiple Activity instances that implement this
-     * {@code Intent}, however there must only be a single {@link #ACTION_FIRE_SETTING} receiver. In this
-     * scenario, it is the responsibility of the Activities to store enough data in {@link #EXTRA_BUNDLE} to
-     * allow this receiver to disambiguate which "plug-in" is being fired. To avoid user confusion, it is
-     * recommended that only a single plug-in be implemented per APK.
-     * 
-     * @see Intent#EXTRA_BUNDLE
-     * @see Intent#EXTRA_STRING_BREADCRUMB
-     */
-    public static final String ACTION_EDIT_SETTING = "com.twofortyfouram.locale.intent.action.EDIT_SETTING"; //$NON-NLS-1$
-
-    /**
-     * {@code Intent} action {@code String} broadcast by Locale to fire a plug-in setting. When Locale
-     * broadcasts this {@code Intent}, it will be sent directly to the package and class of the plug-in's
-     * {@code BroadcastReceiver}. The {@code Intent} will contain a {@link #EXTRA_BUNDLE} that was previously
-     * set by the {@code Activity} result of {@link #ACTION_EDIT_SETTING}.
-     * <p>
-     * There MUST be only one {@code BroadcastReceiver} per APK that implements this {@code Intent}.
-     * 
-     * @see Intent#EXTRA_BUNDLE
-     */
-    public static final String ACTION_FIRE_SETTING = "com.twofortyfouram.locale.intent.action.FIRE_SETTING"; //$NON-NLS-1$
-
-    /**
-     * {@code Intent} action {@code String} broadcast by Locale to create or edit a plug-in condition. When
-     * Locale broadcasts this {@code Intent}, it will be sent directly to the package and class of the
-     * plug-in's {@code Activity}. The {@code Intent} may contain a store-and-forward {@link #EXTRA_BUNDLE}
-     * that was previously set by the {@code Activity} result of {@link #ACTION_EDIT_CONDITION}.
-     * <p>
-     * There SHOULD be only one {@code Activity} per APK that implements this {@code Intent}. If a single APK
-     * wishes to export multiple plug-ins, it MAY implement multiple Activity instances that implement this
-     * {@code Intent}, however there must only be a single {@link #ACTION_QUERY_CONDITION} receiver. In this
-     * scenario, it is the responsibility of the Activities to store enough data in {@link #EXTRA_BUNDLE} to
-     * allow this receiver to disambiguate which "plug-in" is being queried. To avoid user confusion, it is
-     * recommended that only a single plug-in be implemented per APK.
-     * 
-     * @see Intent#EXTRA_BUNDLE
-     * @see Intent#EXTRA_STRING_BREADCRUMB
-     */
-    public static final String ACTION_EDIT_CONDITION = "com.twofortyfouram.locale.intent.action.EDIT_CONDITION"; //$NON-NLS-1$
-
-    /**
-     * Ordered {@code Intent} action {@code String} broadcast by Locale to query a plug-in condition. When
-     * Locale broadcasts this {@code Intent}, it will be sent directly to the package and class of the
-     * plug-in's {@code BroadcastReceiver}. The {@code Intent} will contain a {@link #EXTRA_BUNDLE} that was
-     * previously set by the {@code Activity} result of {@link #ACTION_EDIT_CONDITION}.
-     * <p>
-     * Since this is an ordered broadcast, the receiver is expected to set an appropriate result code from
-     * {@link #RESULT_CONDITION_SATISFIED}, {@link #RESULT_CONDITION_UNSATISFIED}, and
-     * {@link #RESULT_CONDITION_UNKNOWN}.
-     * <p>
-     * There MUST be only one {@code BroadcastReceiver} per APK that implements this {@code Intent}.
-     * 
-     * @see Intent#EXTRA_BUNDLE
-     * @see Intent#RESULT_CONDITION_SATISFIED
-     * @see Intent#RESULT_CONDITION_UNSATISFIED
-     * @see Intent#RESULT_CONDITION_UNKNOWN
-     */
-    public static final String ACTION_QUERY_CONDITION = "com.twofortyfouram.locale.intent.action.QUERY_CONDITION"; //$NON-NLS-1$
-
-    /**
-     * {@code Intent} action {@code String} to notify Locale that a plug-in condition is requesting that
-     * Locale query it via {@link #ACTION_QUERY_CONDITION}. This merely serves as a hint to Locale that a
-     * condition wants to be queried. There is no guarantee as to when or if the plug-in will be queried after
-     * this {@code Intent} is broadcast. If Locale does not respond to the plug-in condition after a
-     * {@link #ACTION_REQUEST_QUERY} Intent is sent, the plug-in SHOULD shut itself down and stop requesting
-     * requeries. A lack of response from Locale indicates that Locale is not currently interested in this
-     * plug-in. When Locale becomes interested in the plug-in again, Locale will send
-     * {@link #ACTION_QUERY_CONDITION}.
-     * <p>
-     * The extra {@link #EXTRA_ACTIVITY} MUST be included, otherwise Locale will ignore this {@code Intent}.
-     * <p>
-     * Plug-in conditions SHOULD NOT use this unless there is some sort of asynchronous event that has
-     * occurred, such as a broadcast {@code Intent} being received by the plug-in. Plug-ins SHOULD NOT
-     * periodically request a requery as a way of implementing polling behavior.
-     * 
-     * @see Intent#EXTRA_ACTIVITY
-     */
-    public static final String ACTION_REQUEST_QUERY = "com.twofortyfouram.locale.intent.action.REQUEST_QUERY"; //$NON-NLS-1$
-
-    /**
-     * Type: {@code String}.
-     * <p>
-     * Maps to a {@code String} that represents the {@code Activity} bread crumb path.
-     * 
-     * @see BreadCrumber
-     */
-    public static final String EXTRA_STRING_BREADCRUMB = "com.twofortyfouram.locale.intent.extra.BREADCRUMB"; //$NON-NLS-1$
-
-    /**
-     * Type: {@code String}.
-     * <p>
-     * Maps to a {@code String} that represents a blurb. This is returned as an {@code Activity} result extra
-     * from {@link #ACTION_EDIT_CONDITION} or {@link #ACTION_EDIT_SETTING}.
-     * <p>
-     * The blurb is a concise description displayed to the user of what the plug-in is configured to do.
-     */
-    public static final String EXTRA_STRING_BLURB = "com.twofortyfouram.locale.intent.extra.BLURB"; //$NON-NLS-1$
-
-    /**
-     * Type: {@code Bundle}.
-     * <p>
-     * Maps to a {@code Bundle} that contains all of a plug-in's extras.
-     * <p>
-     * Plug-ins MUST NOT store {@link Parcelable} objects in this {@code Bundle}, because {@code Parcelable}
-     * is not a long-term storage format. Also, plug-ins MUST NOT store any serializable object that is not
-     * exposed by the Android SDK.
-     * <p>
-     * The maximum size of a Bundle that can be sent across process boundaries is on the order of 500
-     * kilobytes (base-10), while Locale further limits plug-in Bundles to about 100 kilobytes (base-10).
-     * Although the maximum size is about 100 kilobytes, plug-ins SHOULD keep Bundles much smaller for
-     * performance and memory usage reasons.
-     */
-    public static final String EXTRA_BUNDLE = "com.twofortyfouram.locale.intent.extra.BUNDLE"; //$NON-NLS-1$
-
-    /**
-     * Type: {@code String}.
-     * <p>
-     * Maps to a {@code String} that represents the name of a plug-in's {@code Activity}.
-     * 
-     * @see Intent#ACTION_REQUEST_QUERY
-     */
-    public static final String EXTRA_ACTIVITY = "com.twofortyfouram.locale.intent.extra.ACTIVITY"; //$NON-NLS-1$
-}

+ 0 - 123
taskerlocaleapi/src/main/java/com/twofortyfouram/locale/PackageUtilities.java

@@ -1,123 +0,0 @@
-/*
- * Copyright 2013 two forty four a.m. LLC <http://www.twofortyfouram.com>
- * 
- * 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.
- */
-
-package com.twofortyfouram.locale;
-
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-/**
- * A simple utility class to find a package that is compatible with hosting the Locale Developer Platform.
- */
-/*
- * This class is NOT part of the public Locale Developer Platform API
- */
-public final class PackageUtilities
-{
-    /**
-     * A hard-coded set of Android packages that support the Locale Developer Platform.
-     */
-    /*
-     * This is NOT a public field and is subject to change in future releases of the Developer Platform. A
-     * conscious design decision was made to use hard-coded package names, rather than dynamic discovery of
-     * packages that might be compatible with hosting the Locale Developer Platform API. This is for two
-     * reasons: to ensure the host is implemented correctly (hosts must pass the extensive Locale Platform
-     * Host compatibility test suite) and to prevent malicious applications from crashing plug-ins by
-     * providing bad values. As additional apps implement the Locale Developer Platform, their package names
-     * will also be added to this list.
-     */
-    /*
-     * Note: this is implemented as a Set<String> rather than a String[], in order to enforce immutability.
-     */
-    private static final Set<String> COMPATIBLE_PACKAGES = constructPackageSet();
-
-    /**
-     * @return a list wrapped in {@link Collections#unmodifiableList(List)} that represents the set of
-     *         Locale-compatible packages.
-     */
-    private static Set<String> constructPackageSet()
-    {
-        final HashSet<String> packages = new HashSet<String>();
-
-        packages.add(Constants.LOCALE_PACKAGE);
-
-        /*
-         * Note: Tasker is not 100% compatible with Locale's plug-in API, but it is close enough that these
-         * packages are enabled. Tasker's known incompatibilities are documented on the Tasker website.
-         */
-        packages.add("net.dinglisch.android.taskerm"); //$NON-NLS-1$
-        packages.add("net.dinglisch.android.tasker"); //$NON-NLS-1$
-        packages.add("net.dinglisch.android.taskercupcake"); //$NON-NLS-1$
-
-        return Collections.unmodifiableSet(packages);
-    }
-
-    /**
-     * Obtains the {@code String} package name of a currently-installed package which implements the host
-     * component of the Locale Developer Platform.
-     * <p>
-     * Note: A TOCTOU error exists, due to the fact that the package could be uninstalled at any time.
-     * <p>
-     * Note: If there are multiple hosts, this method will return one of them. The interface of this method
-     * makes no guarantee which host will returned, nor whether that host will be consistently returned.
-     * 
-     * @param manager an instance of {@code PackageManager}. Cannot be null.
-     * @param packageHint hint as to which package should take precedence. This parameter may be null.
-     * @return {@code String} package name of a host for the Locale Developer Platform, such as
-     *         "com.twofortyfouram.locale". If no such package is found, returns null.
-     */
-    public static String getCompatiblePackage(final PackageManager manager, final String packageHint)
-    {
-        /*
-         * The interface for this method makes no guarantees as to which host will be returned. However the
-         * implementation is more predictable.
-         */
-
-        final List<PackageInfo> installedPackages = manager.getInstalledPackages(0);
-
-        if (COMPATIBLE_PACKAGES.contains(packageHint))
-        {
-            for (final PackageInfo packageInfo : installedPackages)
-            {
-                final String temp = packageInfo.packageName;
-                if (packageHint.equals(temp))
-                {
-                    return temp;
-                }
-            }
-        }
-
-        for (final String compatiblePackageName : COMPATIBLE_PACKAGES)
-        {
-            if (compatiblePackageName.equals(packageHint))
-            {
-                continue;
-            }
-
-            for (final PackageInfo packageInfo : installedPackages)
-            {
-                final String temp = packageInfo.packageName;
-                if (compatiblePackageName.equals(temp))
-                {
-                    return temp;
-                }
-            }
-        }
-
-        return null;
-    }
-}

BIN
taskerlocaleapi/src/main/res/drawable-hdpi-v14/twofortyfouram_locale_ic_menu_dontsave.png


BIN
taskerlocaleapi/src/main/res/drawable-hdpi-v14/twofortyfouram_locale_ic_menu_help.png


BIN
taskerlocaleapi/src/main/res/drawable-hdpi-v14/twofortyfouram_locale_ic_menu_save.png


BIN
taskerlocaleapi/src/main/res/drawable-ldpi-v14/twofortyfouram_locale_ic_menu_dontsave.png


BIN
taskerlocaleapi/src/main/res/drawable-ldpi-v14/twofortyfouram_locale_ic_menu_help.png


BIN
taskerlocaleapi/src/main/res/drawable-ldpi-v14/twofortyfouram_locale_ic_menu_save.png


BIN
taskerlocaleapi/src/main/res/drawable-mdpi-v14/twofortyfouram_locale_ic_menu_dontsave.png


BIN
taskerlocaleapi/src/main/res/drawable-mdpi-v14/twofortyfouram_locale_ic_menu_help.png


BIN
taskerlocaleapi/src/main/res/drawable-mdpi-v14/twofortyfouram_locale_ic_menu_save.png


BIN
taskerlocaleapi/src/main/res/drawable-xhdpi-v14/twofortyfouram_locale_ic_menu_dontsave.png


BIN
taskerlocaleapi/src/main/res/drawable-xhdpi-v14/twofortyfouram_locale_ic_menu_help.png


BIN
taskerlocaleapi/src/main/res/drawable-xhdpi-v14/twofortyfouram_locale_ic_menu_save.png


+ 0 - 17
taskerlocaleapi/src/main/res/drawable/twofortyfouram_locale_ic_menu_dontsave.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-** Copyright 2013 two forty four a.m. LLC <http://www.twofortyfouram.com>
-**
-** 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. 
--->
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@android:drawable/ic_menu_close_clear_cancel" />

+ 0 - 17
taskerlocaleapi/src/main/res/drawable/twofortyfouram_locale_ic_menu_help.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-** Copyright 2013 two forty four a.m. LLC <http://www.twofortyfouram.com>
-**
-** 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. 
--->
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@android:drawable/ic_menu_help" />

+ 0 - 17
taskerlocaleapi/src/main/res/drawable/twofortyfouram_locale_ic_menu_save.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-** Copyright 2013 two forty four a.m. LLC <http://www.twofortyfouram.com>
-**
-** 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. 
--->
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@android:drawable/ic_menu_save" />

+ 0 - 48
taskerlocaleapi/src/main/res/menu/twofortyfouram_locale_help_save_dontsave.xml

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-** Copyright 2013 two forty four a.m. LLC <http://www.twofortyfouram.com>
-**
-** 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.
--->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:ignore="UnusedResources" >
-
-    <!-- Menu item to cancel the result. This should set the Activity result to RESULT_CANCELED and immediately finish the Activity. -->
-
-    <item
-        android:id="@id/twofortyfouram_locale_menu_dontsave"
-        android:icon="@drawable/twofortyfouram_locale_ic_menu_dontsave"
-        android:showAsAction="ifRoom|withText"
-        android:title="@string/twofortyfouram_locale_menu_dontsave"/>
-
-    <!--
-         Menu item to save the result. This should set the Activity result to RESULT_OK, with proper blurb and bundle extras, 
-        and immediately finish the Activity.
-    -->
-
-    <item
-        android:id="@id/twofortyfouram_locale_menu_save"
-        android:icon="@drawable/twofortyfouram_locale_ic_menu_save"
-        android:showAsAction="ifRoom|withText"
-        android:title="@string/twofortyfouram_locale_menu_save"/>
-
-    <!-- Menu item to launch the Help. It should launch the web browser using ACTION_VIEW with the data set to a URL. -->
-
-    <item
-        android:id="@id/twofortyfouram_locale_menu_help"
-        android:icon="@drawable/twofortyfouram_locale_ic_menu_help"
-        android:showAsAction="never"
-        android:title="@string/twofortyfouram_locale_menu_help"
-        android:visible="false"/>
-
-</menu>

+ 0 - 23
taskerlocaleapi/src/main/res/values-cs/strings-cs.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-** Copyright 2013 two forty four a.m. LLC <http://www.twofortyfouram.com>
-**
-** 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>
-
-    <string name="twofortyfouram_locale_breadcrumb_format">%1$s%2$s%3$s</string>
-    <string name="twofortyfouram_locale_breadcrumb_separator">\u0020&gt;\u0020</string>
-    <string name="twofortyfouram_locale_menu_dontsave">Zrušit</string>
-    <string name="twofortyfouram_locale_menu_help">Nápověda</string>
-    <string name="twofortyfouram_locale_menu_save">Hotovo</string>
-
-</resources>

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

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-** Copyright 2013 two forty four a.m. LLC <http://www.twofortyfouram.com>
-**
-** 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>
-
-    <string name="twofortyfouram_locale_breadcrumb_format">%1$s%2$s%3$s</string>
-    <string name="twofortyfouram_locale_breadcrumb_separator">\u0020&gt;\u0020</string>
-    <string name="twofortyfouram_locale_menu_dontsave">Abbrechen</string>
-    <string name="twofortyfouram_locale_menu_help">Hilfe</string>
-    <string name="twofortyfouram_locale_menu_save">Fertig</string>
-
-</resources>

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

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-** Copyright 2013 two forty four a.m. LLC <http://www.twofortyfouram.com>
-**
-** 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>
-
-    <string name="twofortyfouram_locale_breadcrumb_format">%1$s%2$s%3$s</string>
-    <string name="twofortyfouram_locale_breadcrumb_separator">\u0020&gt;\u0020</string>
-    <string name="twofortyfouram_locale_menu_dontsave">Cancelar</string>
-    <string name="twofortyfouram_locale_menu_help">Ayuda</string>
-    <string name="twofortyfouram_locale_menu_save">Listo</string>
-
-</resources>

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

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-** Copyright 2013 two forty four a.m. LLC <http://www.twofortyfouram.com>
-**
-** 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>
-
-    <string name="twofortyfouram_locale_breadcrumb_format">%1$s%2$s%3$s</string>
-    <string name="twofortyfouram_locale_breadcrumb_separator">\u0020&gt;\u0020</string>
-    <string name="twofortyfouram_locale_menu_dontsave">Annuler</string>
-    <string name="twofortyfouram_locale_menu_help">Aide</string>
-    <string name="twofortyfouram_locale_menu_save">OK</string>
-
-</resources>

+ 0 - 19
taskerlocaleapi/src/main/res/values-hdpi/integers.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-** Copyright 2013 two forty four a.m. LLC <http://www.twofortyfouram.com>
-**
-** 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:tools="http://schemas.android.com/tools">
-
-    <integer name="twofortyfouram_locale_maximum_blurb_length" tools:ignore="UnusedResources">60</integer>
-
-</resources>

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

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-** Copyright 2013 two forty four a.m. LLC <http://www.twofortyfouram.com>
-**
-** 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>
-
-    <string name="twofortyfouram_locale_breadcrumb_format">%1$s%2$s%3$s</string>
-    <string name="twofortyfouram_locale_breadcrumb_separator">\u0020&gt;\u0020</string>
-    <string name="twofortyfouram_locale_menu_dontsave">Annulla</string>
-    <string name="twofortyfouram_locale_menu_help">Aiuto</string>
-    <string name="twofortyfouram_locale_menu_save">Fine</string>
-
-</resources>

+ 0 - 23
taskerlocaleapi/src/main/res/values-ja/strings-ja.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-** Copyright 2013 two forty four a.m. LLC <http://www.twofortyfouram.com>
-**
-** 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>
-
-    <string name="twofortyfouram_locale_breadcrumb_format">%1$s%2$s%3$s</string>
-    <string name="twofortyfouram_locale_breadcrumb_separator">\u0020&gt;\u0020</string>
-    <string name="twofortyfouram_locale_menu_dontsave">キャンセル</string>
-    <string name="twofortyfouram_locale_menu_help">ヘルプ</string>
-    <string name="twofortyfouram_locale_menu_save">完了</string>
-
-</resources>

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

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-** Copyright 2013 two forty four a.m. LLC <http://www.twofortyfouram.com>
-**
-** 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>
-
-    <string name="twofortyfouram_locale_breadcrumb_format">%1$s%2$s%3$s</string>
-    <string name="twofortyfouram_locale_breadcrumb_separator">\u0020&gt;\u0020</string>
-    <string name="twofortyfouram_locale_menu_dontsave">취소</string>
-    <string name="twofortyfouram_locale_menu_help">도움말</string>
-    <string name="twofortyfouram_locale_menu_save">완료</string>
-
-</resources>

+ 0 - 19
taskerlocaleapi/src/main/res/values-ldpi/integers.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-** Copyright 2013 two forty four a.m. LLC <http://www.twofortyfouram.com>
-**
-** 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:tools="http://schemas.android.com/tools">
-
-    <integer name="twofortyfouram_locale_maximum_blurb_length" tools:ignore="UnusedResources">45</integer>
-
-</resources>

+ 0 - 20
taskerlocaleapi/src/main/res/values-mdpi/integers.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-** Copyright 2013 two forty four a.m. LLC <http://www.twofortyfouram.com>
-**
-** 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:tools="http://schemas.android.com/tools">
-
-    <!-- The maximum blurb length in characters.  This value is based on Latin characters. -->
-    <integer name="twofortyfouram_locale_maximum_blurb_length" tools:ignore="UnusedResources">50</integer>
-
-</resources>

+ 0 - 23
taskerlocaleapi/src/main/res/values-nb/strings-nb.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-** Copyright 2013 two forty four a.m. LLC <http://www.twofortyfouram.com>
-**
-** 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>
-
-    <string name="twofortyfouram_locale_breadcrumb_format">%1$s%2$s%3$s</string>
-    <string name="twofortyfouram_locale_breadcrumb_separator">\u0020&gt;\u0020</string>
-    <string name="twofortyfouram_locale_menu_dontsave">Avbryt</string>
-    <string name="twofortyfouram_locale_menu_help">Hjelp</string>
-    <string name="twofortyfouram_locale_menu_save">Ferdig</string>
-
-</resources>

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

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-** Copyright 2013 two forty four a.m. LLC <http://www.twofortyfouram.com>
-**
-** 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>
-
-    <string name="twofortyfouram_locale_breadcrumb_format">%1$s%2$s%3$s</string>
-    <string name="twofortyfouram_locale_breadcrumb_separator">\u0020&gt;\u0020</string>
-    <string name="twofortyfouram_locale_menu_dontsave">Annuleren</string>
-    <string name="twofortyfouram_locale_menu_help">Help</string>
-    <string name="twofortyfouram_locale_menu_save">Gereed</string>
-
-</resources>

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

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-** Copyright 2013 two forty four a.m. LLC <http://www.twofortyfouram.com>
-**
-** 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>
-
-    <string name="twofortyfouram_locale_breadcrumb_format">%1$s%2$s%3$s</string>
-    <string name="twofortyfouram_locale_breadcrumb_separator">\u0020&gt;\u0020</string>
-    <string name="twofortyfouram_locale_menu_dontsave">Cancelar</string>
-    <string name="twofortyfouram_locale_menu_help">Ajuda</string>
-    <string name="twofortyfouram_locale_menu_save">Concluído</string>
-
-</resources>

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

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-** Copyright 2013 two forty four a.m. LLC <http://www.twofortyfouram.com>
-**
-** 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.2
--->
-<resources>
-
-    <string name="twofortyfouram_locale_breadcrumb_format">%1$s%2$s%3$s</string>
-    <string name="twofortyfouram_locale_breadcrumb_separator">\u0020&gt;\u0020</string>
-    <string name="twofortyfouram_locale_menu_dontsave">Отмена</string>
-    <string name="twofortyfouram_locale_menu_help">Помощь</string>
-    <string name="twofortyfouram_locale_menu_save">Готово</string>
-
-</resources>

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

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-** Copyright 2013 two forty four a.m. LLC <http://www.twofortyfouram.com>
-**
-** 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>
-
-    <string name="twofortyfouram_locale_breadcrumb_format">%1$s%2$s%3$s</string>
-    <string name="twofortyfouram_locale_breadcrumb_separator">\u0020&gt;\u0020</string>
-    <string name="twofortyfouram_locale_menu_dontsave">Avbryt</string>
-    <string name="twofortyfouram_locale_menu_help">Hjälp</string>
-    <string name="twofortyfouram_locale_menu_save">Klar</string>
-
-</resources>

+ 0 - 23
taskerlocaleapi/src/main/res/values-v11/styles.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-** Copyright 2013 two forty four a.m. LLC <http://www.twofortyfouram.com>
-**
-** 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>
-
-    <style name="Theme.Locale.Dark" parent="android:Theme.Holo" />
-
-    <style name="Theme.Locale.Light" parent="android:Theme.Holo.Light" />
-
-    <style name="Theme.Locale.Dialog" parent="android:Theme.Holo.Dialog" />
-
-</resources>

+ 0 - 23
taskerlocaleapi/src/main/res/values-v14/styles.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-** Copyright 2013 two forty four a.m. LLC <http://www.twofortyfouram.com>
-**
-** 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>
-
-    <style name="Theme.Locale.Dark" parent="android:Theme.DeviceDefault" />
-
-    <style name="Theme.Locale.Light" parent="android:Theme.DeviceDefault.Light" />
-
-    <style name="Theme.Locale.Dialog" parent="android:Theme.DeviceDefault.Dialog" />
-
-</resources>

+ 0 - 26
taskerlocaleapi/src/main/res/values-v9/styles.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-** Copyright 2013 two forty four a.m. LLC <http://www.twofortyfouram.com>
-**
-** 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>
-
-    <style name="Theme.Locale.Dark" parent="android:Theme">
-        <item name="android:listViewStyle">@style/MotorolaListViewHackStyle</item>
-    </style>
-
-    <!-- Stupid Motorola.  This is a hack to avoid hideous ListViews on Motoblur devices.  http://community.developer.motorola.com/t5/MOTODEV-Blog/Why-Does-My-ListView-Look-Different/ba-p/17462 -->
-    <style name="MotorolaListViewHackStyle" parent="@android:style/Widget.ListView">
-        <item name="android:overScrollFooter">@null</item>
-    </style>
-
-</resources>

+ 0 - 23
taskerlocaleapi/src/main/res/values-vi/strings-vi.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-** Copyright 2013 two forty four a.m. LLC <http://www.twofortyfouram.com>
-**
-** 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>
-
-    <string name="twofortyfouram_locale_breadcrumb_format">%1$s%2$s%3$s</string>
-    <string name="twofortyfouram_locale_breadcrumb_separator">\u0020&gt;\u0020</string>
-    <string name="twofortyfouram_locale_menu_dontsave">Hủy</string>
-    <string name="twofortyfouram_locale_menu_help">Giúp đỡ</string>
-    <string name="twofortyfouram_locale_menu_save">Xong</string>
-
-</resources>

+ 0 - 27
taskerlocaleapi/src/main/res/values/id.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-** Copyright 2013 two forty four a.m. LLC <http://www.twofortyfouram.com>
-**
-** 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>
-
-
-    <!-- Menu item to launch the Help -->
-    <item name="twofortyfouram_locale_menu_help" type="id"/>
-
-    <!-- Menu item to cancel the current Activity -->
-    <item name="twofortyfouram_locale_menu_dontsave" type="id"/>
-
-    <!-- Menu item to save the current Activity -->
-    <item name="twofortyfouram_locale_menu_save" type="id"/>
-    
-</resources>

+ 0 - 32
taskerlocaleapi/src/main/res/values/strings-en.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-** Copyright 2013 two forty four a.m. LLC <http://www.twofortyfouram.com>
-**
-** 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:tools="http://schemas.android.com/tools">
-
-    <!-- A format string for breadcrumbs in the titlebar.  For left to right languages, such as English, the format will look something like "Main Activity > Sub Activity > Sub Activity 2".  Item #1 is the previous path, item #2 is the separator, and item #3 is the current item.  For most left to right languages, this shouldn't need to be changed. -->
-    <string name="twofortyfouram_locale_breadcrumb_format" tools:ignore="UnusedResources">%1$s%2$s%3$s</string>
-
-    <!-- The separator character for breadcrumbs.  For most left to right languages, this shouldn't need to be changed. -->
-    <string name="twofortyfouram_locale_breadcrumb_separator" tools:ignore="UnusedResources">\u0020&gt;\u0020</string>
-
-    <!-- The Don't Save button in the menu or Action Bar.  MDPI 21 character maximum -->
-    <string name="twofortyfouram_locale_menu_dontsave">Cancel</string>
-
-    <!-- The Help button in the menu or Action Bar.  MDPI 21 character maximum -->
-    <string name="twofortyfouram_locale_menu_help">Help</string>
-
-    <!-- The Save button in the menu or Action Bar.  MDPI 21 character maximum -->
-    <string name="twofortyfouram_locale_menu_save">Done</string>
-
-</resources>

+ 0 - 26
taskerlocaleapi/src/main/res/values/styles.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-** Copyright 2013 two forty four a.m. LLC <http://www.twofortyfouram.com>
-**
-** 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>
-
-    <!-- Dark style for all standard Locale and Locale plug-in Activity instances -->
-    <style name="Theme.Locale.Dark" parent="android:Theme" />
-
-    <!-- Light style for use within Locale.  This theme is usually not used.  The only place Locale uses this theme is to make dialogs look correct on Android 2.3 and earlier, because http://developer.android.com/reference/android/app/AlertDialog.Builder.html#getContext() requires Android 3.0. -->
-    <style name="Theme.Locale.Light" parent="android:Theme.Light" />
-
-    <!-- Style for Activities that look like a dialog -->
-    <style name="Theme.Locale.Dialog" parent="@android:style/Theme.Translucent.NoTitleBar" />
-
-</resources>

+ 1 - 1
tt-rss-android.iml

@@ -8,7 +8,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />