LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge from open-source master

Browse Source 
Change-Id: Icb039ab90287961b1ad358b78eaead4a9aa2ae59
This commit is contained in:
The Android Open Source Project
2010-06-14 10:01:48 -07:00
parent cc60f1b869 db64fc5c60
commit 1424c5daa1
16 changed files with 9 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/ApiDemos/src/com/example/android/apis/view/Animation2.java
View File

@@ -49,7 +49,7 @@ public class Animation2 extends Activity implements
s.setOnItemSelectedListener(this);
}
public void onItemSelected(AdapterView parent, View v, int position, long id) {
public void onItemSelected(AdapterView<?> parent, View v, int position, long id) {
switch (position) {
case 0:
@@ -79,7 +79,7 @@ public class Animation2 extends Activity implements
}
}
public void onNothingSelected(AdapterView parent) {
public void onNothingSelected(AdapterView<?> parent) {
}
private String[] mStrings = {

4
samples/ApiDemos/src/com/example/android/apis/view/Animation3.java
View File

@@ -50,7 +50,7 @@ public class Animation3 extends Activity implements AdapterView.OnItemSelectedLi
s.setOnItemSelectedListener(this);
}
public void onItemSelected(AdapterView parent, View v, int position, long id) {
public void onItemSelected(AdapterView<?> parent, View v, int position, long id) {
final View target = findViewById(R.id.target);
final View targetParent = (View) target.getParent();
@@ -96,6 +96,6 @@ public class Animation3 extends Activity implements AdapterView.OnItemSelectedLi
target.startAnimation(a);
}
public void onNothingSelected(AdapterView parent) {
public void onNothingSelected(AdapterView<?> parent) {
}
}

3
samples/ApiDemos/src/com/example/android/apis/view/AutoComplete1.java
View File

@@ -19,12 +19,9 @@ package com.example.android.apis.view;
import com.example.android.apis.R;
import android.app.Activity;
import android.widget.Spinner;
import android.widget.ArrayAdapter;
import android.widget.AutoCompleteTextView;
import android.os.Bundle;
import android.view.View;
public class AutoComplete1 extends Activity {

3
samples/ApiDemos/src/com/example/android/apis/view/AutoComplete6.java
View File

@@ -19,12 +19,9 @@ package com.example.android.apis.view;
import com.example.android.apis.R;
import android.app.Activity;
import android.widget.Spinner;
import android.widget.ArrayAdapter;
import android.widget.MultiAutoCompleteTextView;
import android.os.Bundle;
import android.view.View;
public class AutoComplete6 extends Activity {

3
samples/ApiDemos/src/com/example/android/apis/view/Buttons1.java
View File

@@ -22,9 +22,6 @@ import com.example.android.apis.R;
import android.app.Activity;
import android.os.Bundle;
import android.widget.Spinner;
import android.widget.ArrayAdapter;
/**
* A gallery of the different styles of buttons.

2
samples/ApiDemos/src/com/example/android/apis/view/Focus1.java
View File

@@ -20,12 +20,10 @@ import com.example.android.apis.R;
import android.app.Activity;
import android.os.Bundle;
import android.view.View;
import android.webkit.WebView;
import android.widget.ListView;
import android.widget.ArrayAdapter;
/**
* Demonstrates the use of non-focusable views.
*/

2
samples/ApiDemos/src/com/example/android/apis/view/Gallery1.java
View File

@@ -49,7 +49,7 @@ public class Gallery1 extends Activity {
// Set a item click listener, and just Toast the clicked position
g.setOnItemClickListener(new OnItemClickListener() {
public void onItemClick(AdapterView parent, View v, int position, long id) {
public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
Toast.makeText(Gallery1.this, "" + position, Toast.LENGTH_SHORT).show();
}
});

4
samples/ApiDemos/src/com/example/android/apis/view/ImageSwitcher1.java
View File

@@ -56,11 +56,11 @@ public class ImageSwitcher1 extends Activity implements
g.setOnItemSelectedListener(this);
}
public void onItemSelected(AdapterView parent, View v, int position, long id) {
public void onItemSelected(AdapterView<?> parent, View v, int position, long id) {
mSwitcher.setImageResource(mImageIds[position]);
}
public void onNothingSelected(AdapterView parent) {
public void onNothingSelected(AdapterView<?> parent) {
}
public View makeView() {

6
samples/ApiDemos/src/com/example/android/apis/view/List13.java
View File

@@ -52,7 +52,6 @@ public class List13 extends ListActivity implements ListView.OnScrollListener {
private LayoutInflater mInflater;
public SlowAdapter(Context context) {
mContext = context;
mInflater = (LayoutInflater)context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
}
@@ -114,11 +113,6 @@ public class List13 extends ListActivity implements ListView.OnScrollListener {
return text;
}
/**
* Remember our context so we can use it when constructing views.
*/
private Context mContext;
}
@Override

7
samples/ApiDemos/src/com/example/android/apis/view/List9.java
View File

@@ -111,8 +111,8 @@ public class List9 extends ListActivity implements ListView.OnScrollListener {
public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
int lastItem = firstVisibleItem + visibleItemCount - 1;
public void onScroll(AbsListView view, int firstVisibleItem,
int visibleItemCount, int totalItemCount) {
if (mReady) {
char firstLetter = mStrings[firstVisibleItem].charAt(0);
@@ -120,8 +120,6 @@ public class List9 extends ListActivity implements ListView.OnScrollListener {
mShowing = true;
mDialogText.setVisibility(View.VISIBLE);
}
mDialogText.setText(((Character)firstLetter).toString());
mHandler.removeCallbacks(mRemoveWindow);
@@ -316,5 +314,4 @@ public class List9 extends ListActivity implements ListView.OnScrollListener {
"Woodside Cabecou", "Xanadu", "Xynotyro", "Yarg Cornish",
"Yarra Valley Pyramid", "Yorkshire Blue", "Zamorano",
"Zanetti Grana Padano", "Zanetti Parmigiano Reggiano"};
}

1
samples/ApiDemos/src/com/example/android/apis/view/RatingBar1.java
View File

@@ -19,7 +19,6 @@ package com.example.android.apis.view;
import android.app.Activity;
import android.os.Bundle;
import android.widget.RatingBar;
import android.widget.SeekBar;
import android.widget.TextView;
import com.example.android.apis.R;

1
samples/ApiDemos/src/com/example/android/apis/view/ScrollView2.java
View File

@@ -24,7 +24,6 @@ import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Button;
/**
* Demonstrates wrapping a layout in a ScrollView.
*

6
samples/ApiDemos/src/com/example/android/apis/view/TableLayout10.java
View File

@@ -19,15 +19,9 @@ package com.example.android.apis.view;
import com.example.android.apis.R;
import android.app.Activity;
import android.widget.TableLayout;
import android.widget.Button;
import android.os.Bundle;
import android.view.View;
public class TableLayout10 extends Activity {
private boolean mShrink;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);

2
samples/ApiDemos/src/com/example/android/apis/view/TableLayout11.java
View File

@@ -25,8 +25,6 @@ import android.os.Bundle;
* <p>This example shows how to use horizontal gravity in a table layout.</p>
*/
public class TableLayout11 extends Activity {
private boolean mShrink;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);

2
samples/ApiDemos/src/com/example/android/apis/view/TableLayout12.java
View File

@@ -25,8 +25,6 @@ import android.os.Bundle;
* <p>This example shows how to use cell spanning in a table layout.</p>
*/
public class TableLayout12 extends Activity {
private boolean mShrink;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);

1
samples/ApiDemos/src/com/example/android/apis/view/Tabs1.java
View File

@@ -21,7 +21,6 @@ import android.os.Bundle;
import android.widget.TabHost;
import android.widget.TabHost.TabSpec;
import android.view.LayoutInflater;
import android.view.View;
import com.example.android.apis.R;