Actually use the compat class in ClipboardCompat and SwitchCompat

This commit is contained in:
Daniel Martí 2014-01-08 11:29:03 +01:00
parent f1c7846605
commit c274752477
2 changed files with 11 additions and 9 deletions

View File

@ -1,21 +1,21 @@
package org.fdroid.fdroid.compat; package org.fdroid.fdroid.compat;
import android.annotation.TargetApi;
import android.content.ClipData; import android.content.ClipData;
import android.content.ClipboardManager; import android.content.ClipboardManager;
import android.content.Context; import android.content.Context;
import android.os.Build;
import android.widget.CompoundButton; import android.widget.CompoundButton;
import android.widget.Switch; import android.widget.Switch;
import android.widget.ToggleButton; import android.widget.ToggleButton;
import org.fdroid.fdroid.ManageRepo; import org.fdroid.fdroid.ManageRepo;
public abstract class ClipboardCompat { public abstract class ClipboardCompat extends Compatibility {
public abstract String getText(); public abstract String getText();
public static ClipboardCompat create(Context context) { public static ClipboardCompat create(Context context) {
if (Build.VERSION.SDK_INT >= 11) { if (hasApi(11)) {
return new HoneycombClipboard(context); return new HoneycombClipboard(context);
} else { } else {
return new OldClipboard(); return new OldClipboard();
} }
@ -23,6 +23,7 @@ public abstract class ClipboardCompat {
} }
@TargetApi(11)
class HoneycombClipboard extends ClipboardCompat { class HoneycombClipboard extends ClipboardCompat {
private final ClipboardManager manager; private final ClipboardManager manager;

View File

@ -1,12 +1,12 @@
package org.fdroid.fdroid.compat; package org.fdroid.fdroid.compat;
import android.os.Build; import android.annotation.TargetApi;
import android.widget.CompoundButton; import android.widget.CompoundButton;
import android.widget.Switch; import android.widget.Switch;
import android.widget.ToggleButton; import android.widget.ToggleButton;
import org.fdroid.fdroid.ManageRepo; import org.fdroid.fdroid.ManageRepo;
public abstract class SwitchCompat { public abstract class SwitchCompat extends Compatibility {
protected final ManageRepo activity; protected final ManageRepo activity;
@ -17,7 +17,7 @@ public abstract class SwitchCompat {
public abstract CompoundButton createSwitch(); public abstract CompoundButton createSwitch();
public static SwitchCompat create(ManageRepo activity) { public static SwitchCompat create(ManageRepo activity) {
if (Build.VERSION.SDK_INT >= 11) { if (hasApi(11)) {
return new HoneycombSwitch(activity); return new HoneycombSwitch(activity);
} else { } else {
return new OldSwitch(activity); return new OldSwitch(activity);
@ -26,6 +26,7 @@ public abstract class SwitchCompat {
} }
@TargetApi(11)
class HoneycombSwitch extends SwitchCompat { class HoneycombSwitch extends SwitchCompat {
protected HoneycombSwitch(ManageRepo activity) { protected HoneycombSwitch(ManageRepo activity) {