diff options
| -rw-r--r-- | Android.mk | 8 | ||||
| -rw-r--r-- | AndroidManifest.xml | 3 | ||||
| -rw-r--r-- | src/com/cyanogenmod/lockclock/weather/WeatherUpdateService.java | 6 |
3 files changed, 2 insertions, 15 deletions
@@ -23,15 +23,9 @@ LOCAL_SDK_VERSION := current LOCAL_PACKAGE_NAME := LockClock LOCAL_PROGUARD_FLAG_FILES := proguard.flags -# 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 \ - org.cyanogenmod.platform.sdk +LOCAL_STATIC_JAVA_LIBRARIES := org.cyanogenmod.platform.sdk include $(BUILD_PACKAGE) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index d4255e8..1a422e2 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -44,9 +44,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 1fd6f70..c65dc86 100644 --- a/src/com/cyanogenmod/lockclock/weather/WeatherUpdateService.java +++ b/src/com/cyanogenmod/lockclock/weather/WeatherUpdateService.java @@ -44,8 +44,6 @@ import com.cyanogenmod.lockclock.misc.Constants; import com.cyanogenmod.lockclock.misc.Preferences; import com.cyanogenmod.lockclock.misc.WidgetUtils; import com.cyanogenmod.lockclock.preference.WeatherPreferences; -import com.google.android.gms.common.ConnectionResult; -import com.google.android.gms.common.GooglePlayServicesUtil; import cyanogenmod.weather.CMWeatherManager; import cyanogenmod.weather.WeatherInfo; import cyanogenmod.weather.WeatherLocation; @@ -357,9 +355,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; } private void onWeatherRequestCompleted(WeatherInfo result) { |