merge in ics-mr1-release history after reset to ics-mr1
diff --git a/res/layout/preference_progress_category.xml b/res/layout/preference_progress_category.xml
index af411ee..0a860af 100644
--- a/res/layout/preference_progress_category.xml
+++ b/res/layout/preference_progress_category.xml
@@ -30,7 +30,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:layout_gravity="center_vertical"
+        android:layout_gravity="left|bottom"
     />
 
     <TextView
@@ -38,10 +38,10 @@
         android:background="@null"
         android:paddingLeft="0dip"
         android:id="@+id/scanning_text"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_marginRight="5sp"
+        android:layout_weight="1"
+        android:layout_gravity="right|bottom"
         android:text="@string/progress_scanning"
         />
 
@@ -51,6 +51,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
+        android:layout_marginLeft="16dip"
         android:layout_marginRight="16dip"
         style="?android:attr/progressBarStyleSmallTitle"
         />
diff --git a/src/com/android/settings/ProgressCategory.java b/src/com/android/settings/ProgressCategory.java
index e854a00..c1b25d8 100644
--- a/src/com/android/settings/ProgressCategory.java
+++ b/src/com/android/settings/ProgressCategory.java
@@ -36,14 +36,14 @@
     @Override
     public void onBindView(View view) {
         super.onBindView(view);
-        final TextView textView = (TextView) view.findViewById(R.id.scanning_text);
+        final TextView scanning = (TextView) view.findViewById(R.id.scanning_text);
         final View progressBar = view.findViewById(R.id.scanning_progress);
 
-        textView.setText(mProgress ? R.string.progress_scanning : R.string.progress_tap_to_pair);
+        scanning.setText(mProgress ? R.string.progress_scanning : R.string.progress_tap_to_pair);
         boolean noDeviceFound = (getPreferenceCount() == 0 ||
                 (getPreferenceCount() == 1 && getPreference(0) == mNoDeviceFoundPreference));
-        textView.setVisibility(noDeviceFound ? View.INVISIBLE : View.VISIBLE);
-        progressBar.setVisibility(mProgress ? View.VISIBLE : View.INVISIBLE);
+        scanning.setVisibility(noDeviceFound ? View.GONE : View.VISIBLE);
+        progressBar.setVisibility(mProgress ? View.VISIBLE : View.GONE);
 
         if (mProgress || !noDeviceFound) {
             if (mNoDeviceFoundAdded) {
diff --git a/src/com/android/settings/SoundSettings.java b/src/com/android/settings/SoundSettings.java
index d0e0e94..cf7cd0a 100644
--- a/src/com/android/settings/SoundSettings.java
+++ b/src/com/android/settings/SoundSettings.java
@@ -243,6 +243,7 @@
         int vibrateMode = vibeOnRing ? AudioManager.VIBRATE_SETTING_ON
                 : AudioManager.VIBRATE_SETTING_ONLY_SILENT;
         mAudioManager.setVibrateSetting(AudioManager.VIBRATE_TYPE_RINGER, vibrateMode);
+        mAudioManager.setVibrateSetting(AudioManager.VIBRATE_TYPE_NOTIFICATION, vibrateMode);
     }
 
     private void setPhoneSilentSettingValue(String value) {
diff --git a/src/com/android/settings/applications/RunningState.java b/src/com/android/settings/applications/RunningState.java
index beb9605..1b5310d 100644
--- a/src/com/android/settings/applications/RunningState.java
+++ b/src/com/android/settings/applications/RunningState.java
@@ -815,7 +815,7 @@
         // Build the chains from client processes to the process they are
         // dependent on; also remove any old running processes.
         int NRP = mRunningProcesses.size();
-        for (int i=0; i<NRP; i++) {
+        for (int i = 0; i < NRP;) {
             ProcessItem proc = mRunningProcesses.valueAt(i);
             if (proc.mRunningSeq == mSequence) {
                 int clientPid = proc.mRunningProcessInfo.importanceReasonPid;
@@ -833,9 +833,11 @@
                     // we will detect the change.
                     proc.mClient = null;
                 }
+                i++;
             } else {
                 changed = true;
                 mRunningProcesses.remove(mRunningProcesses.keyAt(i));
+                NRP--;
             }
         }