From dbe6f5896265b3e1525e8a8d9277ea2cc437be49 Mon Sep 17 00:00:00 2001 From: Christopher Tate Date: Mon, 10 Sep 2012 15:39:05 -0700 Subject: Update Settings app to use new namespace for airplane-mode settings Bug 7132230 Change-Id: I0253637e6d464afc229cf11ffe69852bf44fe261 --- src/com/android/settings/AirplaneModeEnabler.java | 11 ++++++----- src/com/android/settings/CryptKeeper.java | 5 +++-- src/com/android/settings/WirelessSettings.java | 16 ++++++++-------- src/com/android/settings/wifi/WifiApEnabler.java | 4 ++-- 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/src/com/android/settings/AirplaneModeEnabler.java b/src/com/android/settings/AirplaneModeEnabler.java index 94ba5a1..d1c591e 100644 --- a/src/com/android/settings/AirplaneModeEnabler.java +++ b/src/com/android/settings/AirplaneModeEnabler.java @@ -22,6 +22,7 @@ import android.database.ContentObserver; import android.os.Handler; import android.os.Message; import android.os.SystemProperties; +import android.os.UserHandle; import android.preference.CheckBoxPreference; import android.preference.Preference; import android.provider.Settings; @@ -75,7 +76,7 @@ public class AirplaneModeEnabler implements Preference.OnPreferenceChangeListene mPhoneStateReceiver.registerIntent(); mCheckBoxPref.setOnPreferenceChangeListener(this); mContext.getContentResolver().registerContentObserver( - Settings.System.getUriFor(Settings.System.AIRPLANE_MODE_ON), true, + Settings.Global.getUriFor(Settings.Global.AIRPLANE_MODE_ON), true, mAirplaneModeObserver); } @@ -86,13 +87,13 @@ public class AirplaneModeEnabler implements Preference.OnPreferenceChangeListene } public static boolean isAirplaneModeOn(Context context) { - return Settings.System.getInt(context.getContentResolver(), - Settings.System.AIRPLANE_MODE_ON, 0) != 0; + return Settings.Global.getInt(context.getContentResolver(), + Settings.Global.AIRPLANE_MODE_ON, 0) != 0; } private void setAirplaneModeOn(boolean enabling) { // Change the system setting - Settings.System.putInt(mContext.getContentResolver(), Settings.System.AIRPLANE_MODE_ON, + Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, enabling ? 1 : 0); // Update the UI to reflect system setting mCheckBoxPref.setChecked(enabling); @@ -100,7 +101,7 @@ public class AirplaneModeEnabler implements Preference.OnPreferenceChangeListene // Post the intent Intent intent = new Intent(Intent.ACTION_AIRPLANE_MODE_CHANGED); intent.putExtra("state", enabling); - mContext.sendBroadcast(intent); + mContext.sendBroadcastAsUser(intent, UserHandle.ALL); } /** diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java index 4cab767..5872a05 100644 --- a/src/com/android/settings/CryptKeeper.java +++ b/src/com/android/settings/CryptKeeper.java @@ -32,6 +32,7 @@ import android.os.PowerManager; import android.os.RemoteException; import android.os.ServiceManager; import android.os.SystemProperties; +import android.os.UserHandle; import android.os.storage.IMountService; import android.provider.Settings; import android.telephony.TelephonyManager; @@ -641,10 +642,10 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList TelephonyManager.getDefault().getLteOnCdmaMode() == PhoneConstants.LTE_ON_CDMA_TRUE; if (!isLteDevice) { Log.d(TAG, "Going into airplane mode."); - Settings.System.putInt(getContentResolver(), Settings.System.AIRPLANE_MODE_ON, 1); + Settings.Global.putInt(getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 1); final Intent intent = new Intent(Intent.ACTION_AIRPLANE_MODE_CHANGED); intent.putExtra("state", true); - sendBroadcast(intent); + sendBroadcastAsUser(intent, UserHandle.ALL); } } diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java index 347315a..c2a3f19 100644 --- a/src/com/android/settings/WirelessSettings.java +++ b/src/com/android/settings/WirelessSettings.java @@ -85,8 +85,8 @@ public class WirelessSettings extends SettingsPreferenceFragment { return true; } // Here we use the same logic in onCreate(). - String toggleable = Settings.System.getString(context.getContentResolver(), - Settings.System.AIRPLANE_MODE_TOGGLEABLE_RADIOS); + String toggleable = Settings.Global.getString(context.getContentResolver(), + Settings.Global.AIRPLANE_MODE_TOGGLEABLE_RADIOS); return toggleable != null && toggleable.contains(type); } @@ -109,8 +109,8 @@ public class WirelessSettings extends SettingsPreferenceFragment { getPreferenceScreen().removePreference(nsd); //mNsdEnabler = new NsdEnabler(activity, nsd); - String toggleable = Settings.System.getString(activity.getContentResolver(), - Settings.System.AIRPLANE_MODE_TOGGLEABLE_RADIOS); + String toggleable = Settings.Global.getString(activity.getContentResolver(), + Settings.Global.AIRPLANE_MODE_TOGGLEABLE_RADIOS); //enable/disable wimax depending on the value in config.xml boolean isWimaxEnabled = this.getResources().getBoolean( @@ -120,24 +120,24 @@ public class WirelessSettings extends SettingsPreferenceFragment { Preference ps = (Preference) findPreference(KEY_WIMAX_SETTINGS); if (ps != null) root.removePreference(ps); } else { - if (toggleable == null || !toggleable.contains(Settings.System.RADIO_WIMAX ) + if (toggleable == null || !toggleable.contains(Settings.Global.RADIO_WIMAX ) && isWimaxEnabled) { Preference ps = (Preference) findPreference(KEY_WIMAX_SETTINGS); ps.setDependency(KEY_TOGGLE_AIRPLANE); } } // Manually set dependencies for Wifi when not toggleable. - if (toggleable == null || !toggleable.contains(Settings.System.RADIO_WIFI)) { + if (toggleable == null || !toggleable.contains(Settings.Global.RADIO_WIFI)) { findPreference(KEY_VPN_SETTINGS).setDependency(KEY_TOGGLE_AIRPLANE); } // Manually set dependencies for Bluetooth when not toggleable. - if (toggleable == null || !toggleable.contains(Settings.System.RADIO_BLUETOOTH)) { + if (toggleable == null || !toggleable.contains(Settings.Global.RADIO_BLUETOOTH)) { // No bluetooth-dependent items in the list. Code kept in case one is added later. } // Manually set dependencies for NFC when not toggleable. - if (toggleable == null || !toggleable.contains(Settings.System.RADIO_NFC)) { + if (toggleable == null || !toggleable.contains(Settings.Global.RADIO_NFC)) { findPreference(KEY_TOGGLE_NFC).setDependency(KEY_TOGGLE_AIRPLANE); findPreference(KEY_ANDROID_BEAM_SETTINGS).setDependency(KEY_TOGGLE_AIRPLANE); } diff --git a/src/com/android/settings/wifi/WifiApEnabler.java b/src/com/android/settings/wifi/WifiApEnabler.java index f3fd566..9a3b49d 100644 --- a/src/com/android/settings/wifi/WifiApEnabler.java +++ b/src/com/android/settings/wifi/WifiApEnabler.java @@ -98,8 +98,8 @@ public class WifiApEnabler { } private void enableWifiCheckBox() { - boolean isAirplaneMode = Settings.System.getInt(mContext.getContentResolver(), - Settings.System.AIRPLANE_MODE_ON, 0) != 0; + boolean isAirplaneMode = Settings.Global.getInt(mContext.getContentResolver(), + Settings.Global.AIRPLANE_MODE_ON, 0) != 0; if(!isAirplaneMode) { mCheckBox.setEnabled(true); } else { -- cgit v1.1 From 7bbfc863c6257a2be62176bcce59246052eb27a9 Mon Sep 17 00:00:00 2001 From: Christopher Tate Date: Tue, 11 Sep 2012 14:53:25 -0700 Subject: Wifi settings are in a different namespace now Bug 7144874 Change-Id: I9d004f7e9d33c821fb64cf789036b6b4e0a23a8e --- src/com/android/settings/wifi/AdvancedWifiSettings.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/wifi/AdvancedWifiSettings.java b/src/com/android/settings/wifi/AdvancedWifiSettings.java index c9bf3bc..f574808 100644 --- a/src/com/android/settings/wifi/AdvancedWifiSettings.java +++ b/src/com/android/settings/wifi/AdvancedWifiSettings.java @@ -113,9 +113,9 @@ public class AdvancedWifiSettings extends SettingsPreferenceFragment sleepPolicyPref.setEntries(R.array.wifi_sleep_policy_entries_wifi_only); } sleepPolicyPref.setOnPreferenceChangeListener(this); - int value = Settings.System.getInt(getContentResolver(), - Settings.System.WIFI_SLEEP_POLICY, - Settings.System.WIFI_SLEEP_POLICY_NEVER); + int value = Settings.Global.getInt(getContentResolver(), + Settings.Global.WIFI_SLEEP_POLICY, + Settings.Global.WIFI_SLEEP_POLICY_NEVER); String stringValue = String.valueOf(value); sleepPolicyPref.setValue(stringValue); updateSleepPolicySummary(sleepPolicyPref, stringValue); @@ -181,7 +181,7 @@ public class AdvancedWifiSettings extends SettingsPreferenceFragment if (KEY_SLEEP_POLICY.equals(key)) { try { String stringValue = (String) newValue; - Settings.System.putInt(getContentResolver(), Settings.System.WIFI_SLEEP_POLICY, + Settings.Global.putInt(getContentResolver(), Settings.Global.WIFI_SLEEP_POLICY, Integer.parseInt(stringValue)); updateSleepPolicySummary(preference, stringValue); } catch (NumberFormatException e) { -- cgit v1.1 From a053ae2dea1b167aae58e075e8e4e9a00ebf3992 Mon Sep 17 00:00:00 2001 From: Michael Jurka Date: Fri, 14 Sep 2012 14:09:16 -0700 Subject: Fix crash in Settings > Security Change-Id: Ib439c652f4f8a55cac710dbd22792943a7ef8f98 --- src/com/android/settings/SecuritySettings.java | 28 ++++++++++++++------------ 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java index e9e3a19..ce59fdd 100644 --- a/src/com/android/settings/SecuritySettings.java +++ b/src/com/android/settings/SecuritySettings.java @@ -254,19 +254,21 @@ public class SecuritySettings extends SettingsPreferenceFragment } mUserSelectedWidget = root.findPreference(KEY_CHOOSE_USER_SELECTED_LOCKSCREEN_WIDGET); - AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(getActivity()); - int appWidgetId = -1; - String appWidgetIdString = Settings.Secure.getString( - getContentResolver(), Settings.Secure.LOCK_SCREEN_USER_SELECTED_APPWIDGET_ID); - if (appWidgetIdString != null) {; - appWidgetId = (int) Integer.decode(appWidgetIdString); - } - if (appWidgetId == -1) { - mUserSelectedWidget.setSummary(getResources().getString(R.string.widget_none)); - } else { - AppWidgetProviderInfo appWidget = appWidgetManager.getAppWidgetInfo(appWidgetId); - if (appWidget != null) { - mUserSelectedWidget.setSummary(appWidget.label); + if (mUserSelectedWidget != null) { + AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(getActivity()); + int appWidgetId = -1; + String appWidgetIdString = Settings.Secure.getString( + getContentResolver(), Settings.Secure.LOCK_SCREEN_USER_SELECTED_APPWIDGET_ID); + if (appWidgetIdString != null) {; + appWidgetId = (int) Integer.decode(appWidgetIdString); + } + if (appWidgetId == -1) { + mUserSelectedWidget.setSummary(getResources().getString(R.string.widget_none)); + } else { + AppWidgetProviderInfo appWidget = appWidgetManager.getAppWidgetInfo(appWidgetId); + if (appWidget != null) { + mUserSelectedWidget.setSummary(appWidget.label); + } } } -- cgit v1.1 From 5a72c6733d53e493dd5c45c859765b83bd5c47bd Mon Sep 17 00:00:00 2001 From: Robert Greenwalt Date: Sun, 16 Sep 2012 17:03:08 -0700 Subject: Must initialize the new atomic.. bug:7172859 Change-Id: Ibaf390683fa36771215b463fb6b088f7430c0462 --- src/com/android/settings/TetherSettings.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java index 1564803..df44e91 100644 --- a/src/com/android/settings/TetherSettings.java +++ b/src/com/android/settings/TetherSettings.java @@ -79,7 +79,7 @@ public class TetherSettings extends SettingsPreferenceFragment private String[] mWifiRegexs; private String[] mBluetoothRegexs; - private AtomicReference mBluetoothPan; + private AtomicReference mBluetoothPan = new AtomicReference(); private static final String WIFI_AP_SSID_AND_SECURITY = "wifi_ap_ssid_and_security"; private static final int CONFIG_SUBTEXT = R.string.wifi_tether_configure_subtext; -- cgit v1.1 From 682298bc345aee2590bf864a16985a9322586473 Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Tue, 18 Sep 2012 12:04:00 -0700 Subject: Fix issue #7178865: Selecting an app from Settings > Apps>... ...all crashes on a secondary user Change-Id: I977932bce3ea2816e4c9d1002488b658a96e3986 --- .../settings/applications/InstalledAppDetails.java | 23 +++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java index 907bf53..2284b91 100644 --- a/src/com/android/settings/applications/InstalledAppDetails.java +++ b/src/com/android/settings/applications/InstalledAppDetails.java @@ -379,8 +379,6 @@ public class InstalledAppDetails extends Fragment @Override public void onCreate(Bundle icicle) { super.onCreate(icicle); - - setHasOptionsMenu(true); mState = ApplicationsState.getInstance(getActivity().getApplication()); mSession = mState.newSession(this); @@ -393,6 +391,10 @@ public class InstalledAppDetails extends Fragment mSmsManager = ISms.Stub.asInterface(ServiceManager.getService("isms")); mCanBeOnSdCardChecker = new CanBeOnSdCardChecker(); + + retrieveAppEntry(); + + setHasOptionsMenu(true); } @Override @@ -452,6 +454,8 @@ public class InstalledAppDetails extends Fragment boolean showIt = true; if (mUpdatedSysApp) { showIt = false; + } else if (mAppEntry == null) { + showIt = false; } else if ((mAppEntry.info.flags & ApplicationInfo.FLAG_SYSTEM) != 0) { showIt = false; } else if (mDpm.packageHasActiveAdmins(mPackageInfo.packageName)) { @@ -549,10 +553,7 @@ public class InstalledAppDetails extends Fragment public void onRunningStateChanged(boolean running) { } - private boolean refreshUi() { - if (mMoveInProgress) { - return true; - } + private String retrieveAppEntry() { final Bundle args = getArguments(); String packageName = (args != null) ? args.getString(ARG_PACKAGE_NAME) : null; if (packageName == null) { @@ -563,7 +564,15 @@ public class InstalledAppDetails extends Fragment } } mAppEntry = mState.getEntry(packageName); - + return packageName; + } + + private boolean refreshUi() { + if (mMoveInProgress) { + return true; + } + final String packageName = retrieveAppEntry(); + if (mAppEntry == null) { return false; // onCreate must have failed, make sure to exit } -- cgit v1.1 From 352c9017658510fcf31d0a905882de611db7eb3b Mon Sep 17 00:00:00 2001 From: Adam Cohen Date: Tue, 18 Sep 2012 13:26:29 -0700 Subject: Tweaking mechanism for adding keyguard widgets -> Fix for issue 7173877 -> Fix for issue 7173587 Change-Id: I266cafcf175c98e0c8a8401e11faa5dd2e2fa885 Conflicts: src/com/android/settings/SecuritySettings.java --- src/com/android/settings/SecuritySettings.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java index d896a68..7ffa805 100644 --- a/src/com/android/settings/SecuritySettings.java +++ b/src/com/android/settings/SecuritySettings.java @@ -455,8 +455,7 @@ public class SecuritySettings extends SettingsPreferenceFragment Intent pickIntent = new Intent(AppWidgetManager.ACTION_APPWIDGET_PICK); // Found in KeyguardHostView.java final int KEYGUARD_HOST_ID = 0x4B455947; - int appWidgetId = AppWidgetHost.allocateAppWidgetIdForHost( - "com.android.internal.policy.impl.keyguard", KEYGUARD_HOST_ID); + int appWidgetId = AppWidgetHost.allocateAppWidgetIdForSystem(KEYGUARD_HOST_ID); if (appWidgetId != -1) { pickIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId); pickIntent.putExtra(AppWidgetManager.EXTRA_CUSTOM_SORT, false); @@ -597,7 +596,7 @@ public class SecuritySettings extends SettingsPreferenceFragment Integer.toString(appWidgetId)); } else { - AppWidgetHost.deleteAppWidgetIdForHost(appWidgetId); + AppWidgetHost.deleteAppWidgetIdForSystem(appWidgetId); } } createPreferenceHierarchy(); -- cgit v1.1 From 45410f3e85772b7f62a45f4755bfa31d71dce91c Mon Sep 17 00:00:00 2001 From: Amith Yamasani Date: Wed, 19 Sep 2012 10:58:32 -0700 Subject: Fix a crash in InstalledAppDetails Initialize mPackageInfo in onCreate Bug: 7194755 Change-Id: Ic82351591bd38c4c161bbb23c4033038d1d7fa85 --- .../settings/applications/InstalledAppDetails.java | 23 ++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java index 2284b91..97d7b75 100644 --- a/src/com/android/settings/applications/InstalledAppDetails.java +++ b/src/com/android/settings/applications/InstalledAppDetails.java @@ -564,6 +564,16 @@ public class InstalledAppDetails extends Fragment } } mAppEntry = mState.getEntry(packageName); + // Get application info again to refresh changed properties of application + try { + mPackageInfo = mPm.getPackageInfo(mAppEntry.info.packageName, + PackageManager.GET_DISABLED_COMPONENTS | + PackageManager.GET_UNINSTALLED_PACKAGES | + PackageManager.GET_SIGNATURES); + } catch (NameNotFoundException e) { + Log.e(TAG, "Exception when retrieving package:" + mAppEntry.info.packageName, e); + } + return packageName; } @@ -576,18 +586,11 @@ public class InstalledAppDetails extends Fragment if (mAppEntry == null) { return false; // onCreate must have failed, make sure to exit } - - // Get application info again to refresh changed properties of application - try { - mPackageInfo = mPm.getPackageInfo(mAppEntry.info.packageName, - PackageManager.GET_DISABLED_COMPONENTS | - PackageManager.GET_UNINSTALLED_PACKAGES | - PackageManager.GET_SIGNATURES); - } catch (NameNotFoundException e) { - Log.e(TAG, "Exception when retrieving package:" + mAppEntry.info.packageName, e); + + if (mPackageInfo == null) { return false; // onCreate must have failed, make sure to exit } - + // Get list of preferred activities List prefActList = new ArrayList(); -- cgit v1.1 From cb0a6ccba971692e591369100533f7df974b47c8 Mon Sep 17 00:00:00 2001 From: Brian Muramatsu Date: Wed, 19 Sep 2012 11:19:54 -0700 Subject: Fix NPE in DeviceInfoSettings Bug 7192187 Change-Id: I6d404e5228c7f66e37137a27ebd555a88dda2f74 --- src/com/android/settings/DeviceInfoSettings.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java index 258ea64..eb9e918 100644 --- a/src/com/android/settings/DeviceInfoSettings.java +++ b/src/com/android/settings/DeviceInfoSettings.java @@ -175,7 +175,10 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment { private void removePreferenceIfBoolFalse(String preference, int resId) { if (!getResources().getBoolean(resId)) { - getPreferenceScreen().removePreference(findPreference(preference)); + Preference pref = findPreference(preference); + if (pref != null) { + getPreferenceScreen().removePreference(pref); + } } } -- cgit v1.1 From 085d9b0db0fc7b36a9094c7ee28799d0c1210e5e Mon Sep 17 00:00:00 2001 From: Adam Cohen Date: Fri, 21 Sep 2012 18:52:24 -0700 Subject: Addressing issue where power control widget disappears issue 7205586 Change-Id: I6eea146d3819d3b35f1420e59d4ebdbc66041a9e --- .../android/settings/widget/SettingsAppWidgetProvider.java | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/com/android/settings/widget/SettingsAppWidgetProvider.java b/src/com/android/settings/widget/SettingsAppWidgetProvider.java index 30ae7c3..a722818 100644 --- a/src/com/android/settings/widget/SettingsAppWidgetProvider.java +++ b/src/com/android/settings/widget/SettingsAppWidgetProvider.java @@ -637,23 +637,11 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider { @Override public void onEnabled(Context context) { - Class clazz = com.android.settings.widget.SettingsAppWidgetProvider.class; - PackageManager pm = context.getPackageManager(); - pm.setComponentEnabledSetting( - new ComponentName(context.getPackageName(), clazz.getName()), - PackageManager.COMPONENT_ENABLED_STATE_ENABLED, - PackageManager.DONT_KILL_APP); checkObserver(context); } @Override public void onDisabled(Context context) { - Class clazz = com.android.settings.widget.SettingsAppWidgetProvider.class; - PackageManager pm = context.getPackageManager(); - pm.setComponentEnabledSetting( - new ComponentName(context.getPackageName(), clazz.getName()), - PackageManager.COMPONENT_ENABLED_STATE_DISABLED, - PackageManager.DONT_KILL_APP); if (sSettingsObserver != null) { sSettingsObserver.stopObserving(); sSettingsObserver = null; -- cgit v1.1 From c41d69f56f7b9a8e87beac992013239dceea036b Mon Sep 17 00:00:00 2001 From: Jeff Brown Date: Mon, 24 Sep 2012 20:33:51 -0700 Subject: Fix regression in Bluetooth settings. Bug: 7207090 Change-Id: Ie14a1d36a61b571766d2025ed7d8079712727690 --- res/xml/device_picker.xml | 2 +- res/xml/wifi_access_points.xml | 2 +- .../bluetooth/BluetoothProgressCategory.java | 29 ++++++++++++++++++++++ .../settings/bluetooth/BluetoothSettings.java | 3 +-- .../bluetooth/DeviceListPreferenceFragment.java | 4 +-- 5 files changed, 34 insertions(+), 6 deletions(-) create mode 100644 src/com/android/settings/bluetooth/BluetoothProgressCategory.java diff --git a/res/xml/device_picker.xml b/res/xml/device_picker.xml index 43b5829..9fef34d 100644 --- a/res/xml/device_picker.xml +++ b/res/xml/device_picker.xml @@ -21,7 +21,7 @@ android:key="bt_scan" android:title="@string/bluetooth_preference_scan_title" /> - diff --git a/res/xml/wifi_access_points.xml b/res/xml/wifi_access_points.xml index 48104dd..7b8c92b 100644 --- a/res/xml/wifi_access_points.xml +++ b/res/xml/wifi_access_points.xml @@ -17,7 +17,7 @@ - diff --git a/src/com/android/settings/bluetooth/BluetoothProgressCategory.java b/src/com/android/settings/bluetooth/BluetoothProgressCategory.java new file mode 100644 index 0000000..1c81360 --- /dev/null +++ b/src/com/android/settings/bluetooth/BluetoothProgressCategory.java @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.settings.bluetooth; + +import com.android.settings.ProgressCategory; +import com.android.settings.R; + +import android.content.Context; +import android.util.AttributeSet; + +public class BluetoothProgressCategory extends ProgressCategory { + public BluetoothProgressCategory(Context context, AttributeSet attrs) { + super(context, attrs, R.string.bluetooth_no_devices_found); + } +} diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java index 0765d8f..e9ba39d 100755 --- a/src/com/android/settings/bluetooth/BluetoothSettings.java +++ b/src/com/android/settings/bluetooth/BluetoothSettings.java @@ -282,8 +282,7 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment { // Available devices category if (mAvailableDevicesCategory == null) { - mAvailableDevicesCategory = new ProgressCategory(getActivity(), null, - R.string.bluetooth_no_devices_found); + mAvailableDevicesCategory = new BluetoothProgressCategory(getActivity(), null); } else { mAvailableDevicesCategory.removeAll(); } diff --git a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java index 90f8de5..7fc1b65 100644 --- a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java +++ b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java @@ -193,8 +193,8 @@ public abstract class DeviceListPreferenceFragment extends } private void updateProgressUi(boolean start) { - if (mDeviceListGroup instanceof ProgressCategory) { - ((ProgressCategory) mDeviceListGroup).setProgress(start); + if (mDeviceListGroup instanceof BluetoothProgressCategory) { + ((BluetoothProgressCategory) mDeviceListGroup).setProgress(start); } } -- cgit v1.1 From 2a840aef3ae2abdf0d85b45f2ca3489ee7d74309 Mon Sep 17 00:00:00 2001 From: Russell Brenner Date: Thu, 27 Sep 2012 11:37:54 -0700 Subject: Show warnings when skipping Wi-Fi connection If user skips over Wi-Fi, warn about possible carrier data charges or inability to receive updates, depending on whether or not phone service is available. Note to translators: Some strings are being moved here from setup wizard. They're tagged with their msgid's so as not to trigger retranslation. Bug: 7211786 Change-Id: Idec7863377bd453d1808b26ee3da75f8310b32e0 --- res/layout/setup_preference.xml | 17 +++-- res/values/strings.xml | 18 ++++- src/com/android/settings/wifi/WifiSettings.java | 89 +++++++++++++++++++++++++ 3 files changed, 119 insertions(+), 5 deletions(-) diff --git a/res/layout/setup_preference.xml b/res/layout/setup_preference.xml index 30b3373..c2f6989 100644 --- a/res/layout/setup_preference.xml +++ b/res/layout/setup_preference.xml @@ -30,7 +30,7 @@ android:gravity="bottom"> + android:layout_below="@id/title_bar" /> @@ -148,6 +148,14 @@ android:layout_margin="5dip" android:text="@string/wifi_setup_back" /> +