From 7b0d2326d93aef077f37e809f338466ff1d94f2f Mon Sep 17 00:00:00 2001 From: Seong-A Kong Date: Mon, 2 Sep 2013 18:52:04 +0900 Subject: [PATCH] Support for injection of android.content.ClipboardManager by @SystemService --- .../org/androidannotations/model/AndroidSystemServices.java | 1 + .../org/androidannotations/test15/ServiceInjectionTest.java | 4 +++- .../org/androidannotations/test15/ActivityWithServices.java | 6 ++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/model/AndroidSystemServices.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/model/AndroidSystemServices.java index 93bc242f57..eaac0ae632 100644 --- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/model/AndroidSystemServices.java +++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/model/AndroidSystemServices.java @@ -33,6 +33,7 @@ public AndroidSystemServices() { registeredServices.put("android.app.ActivityManager", "android.content.Context.ACTIVITY_SERVICE"); registeredServices.put("android.app.AlarmManager", "android.content.Context.ALARM_SERVICE"); registeredServices.put("android.media.AudioManager", "android.content.Context.AUDIO_SERVICE"); + registeredServices.put("android.content.ClipboardManager", "android.content.Context.CLIPBOARD_SERVICE"); registeredServices.put("android.text.ClipboardManager", "android.content.Context.CLIPBOARD_SERVICE"); registeredServices.put("android.net.ConnectivityManager", "android.content.Context.CONNECTIVITY_SERVICE"); registeredServices.put("android.location.CountryDetector", "android.content.Context.COUNTRY_DETECTOR"); diff --git a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/ServiceInjectionTest.java b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/ServiceInjectionTest.java index 04acd26402..6a9cd03ba0 100644 --- a/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/ServiceInjectionTest.java +++ b/AndroidAnnotations/functional-test-1-5-tests/src/test/java/org/androidannotations/test15/ServiceInjectionTest.java @@ -38,7 +38,7 @@ public void setup() throws Exception { @SuppressWarnings("unchecked") Map SYSTEM_SERVICE_MAP = (Map) serviceMapField.get(null); - SYSTEM_SERVICE_MAP.put(Context.CLIPBOARD_SERVICE, "org.androidannotations.test15.FakeClipboardManager"); + SYSTEM_SERVICE_MAP.put(Context.CLIPBOARD_SERVICE, "android.content.ClipboardManager"); } @Test @@ -62,6 +62,8 @@ public void servicesAreInjected() { assertThat(activity.sensorManager).isNotNull(); assertThat(activity.telephonyManager).isNotNull(); assertThat(activity.audioManager).isNotNull(); + assertThat(activity.textClipboardManager).isNotNull(); + assertThat(activity.contentClipboardManager).isNotNull(); } } diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ActivityWithServices.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ActivityWithServices.java index 14d8bdd842..1e5008b856 100644 --- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ActivityWithServices.java +++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ActivityWithServices.java @@ -29,7 +29,6 @@ import android.os.PowerManager; import android.os.Vibrator; import android.telephony.TelephonyManager; -import android.text.ClipboardManager; import android.view.LayoutInflater; import android.view.WindowManager; import android.view.inputmethod.InputMethodManager; @@ -84,7 +83,10 @@ public class ActivityWithServices extends Activity { SensorManager sensorManager; @SystemService - ClipboardManager clipboardManager; + android.text.ClipboardManager textClipboardManager; + + @SystemService + android.content.ClipboardManager contentClipboardManager; @SystemService TelephonyManager telephonyManager;