PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of 0eb550ef to master

Browse Source 
Change-Id: Id7434c6e95a688bf97786177a8dbecb4c3c5dc95
This commit is contained in:
Jean-Baptiste Queru
2010-10-10 08:25:21 -07:00
parent 12a821c7ba 0eb550efe2
commit 902c4a6698
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/widget/SettingsAppWidgetProvider.java
View File

@@ -23,8 +23,8 @@ import android.bluetooth.BluetoothAdapter;
import android.content.ComponentName;
import android.content.ContentResolver;
import android.content.Context;
import android.content.IContentService;
import android.content.Intent;
import android.content.SyncStorageEngine;
import android.content.pm.PackageManager;
import android.location.LocationManager;
import android.net.ConnectivityManager;
@@ -538,9 +538,6 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider {
@Override
public void onActualStateChange(Context context, Intent unused) {
// Well, ACTION_CLOSE_SYSTEM_DIALOGS fired. So _maybe_
// the Sync settings changed.
// TODO: find something more reliable.
setCurrentState(context, getActualState(context));
}
@@ -713,11 +710,8 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider {
sBluetoothState.onActualStateChange(context, intent);
} else if (LocationManager.PROVIDERS_CHANGED_ACTION.equals(action)) {
sGpsState.onActualStateChange(context, intent);
} else if (Intent.ACTION_CLOSE_SYSTEM_DIALOGS.equals(action)) {
// Sadly, for lack of a "sync settings changed" intent,
// this is where we check where sync is enabled or not.
// It's not 100% reliable though as there are paths where
// this doesn't fire.
} else if (SyncStorageEngine.SYNC_CONNECTION_SETTING_CHANGED_INTENT.getAction()
.equals(action)) {
sSyncState.onActualStateChange(context, intent);
} else if (intent.hasCategory(Intent.CATEGORY_ALTERNATIVE)) {
Uri data = intent.getData();