Merge "Change filter options from being menu items to tabbed views. Remove unused strings."
diff --git a/res/xml/sound_and_display_settings.xml b/res/xml/sound_and_display_settings.xml
index 1ffbdbf..e3e3a8e 100644
--- a/res/xml/sound_and_display_settings.xml
+++ b/res/xml/sound_and_display_settings.xml
@@ -111,8 +111,7 @@
android:title="@string/haptic_feedback_enable_title"
android:summaryOn="@string/haptic_feedback_enable_summary_on"
android:summaryOff="@string/haptic_feedback_enable_summary_off"
- android:dependency="silent"
- android:order="11"
+ android:order="11"
android:defaultValue="true" />
<CheckBoxPreference
diff --git a/src/com/android/settings/MediaFormat.java b/src/com/android/settings/MediaFormat.java
index e0d9af6..e414569 100644
--- a/src/com/android/settings/MediaFormat.java
+++ b/src/com/android/settings/MediaFormat.java
@@ -68,7 +68,7 @@
IMountService.Stub.asInterface(ServiceManager.getService("mount"));
if (service != null) {
try {
- service.formatMedia(Environment.getExternalStorageDirectory().toString());
+ service.formatVolume(Environment.getExternalStorageDirectory().toString());
} catch (android.os.RemoteException e) {
// Intentionally blank - there's nothing we can do here
Log.w("MediaFormat", "Unable to invoke IMountService.formatMedia()");
diff --git a/src/com/android/settings/SdCardSettings.java b/src/com/android/settings/SdCardSettings.java
index 67f3550..75f02e7 100644
--- a/src/com/android/settings/SdCardSettings.java
+++ b/src/com/android/settings/SdCardSettings.java
@@ -169,7 +169,7 @@
OnClickListener mUnmountButtonHandler = new OnClickListener() {
public void onClick(View v) {
try {
- mMountService.unmountMedia(Environment.getExternalStorageDirectory().toString());
+ mMountService.unmountVolume(Environment.getExternalStorageDirectory().toString());
} catch (RemoteException ex) {
}
}
@@ -178,7 +178,7 @@
OnClickListener mFormatButtonHandler = new OnClickListener() {
public void onClick(View v) {
try {
- mMountService.formatMedia(Environment.getExternalStorageDirectory().toString());
+ mMountService.formatVolume(Environment.getExternalStorageDirectory().toString());
} catch (RemoteException ex) {
}
}
diff --git a/src/com/android/settings/bluetooth/DockService.java b/src/com/android/settings/bluetooth/DockService.java
index 46e3d08..4545b4e 100644
--- a/src/com/android/settings/bluetooth/DockService.java
+++ b/src/com/android/settings/bluetooth/DockService.java
@@ -374,26 +374,32 @@
mCheckedItems = new boolean[numOfProfiles];
CharSequence[] items = new CharSequence[numOfProfiles];
- int i = 0;
switch (state) {
case Intent.EXTRA_DOCK_STATE_CAR:
- items[i] = service.getString(R.string.bluetooth_dock_settings_headset);
- mProfiles[i] = Profile.HEADSET;
+ items[0] = service.getString(R.string.bluetooth_dock_settings_headset);
+ items[1] = service.getString(R.string.bluetooth_dock_settings_a2dp);
+ mProfiles[0] = Profile.HEADSET;
+ mProfiles[1] = Profile.A2DP;
if (firstTime) {
- mCheckedItems[i] = false;
+ // Enable by default for car dock
+ mCheckedItems[0] = true;
+ mCheckedItems[1] = true;
} else {
- mCheckedItems[i] = LocalBluetoothProfileManager.getProfileManager(mBtManager,
+ mCheckedItems[0] = LocalBluetoothProfileManager.getProfileManager(mBtManager,
Profile.HEADSET).isPreferred(device);
+ mCheckedItems[1] = LocalBluetoothProfileManager.getProfileManager(mBtManager,
+ Profile.A2DP).isPreferred(device);
}
- ++i;
- // fall through
+ break;
+
case Intent.EXTRA_DOCK_STATE_DESK:
- items[i] = service.getString(R.string.bluetooth_dock_settings_a2dp);
- mProfiles[i] = Profile.A2DP;
+ items[0] = service.getString(R.string.bluetooth_dock_settings_a2dp);
+ mProfiles[0] = Profile.A2DP;
if (firstTime) {
- mCheckedItems[i] = false;
+ // Disable by default for desk dock
+ mCheckedItems[0] = false;
} else {
- mCheckedItems[i] = LocalBluetoothProfileManager.getProfileManager(mBtManager,
+ mCheckedItems[0] = LocalBluetoothProfileManager.getProfileManager(mBtManager,
Profile.A2DP).isPreferred(device);
}
break;
diff --git a/src/com/android/settings/deviceinfo/Memory.java b/src/com/android/settings/deviceinfo/Memory.java
index a7f5617..422b5fe 100644
--- a/src/com/android/settings/deviceinfo/Memory.java
+++ b/src/com/android/settings/deviceinfo/Memory.java
@@ -141,7 +141,7 @@
IMountService mountService = getMountService();
try {
if (mountService != null) {
- mountService.unmountMedia(Environment.getExternalStorageDirectory().toString());
+ mountService.unmountVolume(Environment.getExternalStorageDirectory().toString());
} else {
Log.e(TAG, "Mount service is null, can't unmount");
}
@@ -155,7 +155,7 @@
IMountService mountService = getMountService();
try {
if (mountService != null) {
- mountService.mountMedia(Environment.getExternalStorageDirectory().toString());
+ mountService.mountVolume(Environment.getExternalStorageDirectory().toString());
} else {
Log.e(TAG, "Mount service is null, can't mount");
}