Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 4326 into donut

Browse Source 
* changes:
  Don't get location in search dialog.
This commit is contained in:
Android (Google) Code Review
2009-06-17 00:58:19 -07:00
parent 9fbeb7da13 6d3d9892c2
commit 528a29f886
1 changed files with 0 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
core/java/android/app/SearchDialog.java
View File

@@ -35,11 +35,6 @@ import android.content.res.Resources;
import android.database.Cursor; import android.database.Cursor;
import android.graphics.drawable.AnimationDrawable; import android.graphics.drawable.AnimationDrawable;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.location.Criteria;
import android.location.Location;
import android.location.LocationListener;
import android.location.LocationManager;
import android.location.LocationProvider;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.os.SystemClock; import android.os.SystemClock;
@@ -153,15 +148,6 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS
private final WeakHashMap<String, Drawable> mOutsideDrawablesCache = private final WeakHashMap<String, Drawable> mOutsideDrawablesCache =
new WeakHashMap<String, Drawable>(); new WeakHashMap<String, Drawable>();
// Objects we keep around for requesting location updates when the dialog is started
// (and canceling them when the dialog is stopped). We don't actually make use of the
// updates ourselves here, so the LocationListener is just a dummy which doesn't do
// anything. We only do this here so that other suggest providers which wish to provide
// location-based suggestions are more likely to get a good fresh location.
private LocationManager mLocationManager;
private LocationProvider mLocationProvider;
private LocationListener mDummyLocationListener;
/** /**
* Constructor - fires it up and makes it look like the search UI. * Constructor - fires it up and makes it look like the search UI.
* *
@@ -240,37 +226,6 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS
mVoiceAppSearchIntent = new Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH); mVoiceAppSearchIntent = new Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH);
mVoiceAppSearchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); mVoiceAppSearchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
mLocationManager =
(LocationManager) getContext().getSystemService(Context.LOCATION_SERVICE);
if (mLocationManager != null) {
Criteria criteria = new Criteria();
criteria.setAccuracy(Criteria.ACCURACY_COARSE);
String providerName = mLocationManager.getBestProvider(criteria, true);
if (providerName != null) {
mLocationProvider = mLocationManager.getProvider(providerName);
}
// Just a dumb listener that doesn't do anything - requesting location updates here
// is only intended to give location-based suggestion providers the best chance
// of getting a good fresh location.
mDummyLocationListener = new LocationListener() {
public void onLocationChanged(Location location) {
}
public void onProviderDisabled(String provider) {
}
public void onProviderEnabled(String provider) {
}
public void onStatusChanged(String provider, int status, Bundle extras) {
}
};
}
} }
/** /**
@@ -423,8 +378,6 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS
// receive broadcasts // receive broadcasts
getContext().registerReceiver(mBroadcastReceiver, mCloseDialogsFilter); getContext().registerReceiver(mBroadcastReceiver, mCloseDialogsFilter);
getContext().registerReceiver(mBroadcastReceiver, mPackageFilter); getContext().registerReceiver(mBroadcastReceiver, mPackageFilter);
startLocationUpdates();
} }
/** /**
@@ -437,8 +390,6 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS
public void onStop() { public void onStop() {
super.onStop(); super.onStop();
stopLocationUpdates();
// stop receiving broadcasts (throws exception if none registered) // stop receiving broadcasts (throws exception if none registered)
try { try {
getContext().unregisterReceiver(mBroadcastReceiver); getContext().unregisterReceiver(mBroadcastReceiver);
@@ -457,25 +408,6 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS
mPreviousComponents = null; mPreviousComponents = null;
} }
/**
* Asks the LocationManager for location updates so that it goes and gets a fresh location
* if needed.
*/
private void startLocationUpdates() {
if (mLocationManager != null && mLocationProvider != null) {
mLocationManager.requestLocationUpdates(mLocationProvider.getName(),
0, 0, mDummyLocationListener, getContext().getMainLooper());
}
}
/**
* Makes sure to stop listening for location updates to save battery.
*/
private void stopLocationUpdates() {
mLocationManager.removeUpdates(mDummyLocationListener);
}
/** /**
* Sets the search dialog to the 'working' state, which shows a working spinner in the * Sets the search dialog to the 'working' state, which shows a working spinner in the
* right hand size of the text field. * right hand size of the text field.