Merge "Align Enlish words to RTL in RTL context in networkreset Settings." into mnc-dev
diff --git a/res/layout/device_profiles_settings.xml b/res/layout/device_profiles_settings.xml
index 0f84385..87b8500 100644
--- a/res/layout/device_profiles_settings.xml
+++ b/res/layout/device_profiles_settings.xml
@@ -53,6 +53,7 @@
<LinearLayout
android:id="@+id/profiles_section"
+ android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
diff --git a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
index 5dd7098..ae42e3d 100755
--- a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
+++ b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
@@ -154,6 +154,7 @@
dismiss();
return;
}
+ addPreferencesForProfiles();
refresh();
}
}
@@ -169,16 +170,6 @@
mManager.setForegroundActivity(null);
}
- public void setDevice(CachedBluetoothDevice cachedDevice) {
- mCachedDevice = cachedDevice;
-
- if (isResumed()) {
- mCachedDevice.registerCallback(this);
- addPreferencesForProfiles();
- refresh();
- }
- }
-
private void addPreferencesForProfiles() {
mProfileContainer.removeAllViews();
for (LocalBluetoothProfile profile : mCachedDevice.getConnectableProfiles()) {
diff --git a/src/com/android/settings/wifi/WifiApDialog.java b/src/com/android/settings/wifi/WifiApDialog.java
index d30457b..b43a7ac 100644
--- a/src/com/android/settings/wifi/WifiApDialog.java
+++ b/src/com/android/settings/wifi/WifiApDialog.java
@@ -134,9 +134,10 @@
ArrayAdapter <CharSequence> channelAdapter;
String countryCode = mWifiManager.getCountryCode();
- if (!mWifiManager.is5GHzBandSupported() || countryCode == null) {
+ if (!mWifiManager.isDualBandSupported() || countryCode == null) {
//If no country code, 5GHz AP is forbidden
- Log.i(TAG," NO country code, forbid 5GHz");
+ Log.i(TAG,(!mWifiManager.isDualBandSupported() ? "Device do not support 5GHz " :"")
+ + (countryCode == null ? " NO country code" :"") + " forbid 5GHz");
channelAdapter = ArrayAdapter.createFromResource(mContext,
R.array.wifi_ap_band_config_2G_only, android.R.layout.simple_spinner_item);
mWifiConfig.apBand = 0;