diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-01-06 12:29:35 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-01-06 12:29:35 +0100 |
| commit | fb59ff675807f5eafad1ec5e8556b3591d10dc23 (patch) | |
| tree | d3385885ef2f0347505e50df9819d3d76c1a3b59 | |
| parent | 864c4e994be96637216977d9b2a333ddecbaec7f (diff) | |
| download | packages_apps_LockClock-fb59ff675807f5eafad1ec5e8556b3591d10dc23.zip packages_apps_LockClock-fb59ff675807f5eafad1ec5e8556b3591d10dc23.tar.gz packages_apps_LockClock-fb59ff675807f5eafad1ec5e8556b3591d10dc23.tar.bz2 | |
remove dependency on proprietary google play services
Change-Id: Ie5e049b1894121c6ef975b1ac249957c39874019
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
| -rw-r--r-- | Android.mk | 7 | ||||
| -rw-r--r-- | AndroidManifest.xml | 3 | ||||
| -rw-r--r-- | src/com/cyanogenmod/lockclock/weather/WeatherUpdateService.java | 6 |
3 files changed, 1 insertions, 15 deletions
@@ -24,14 +24,7 @@ LOCAL_PACKAGE_NAME := LockClock LOCAL_PROGUARD_FLAG_FILES := proguard.flags LOCAL_AAPT_INCLUDE_ALL_RESOURCES := true -# Include res dir from chips -google_play_dir := ../../../external/google/google_play_services/libproject/google-play-services_lib/res -res_dir := $(google_play_dir) res - LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dir)) LOCAL_AAPT_FLAGS := --auto-add-overlay -LOCAL_AAPT_FLAGS += --extra-packages com.google.android.gms - -LOCAL_STATIC_JAVA_LIBRARIES := play include $(BUILD_PACKAGE) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index e2c979a..a4bb456 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -43,9 +43,6 @@ android:theme="@style/Theme.Main" android:name=".WidgetApplication" > - <meta-data android:name="com.google.android.gms.version" - android:value="@integer/google_play_services_version" /> - <activity android:name=".preference.Preferences" android:configChanges="orientation|screenSize" diff --git a/src/com/cyanogenmod/lockclock/weather/WeatherUpdateService.java b/src/com/cyanogenmod/lockclock/weather/WeatherUpdateService.java index a228ec7..a4fdff1 100644 --- a/src/com/cyanogenmod/lockclock/weather/WeatherUpdateService.java +++ b/src/com/cyanogenmod/lockclock/weather/WeatherUpdateService.java @@ -39,8 +39,6 @@ import com.cyanogenmod.lockclock.ClockWidgetProvider; import com.cyanogenmod.lockclock.misc.Constants; import com.cyanogenmod.lockclock.misc.Preferences; import com.cyanogenmod.lockclock.misc.WidgetUtils; -import com.google.android.gms.common.ConnectionResult; -import com.google.android.gms.common.GooglePlayServicesUtil; import java.util.Date; @@ -202,9 +200,7 @@ public class WeatherUpdateService extends Service { } private boolean isGooglePlayServicesAvailable() { - int result = GooglePlayServicesUtil.isGooglePlayServicesAvailable(mContext); - return result == ConnectionResult.SUCCESS - || result == ConnectionResult.SERVICE_VERSION_UPDATE_REQUIRED; + return false; } @Override |