X Tutup
Skip to content
This repository was archived by the owner on Feb 26, 2023. It is now read-only.

#709 - Support for injection of android.content.ClipboardManager by @SystemService #710

Merged
DayS merged 1 commit into from
Sep 20, 2013
Merged

#709 - Support for injection of android.content.ClipboardManager by @SystemService #710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .../androidannotations/src/main/java/org/androidannotations/model/AndroidSystemServices.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
4 changes: 3 additions & 1 deletion ...onal-test-1-5-tests/src/test/java/org/androidannotations/test15/ServiceInjectionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public void setup() throws Exception {
@SuppressWarnings("unchecked")
Map<String, String> SYSTEM_SERVICE_MAP = (Map<String, String>) 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
Expand All @@ -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();
}

}
6 changes: 4 additions & 2 deletions ...functional-test-1-5/src/main/java/org/androidannotations/test15/ActivityWithServices.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
X Tutup