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

Clean up from comments, enable throttling.

Browse Source 
Change-Id: I719b0491a7953ab57d76634699c6fdf3ad8558e0
This commit is contained in:
Dianne Hackborn
2011-01-08 18:34:02 -08:00
parent ddfb4b38f5
commit 69c72dfdf9
2 changed files with 31 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/ApiDemos/AndroidManifest.xml
View File

@@ -343,7 +343,8 @@
</activity> </activity>
<!-- Loader Samples --> <!-- Loader Samples -->
<!-- BEGIN_INCLUDE(loader_throttle) -->
<activity android:name=".app.LoaderThrottle" <activity android:name=".app.LoaderThrottle"
android:label="@string/loader_throttle"> android:label="@string/loader_throttle">
<intent-filter> <intent-filter>
@@ -353,6 +354,7 @@
</activity> </activity>
<provider android:name=".app.LoaderThrottle$SimpleProvider" <provider android:name=".app.LoaderThrottle$SimpleProvider"
android:authorities="com.example.android.apis.app.LoaderThrottle" /> android:authorities="com.example.android.apis.app.LoaderThrottle" />
<!-- END_INCLUDE(loader_throttle) -->
<!-- Intent Samples --> <!-- Intent Samples -->

69
samples/ApiDemos/src/com/example/android/apis/app/LoaderThrottle.java
View File

@@ -16,6 +16,7 @@
package com.example.android.apis.app; package com.example.android.apis.app;
//BEGIN_INCLUDE(complete)
import android.app.Activity; import android.app.Activity;
import android.app.FragmentManager; import android.app.FragmentManager;
import android.app.ListFragment; import android.app.ListFragment;
@@ -29,6 +30,7 @@ import android.content.CursorLoader;
import android.content.Loader; import android.content.Loader;
import android.content.UriMatcher; import android.content.UriMatcher;
import android.database.Cursor; import android.database.Cursor;
import android.database.DatabaseUtils;
import android.database.SQLException; import android.database.SQLException;
import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper; import android.database.sqlite.SQLiteOpenHelper;
@@ -56,12 +58,12 @@ import java.util.HashMap;
public class LoaderThrottle extends Activity { public class LoaderThrottle extends Activity {
// Debugging. // Debugging.
static final String TAG = "LoaderThrottle"; static final String TAG = "LoaderThrottle";
/** /**
* The authority we use to get to our sample provider. * The authority we use to get to our sample provider.
*/ */
public static final String AUTHORITY = "com.example.android.apis.app.LoaderThrottle"; public static final String AUTHORITY = "com.example.android.apis.app.LoaderThrottle";
/** /**
* Definition of the contract for the main table of our provider. * Definition of the contract for the main table of our provider.
*/ */
@@ -86,12 +88,7 @@ public class LoaderThrottle extends Activity {
*/ */
public static final Uri CONTENT_ID_URI_BASE public static final Uri CONTENT_ID_URI_BASE
= Uri.parse("content://" + AUTHORITY + "/main/"); = Uri.parse("content://" + AUTHORITY + "/main/");
/**
* 0-relative position of a main ID segment in the path part of a main ID URI
*/
public static final int MAIN_ID_PATH_POSITION = 1;
/** /**
* The MIME type of {@link #CONTENT_URI}. * The MIME type of {@link #CONTENT_URI}.
*/ */
@@ -107,14 +104,14 @@ public class LoaderThrottle extends Activity {
* The default sort order for this table * The default sort order for this table
*/ */
public static final String DEFAULT_SORT_ORDER = "data COLLATE LOCALIZED ASC"; public static final String DEFAULT_SORT_ORDER = "data COLLATE LOCALIZED ASC";
/** /**
* Column name for the single column holding our data. * Column name for the single column holding our data.
* <P>Type: TEXT</P> * <P>Type: TEXT</P>
*/ */
public static final String COLUMN_NAME_DATA = "data"; public static final String COLUMN_NAME_DATA = "data";
} }
/** /**
* This class helps open, create, and upgrade the database file. * This class helps open, create, and upgrade the database file.
*/ */
@@ -189,7 +186,7 @@ public class LoaderThrottle extends Activity {
mUriMatcher = new UriMatcher(UriMatcher.NO_MATCH); mUriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
mUriMatcher.addURI(AUTHORITY, MainTable.TABLE_NAME, MAIN); mUriMatcher.addURI(AUTHORITY, MainTable.TABLE_NAME, MAIN);
mUriMatcher.addURI(AUTHORITY, MainTable.TABLE_NAME + "/#", MAIN_ID); mUriMatcher.addURI(AUTHORITY, MainTable.TABLE_NAME + "/#", MAIN_ID);
// Create and initialize projection map for all columns. This is // Create and initialize projection map for all columns. This is
// simply an identity mapping. // simply an identity mapping.
mNotesProjectionMap = new HashMap<String, String>(); mNotesProjectionMap = new HashMap<String, String>();
@@ -227,8 +224,9 @@ public class LoaderThrottle extends Activity {
case MAIN_ID: case MAIN_ID:
// The incoming URI is for a single row. // The incoming URI is for a single row.
qb.setProjectionMap(mNotesProjectionMap); qb.setProjectionMap(mNotesProjectionMap);
qb.appendWhere(MainTable._ID + "=" + uri.getPathSegments().get( qb.appendWhere(MainTable._ID + "=?");
MainTable.MAIN_ID_PATH_POSITION)); selectionArgs = DatabaseUtils.appendSelectionArgs(selectionArgs,
new String[] { uri.getLastPathSegment() });
break; break;
default: default:
@@ -299,7 +297,7 @@ public class LoaderThrottle extends Activity {
throw new SQLException("Failed to insert row into " + uri); throw new SQLException("Failed to insert row into " + uri);
} }
/** /**
* Handle deleting data. * Handle deleting data.
*/ */
@@ -322,14 +320,8 @@ public class LoaderThrottle extends Activity {
case MAIN_ID: case MAIN_ID:
// If URI is for a particular row ID, delete is based on incoming // If URI is for a particular row ID, delete is based on incoming
// data but modified to restrict to the given ID. // data but modified to restrict to the given ID.
finalWhere = MainTable._ID + " = " + uri.getPathSegments().get( finalWhere = DatabaseUtils.concatenateWhere(
MainTable.MAIN_ID_PATH_POSITION); MainTable._ID + " = " + ContentUris.parseId(uri), where);
if (where != null) {
// Combine with incoming where, if specified.
finalWhere = finalWhere + " AND " + where;
}
count = db.delete(MainTable.TABLE_NAME, finalWhere, whereArgs); count = db.delete(MainTable.TABLE_NAME, finalWhere, whereArgs);
break; break;
@@ -360,17 +352,11 @@ public class LoaderThrottle extends Activity {
case MAIN_ID: case MAIN_ID:
// If URI is for a particular row ID, update is based on incoming // If URI is for a particular row ID, update is based on incoming
// data but modified to restrict to the given ID. // data but modified to restrict to the given ID.
finalWhere = MainTable._ID + " = " + uri.getPathSegments().get( finalWhere = DatabaseUtils.concatenateWhere(
MainTable.MAIN_ID_PATH_POSITION); MainTable._ID + " = " + ContentUris.parseId(uri), where);
if (where != null) {
// Combine with incoming where, if specified.
finalWhere = finalWhere + " AND " + where;
}
count = db.update(MainTable.TABLE_NAME, values, finalWhere, whereArgs); count = db.update(MainTable.TABLE_NAME, values, finalWhere, whereArgs);
break; break;
default: default:
throw new IllegalArgumentException("Unknown URI " + uri); throw new IllegalArgumentException("Unknown URI " + uri);
} }
@@ -380,13 +366,13 @@ public class LoaderThrottle extends Activity {
return count; return count;
} }
} }
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
FragmentManager fm = getFragmentManager(); FragmentManager fm = getFragmentManager();
// Create the list fragment and add it as our sole content. // Create the list fragment and add it as our sole content.
if (fm.findFragmentById(android.R.id.content) == null) { if (fm.findFragmentById(android.R.id.content) == null) {
ThrottledLoaderListFragment list = new ThrottledLoaderListFragment(); ThrottledLoaderListFragment list = new ThrottledLoaderListFragment();
@@ -400,7 +386,7 @@ public class LoaderThrottle extends Activity {
// Menu identifiers // Menu identifiers
static final int POPULATE_ID = Menu.FIRST; static final int POPULATE_ID = Menu.FIRST;
static final int CLEAR_ID = Menu.FIRST+1; static final int CLEAR_ID = Menu.FIRST+1;
// This is the Adapter being used to display the list's data. // This is the Adapter being used to display the list's data.
SimpleCursorAdapter mAdapter; SimpleCursorAdapter mAdapter;
@@ -409,11 +395,11 @@ public class LoaderThrottle extends Activity {
// Task we have running to populate the database. // Task we have running to populate the database.
AsyncTask<Void, Void, Void> mPopulatingTask; AsyncTask<Void, Void, Void> mPopulatingTask;
@Override public void onActivityCreated(Bundle savedInstanceState) { @Override public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState); super.onActivityCreated(savedInstanceState);
setEmptyText("No data"); setEmptyText("No data. Select 'Populate' to fill with data from Z to A at a rate of 4 per second.");
setHasOptionsMenu(true); setHasOptionsMenu(true);
// Create an empty adapter we will use to display the loaded data. // Create an empty adapter we will use to display the loaded data.
@@ -422,7 +408,7 @@ public class LoaderThrottle extends Activity {
new String[] { MainTable.COLUMN_NAME_DATA }, new String[] { MainTable.COLUMN_NAME_DATA },
new int[] { android.R.id.text1 }, 0); new int[] { android.R.id.text1 }, 0);
setListAdapter(mAdapter); setListAdapter(mAdapter);
// Prepare the loader. Either re-connect with an existing one, // Prepare the loader. Either re-connect with an existing one,
// or start a new one. // or start a new one.
getLoaderManager().initLoader(0, null, this); getLoaderManager().initLoader(0, null, this);
@@ -437,7 +423,7 @@ public class LoaderThrottle extends Activity {
@Override public boolean onOptionsItemSelected(MenuItem item) { @Override public boolean onOptionsItemSelected(MenuItem item) {
final ContentResolver cr = getActivity().getContentResolver(); final ContentResolver cr = getActivity().getContentResolver();
switch (item.getItemId()) { switch (item.getItemId()) {
case POPULATE_ID: case POPULATE_ID:
if (mPopulatingTask != null) { if (mPopulatingTask != null) {
@@ -465,7 +451,7 @@ public class LoaderThrottle extends Activity {
}; };
mPopulatingTask.execute((Void[])null); mPopulatingTask.execute((Void[])null);
return true; return true;
case CLEAR_ID: case CLEAR_ID:
if (mPopulatingTask != null) { if (mPopulatingTask != null) {
mPopulatingTask.cancel(false); mPopulatingTask.cancel(false);
@@ -479,7 +465,7 @@ public class LoaderThrottle extends Activity {
}; };
task.execute((Void[])null); task.execute((Void[])null);
return true; return true;
default: default:
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);
} }
@@ -499,7 +485,7 @@ public class LoaderThrottle extends Activity {
@Override public Loader<Cursor> onCreateLoader(int id, Bundle args) { @Override public Loader<Cursor> onCreateLoader(int id, Bundle args) {
CursorLoader cl = new CursorLoader(getActivity(), MainTable.CONTENT_URI, CursorLoader cl = new CursorLoader(getActivity(), MainTable.CONTENT_URI,
PROJECTION, null, null, null); PROJECTION, null, null, null);
//cl.setUpdateThrottle(2000); // update at most every 2 seconds. cl.setUpdateThrottle(2000); // update at most every 2 seconds.
return cl; return cl;
} }
@@ -512,3 +498,4 @@ public class LoaderThrottle extends Activity {
} }
} }
} }
//END_INCLUDE(complete)