Replace wildcard imports with explicit imports

The wildcard imports interfered with the new typedef annotations (and
99% of the tests were using explicit imports anyway.)

Change-Id: I3784b9d700131fe4a0ba30283f052820b2fa5122
This commit is contained in:
Tor Norbye
2013-09-13 14:19:53 -07:00
parent cd71cf1738
commit a7726271f7
6 changed files with 59 additions and 12 deletions

View File

@@ -22,11 +22,25 @@ import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.EditText;
import android.widget.FrameLayout;
import android.widget.GridLayout;
import android.widget.*;
import android.widget.Space;
import android.widget.TextView;
import static android.text.InputType.*;
import static android.widget.GridLayout.*;
import static android.text.InputType.TYPE_CLASS_TEXT;
import static android.text.InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS;
import static android.text.InputType.TYPE_TEXT_VARIATION_PASSWORD;
import static android.widget.GridLayout.ALIGN_BOUNDS;
import static android.widget.GridLayout.BASELINE;
import static android.widget.GridLayout.CENTER;
import static android.widget.GridLayout.FILL;
import static android.widget.GridLayout.LEFT;
import static android.widget.GridLayout.RIGHT;
import static android.widget.GridLayout.START;
import static android.widget.GridLayout.Spec;
import static android.widget.GridLayout.spec;
public class BiDiTestGridLayoutCodeLtr extends Fragment {

View File

@@ -22,11 +22,25 @@ import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.EditText;
import android.widget.FrameLayout;
import android.widget.GridLayout;
import android.widget.*;
import android.widget.Space;
import android.widget.TextView;
import static android.text.InputType.*;
import static android.widget.GridLayout.*;
import static android.text.InputType.TYPE_CLASS_TEXT;
import static android.text.InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS;
import static android.text.InputType.TYPE_TEXT_VARIATION_PASSWORD;
import static android.widget.GridLayout.ALIGN_BOUNDS;
import static android.widget.GridLayout.BASELINE;
import static android.widget.GridLayout.CENTER;
import static android.widget.GridLayout.FILL;
import static android.widget.GridLayout.LEFT;
import static android.widget.GridLayout.RIGHT;
import static android.widget.GridLayout.START;
import static android.widget.GridLayout.Spec;
import static android.widget.GridLayout.spec;
public class BiDiTestGridLayoutCodeRtl extends Fragment {

View File

@@ -24,7 +24,13 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import static android.view.Gravity.*;
import static android.view.Gravity.BOTTOM;
import static android.view.Gravity.CENTER;
import static android.view.Gravity.FILL;
import static android.view.Gravity.LEFT;
import static android.view.Gravity.NO_GRAVITY;
import static android.view.Gravity.RIGHT;
import static android.view.Gravity.TOP;
public abstract class AbstractLayoutTest extends Activity {

View File

@@ -20,15 +20,25 @@ import android.app.Activity;
import android.content.Context;
import android.os.Bundle;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.EditText;
import android.widget.GridLayout;
import android.widget.GridLayout.Alignment;
import android.widget.GridLayout.LayoutParams;
import android.widget.TextView;
import static android.widget.GridLayout.*;
import static android.widget.GridLayout.BASELINE;
import static android.widget.GridLayout.BOTTOM;
import static android.widget.GridLayout.CENTER;
import static android.widget.GridLayout.FILL;
import static android.widget.GridLayout.LEFT;
import static android.widget.GridLayout.RIGHT;
import static android.widget.GridLayout.TOP;
import static android.widget.GridLayout.spec;
public class AlignmentTest extends Activity {
public class AlignmentTest extends Activity {
public static final String[] HORIZONTAL_NAMES = {"LEFT", "center", "east", "fill"};
public static final Alignment[] HORIZONTAL_ALIGNMENTS = {LEFT, CENTER, RIGHT, FILL};

View File

@@ -21,7 +21,10 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.GridLayout;
import static android.widget.GridLayout.*;
import static android.widget.GridLayout.Spec;
import static android.widget.GridLayout.UNDEFINED;
import static android.widget.GridLayout.VERTICAL;
import static android.widget.GridLayout.spec;
public class GridLayoutTest extends AbstractLayoutTest {
public ViewGroup create(Context context) {

View File

@@ -20,9 +20,9 @@ import android.content.Context;
import android.view.View;
import android.view.ViewGroup;
import android.widget.LinearLayout;
import android.widget.LinearLayout.LayoutParams;
import static android.widget.LinearLayout.*;
import static android.widget.LinearLayout.LayoutParams.*;
import static android.widget.LinearLayout.LayoutParams.WRAP_CONTENT;
public class LinearLayoutTest extends AbstractLayoutTest {
public ViewGroup create(Context context) {