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

Merge branch 'master' into honeycomb-release

Browse Source
This commit is contained in:
The Android Automerger
2010-12-06 07:27:00 -08:00
parent 4eb88da595 71ac31906a
commit 5a021d9000
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/values/strings.xml
View File

@@ -1404,11 +1404,9 @@
<string name="device_status">Status</string> <string name="device_status">Status</string>
<!-- About phone screen, summary of the item to go into the phone status screen --> <!-- About phone screen, summary of the item to go into the phone status screen -->
<string name="device_status_summary">Phone number, signal, etc.</string> <string name="device_status_summary">Phone number, signal, etc.</string>
<!-- Main settings screen item's title to go into the SD card and storage settings screen [CHAR LIMIT=25] --> <!-- Main settings screen item's title to go into the storage settings screen [CHAR LIMIT=25] -->
<string name="storage_settings" product="nosdcard">Shared &amp; secure storage</string> <string name="storage_settings" >Storage</string>
<!-- Main settings screen item's title to go into the SD card and storage settings screen--> <!-- Storage settings screen title -->
<string name="storage_settings" product="default">Storage</string>
<!-- SD card and storage settings screen title -->
<string name="storage_settings_title">Storage settings</string> <string name="storage_settings_title">Storage settings</string>
<!-- [CHAR LIMIT=100] Main settings screen item's summary for the SD card and storage settings --> <!-- [CHAR LIMIT=100] Main settings screen item's summary for the SD card and storage settings -->
<string name="storage_settings_summary" product="nosdcard">Unmount USB storage, view available storage</string> <string name="storage_settings_summary" product="nosdcard">Unmount USB storage, view available storage</string>

1
src/com/android/settings/accounts/AccountSyncSettings.java
View File

@@ -346,6 +346,7 @@ public class AccountSyncSettings extends AccountPreferenceBase {
@Override @Override
protected void onSyncStateUpdated() { protected void onSyncStateUpdated() {
if (!isResumed()) return;
// iterate over all the preferences, setting the state properly for each // iterate over all the preferences, setting the state properly for each
Date date = new Date(); Date date = new Date();
List<SyncInfo> currentSyncs = ContentResolver.getCurrentSyncs(); List<SyncInfo> currentSyncs = ContentResolver.getCurrentSyncs();

6
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -124,7 +124,8 @@ public class WifiSettings extends SettingsPreferenceFragment
mFilter.addAction(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION); mFilter.addAction(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION);
mFilter.addAction(WifiManager.NETWORK_IDS_CHANGED_ACTION); mFilter.addAction(WifiManager.NETWORK_IDS_CHANGED_ACTION);
mFilter.addAction(WifiManager.SUPPLICANT_STATE_CHANGED_ACTION); mFilter.addAction(WifiManager.SUPPLICANT_STATE_CHANGED_ACTION);
mFilter.addAction(WifiManager.SUPPLICANT_CONFIG_CHANGED_ACTION); mFilter.addAction(WifiManager.CONFIGURED_NETWORKS_CHANGED_ACTION);
mFilter.addAction(WifiManager.LINK_CONFIGURATION_CHANGED_ACTION);
mFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION); mFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);
mFilter.addAction(WifiManager.RSSI_CHANGED_ACTION); mFilter.addAction(WifiManager.RSSI_CHANGED_ACTION);
@@ -423,7 +424,8 @@ public class WifiSettings extends SettingsPreferenceFragment
updateWifiState(intent.getIntExtra(WifiManager.EXTRA_WIFI_STATE, updateWifiState(intent.getIntExtra(WifiManager.EXTRA_WIFI_STATE,
WifiManager.WIFI_STATE_UNKNOWN)); WifiManager.WIFI_STATE_UNKNOWN));
} else if (WifiManager.SCAN_RESULTS_AVAILABLE_ACTION.equals(action) || } else if (WifiManager.SCAN_RESULTS_AVAILABLE_ACTION.equals(action) ||
WifiManager.SUPPLICANT_CONFIG_CHANGED_ACTION.equals(action)) { WifiManager.CONFIGURED_NETWORKS_CHANGED_ACTION.equals(action) ||
WifiManager.LINK_CONFIGURATION_CHANGED_ACTION.equals(action)) {
updateAccessPoints(); updateAccessPoints();
} else if (WifiManager.SUPPLICANT_STATE_CHANGED_ACTION.equals(action)) { } else if (WifiManager.SUPPLICANT_STATE_CHANGED_ACTION.equals(action)) {
//Ignore supplicant state changes when network is connected //Ignore supplicant state changes when network is connected