Merge "Fix issue #3343297 Settings force close when try to..." into honeycomb
diff --git a/res/layout/preference_bluetooth.xml b/res/layout/preference_bluetooth.xml
index d363dc9..bd437a9 100644
--- a/res/layout/preference_bluetooth.xml
+++ b/res/layout/preference_bluetooth.xml
@@ -31,7 +31,6 @@
android:id="@+id/divider"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginRight="8dip"
android:layout_gravity="center_vertical"
android:src="@drawable/nav_divider"
/>
@@ -42,6 +41,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
+ android:padding="8dip"
+ android:background="?android:attr/selectableItemBackground"
android:src="@drawable/ic_bt_config" />
</LinearLayout>
diff --git a/res/layout/preference_bluetooth_profile.xml b/res/layout/preference_bluetooth_profile.xml
index 03f598a..4b6f1dd 100644
--- a/res/layout/preference_bluetooth_profile.xml
+++ b/res/layout/preference_bluetooth_profile.xml
@@ -24,7 +24,6 @@
android:id="@+id/divider"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginRight="8dip"
android:layout_gravity="center_vertical"
android:src="@drawable/nav_divider"
/>
@@ -35,6 +34,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
+ android:padding="8dip"
+ android:background="?android:attr/selectableItemBackground"
android:src="@drawable/icon" />
</LinearLayout>
diff --git a/res/layout/user_dictionary_item.xml b/res/layout/user_dictionary_item.xml
index 926068f..3cdeb08 100644
--- a/res/layout/user_dictionary_item.xml
+++ b/res/layout/user_dictionary_item.xml
@@ -41,13 +41,10 @@
<ImageView
android:id="@+id/delete_button"
android:layout_width="wrap_content"
- android:layout_height="match_parent"
+ android:layout_height="wrap_content"
android:layout_gravity="center"
- android:paddingLeft="16dip"
- android:paddingRight="16dip"
- android:paddingTop="8dip"
- android:paddingBottom="8dip"
+ android:padding="8dip"
android:src="@drawable/ic_item_delete"
- android:background="@android:drawable/list_selector_background"
+ android:background="?android:attr/selectableItemBackground"
/>
</LinearLayout>
diff --git a/res/xml/application_settings.xml b/res/xml/application_settings.xml
index a06377d..4e77a93 100644
--- a/res/xml/application_settings.xml
+++ b/res/xml/application_settings.xml
@@ -19,32 +19,6 @@
android:summary="@string/applications_settings_summary"
android:key="applications_settings">
- <CheckBoxPreference
- android:key="toggle_install_applications"
- android:title="@string/install_applications"
- android:summaryOff="@string/install_unknown_applications"
- android:summaryOn="@string/install_unknown_applications"
- android:persistent="false" />
-
- <ListPreference
- android:key="app_install_location"
- android:title="@string/app_install_location_title"
- android:summary="@string/app_install_location_summary"
- android:persistent="false"
- android:entries="@array/app_install_location_entries"
- android:entryValues="@array/app_install_location_values"/>
-
- <!-- Disabled quick launch settings pending UI redesign.
- <PreferenceScreen
- android:key="quick_launch"
- android:title="@string/quick_launch_title"
- android:summary="@string/quick_launch_summary">
- <intent android:action="android.intent.action.MAIN"
- android:targetPackage="com.android.settings"
- android:targetClass="com.android.settings.quicklaunch.QuickLaunchSettings" />
- </PreferenceScreen>
- -->
-
<PreferenceScreen
android:fragment="com.android.settings.applications.ManageApplications"
android:title="@string/manageapplications_settings_title"
@@ -73,11 +47,38 @@
android:summary="@string/power_usage_summary">
</PreferenceScreen>
+ <CheckBoxPreference
+ android:key="toggle_install_applications"
+ android:title="@string/install_applications"
+ android:summaryOff="@string/install_unknown_applications"
+ android:summaryOn="@string/install_unknown_applications"
+ android:persistent="false" />
+
+ <ListPreference
+ android:key="app_install_location"
+ android:title="@string/app_install_location_title"
+ android:summary="@string/app_install_location_summary"
+ android:persistent="false"
+ android:entries="@array/app_install_location_entries"
+ android:entryValues="@array/app_install_location_values"/>
+
+ <!-- Disabled quick launch settings pending UI redesign.
+ <PreferenceScreen
+ android:key="quick_launch"
+ android:title="@string/quick_launch_title"
+ android:summary="@string/quick_launch_summary">
+ <intent android:action="android.intent.action.MAIN"
+ android:targetPackage="com.android.settings"
+ android:targetClass="com.android.settings.quicklaunch.QuickLaunchSettings" />
+ </PreferenceScreen>
+ -->
+
+
<PreferenceScreen
android:title="@string/development_settings_title"
android:summary="@string/development_settings_summary"
android:fragment="com.android.settings.DevelopmentSettings">
</PreferenceScreen>
-
+
</PreferenceScreen>
diff --git a/src/com/android/settings/bluetooth/BluetoothProfilePreference.java b/src/com/android/settings/bluetooth/BluetoothProfilePreference.java
index 6be1480..c74012a 100644
--- a/src/com/android/settings/bluetooth/BluetoothProfilePreference.java
+++ b/src/com/android/settings/bluetooth/BluetoothProfilePreference.java
@@ -80,9 +80,9 @@
} else {
mProfileExpandView.setOnClickListener(this);
mProfileExpandView.setTag(mProfile);
-
- mProfileExpandView.setImageResource(mExpanded ? R.drawable.ic_preferences_expanded
- : R.drawable.ic_preferences_collapsed);
+ mProfileExpandView.setImageResource(mExpanded
+ ? com.android.internal.R.drawable.expander_open_holo_dark
+ : com.android.internal.R.drawable.expander_close_holo_dark);
}
}
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index ccc40fb..2e26eba 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -265,7 +265,15 @@
}
return true;
case MENU_ID_ADVANCED:
- startFragment(this, AdvancedSettings.class.getCanonicalName(), -1, null);
+ if (getActivity() instanceof PreferenceActivity) {
+ ((PreferenceActivity) getActivity()).startPreferencePanel(
+ AdvancedSettings.class.getCanonicalName(),
+ null,
+ R.string.wifi_advanced_titlebar, null,
+ this, 0);
+ } else {
+ startFragment(this, AdvancedSettings.class.getCanonicalName(), -1, null);
+ }
return true;
}
return super.onOptionsItemSelected(item);