Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7726271 authored by Tor Norbye's avatar Tor Norbye
Browse files

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
parent cd71cf17

tests/BiDiTests/src/com/android/bidi/BiDiTestGridLayoutCodeLtr.java

+17 −3
Original line number Diff line number Diff line
@@ -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 {

tests/BiDiTests/src/com/android/bidi/BiDiTestGridLayoutCodeRtl.java

+17 −3
Original line number Diff line number Diff line
@@ -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 {

tests/GridLayoutTest/src/com/android/test/layout/AbstractLayoutTest.java

+7 −1
Original line number Diff line number Diff line
@@ -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 {

tests/GridLayoutTest/src/com/android/test/layout/AlignmentTest.java

+12 −2
Original line number Diff line number Diff line
@@ -20,13 +20,23 @@ 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 {

tests/GridLayoutTest/src/com/android/test/layout/GridLayoutTest.java

+4 −1
Original line number Diff line number Diff line
@@ -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) {