Merge "Intrument the act of banning a package's notifications."
diff --git a/res/drawable/wifi_signal_colored.xml b/res/drawable/wifi_signal_colored.xml
index 4eb41c0..91f8b88 100644
--- a/res/drawable/wifi_signal_colored.xml
+++ b/res/drawable/wifi_signal_colored.xml
@@ -20,22 +20,22 @@
<level-list>
<item android:maxLevel="0">
<bitmap
- android:src="@drawable/ic_wifi_lock_signal_1_light"
+ android:src="@drawable/ic_wifi_lock_signal_1_teal"
android:tint="?attr/wifi_signal_color" />
</item>
<item android:maxLevel="1">
<bitmap
- android:src="@drawable/ic_wifi_lock_signal_2_light"
+ android:src="@drawable/ic_wifi_lock_signal_2_teal"
android:tint="?attr/wifi_signal_color" />
</item>
<item android:maxLevel="2">
<bitmap
- android:src="@drawable/ic_wifi_lock_signal_3_light"
+ android:src="@drawable/ic_wifi_lock_signal_3_teal"
android:tint="?attr/wifi_signal_color" />
</item>
<item android:maxLevel="3">
<bitmap
- android:src="@drawable/ic_wifi_lock_signal_4_light"
+ android:src="@drawable/ic_wifi_lock_signal_4_teal"
android:tint="?attr/wifi_signal_color" />
</item>
</level-list>
@@ -44,22 +44,22 @@
<level-list>
<item android:maxLevel="0">
<bitmap
- android:src="@drawable/ic_wifi_signal_1_light"
+ android:src="@drawable/ic_wifi_signal_1_teal"
android:tint="?attr/wifi_signal_color" />
</item>
<item android:maxLevel="1">
<bitmap
- android:src="@drawable/ic_wifi_signal_2_light"
+ android:src="@drawable/ic_wifi_signal_2_teal"
android:tint="?attr/wifi_signal_color" />
</item>
<item android:maxLevel="2">
<bitmap
- android:src="@drawable/ic_wifi_signal_3_light"
+ android:src="@drawable/ic_wifi_signal_3_teal"
android:tint="?attr/wifi_signal_color" />
</item>
<item android:maxLevel="3">
<bitmap
- android:src="@drawable/ic_wifi_signal_4_light"
+ android:src="@drawable/ic_wifi_signal_4_teal"
android:tint="?attr/wifi_signal_color" />
</item>
</level-list>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index dd7382f..e9da7fe 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -47,8 +47,8 @@
<color name="setup_lock_pattern_view_success_color_light">@color/suw_color_accent_light</color>
<color name="setup_lock_pattern_view_error_color_dark">#fff44336</color>
<color name="setup_lock_pattern_view_error_color_light">@color/lock_pattern_view_error_color</color>
- <color name="setup_wizard_wifi_color_dark">#ff00e4ff</color>
- <color name="setup_wizard_wifi_color_light">#ff0096a6</color>
+ <color name="setup_wizard_wifi_color_dark">#ff448aff</color>
+ <color name="setup_wizard_wifi_color_light">#ff3367d6</color>
<color name="lock_pattern_background">#00000000</color>
<color name="lock_pattern_view_regular_color">#ff37474f</color>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 0d28126..2c900bb 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -41,7 +41,7 @@
<item name="setup_divider_color">@color/setup_divider_color_dark</item>
<item name="side_margin">0dip</item>
<item name="wifi_signal_color">@color/setup_wizard_wifi_color_dark</item>
- <item name="wifi_signal">@drawable/wifi_signal_teal</item>
+ <item name="wifi_signal">@drawable/wifi_signal_colored</item>
<item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
<!-- LockPatternView colors -->
@@ -62,7 +62,7 @@
<item name="setup_divider_color">@color/setup_divider_color_light</item>
<item name="side_margin">0dip</item>
<item name="wifi_signal_color">@color/setup_wizard_wifi_color_light</item>
- <item name="wifi_signal">@drawable/wifi_signal_teal</item>
+ <item name="wifi_signal">@drawable/wifi_signal_colored</item>
<item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
<!-- LockPatternView colors -->
diff --git a/src/com/android/settings/utils/VoiceSettingsActivity.java b/src/com/android/settings/utils/VoiceSettingsActivity.java
index 21849a4..2553a54 100644
--- a/src/com/android/settings/utils/VoiceSettingsActivity.java
+++ b/src/com/android/settings/utils/VoiceSettingsActivity.java
@@ -21,11 +21,13 @@
import android.app.Activity;
import android.app.Fragment;
import android.app.VoiceInteractor;
+import android.app.VoiceInteractor.AbortVoiceRequest;
import android.app.VoiceInteractor.CompleteVoiceRequest;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import android.widget.TextView;
+import android.widget.Toast;
import android.util.Log;
/**
@@ -65,6 +67,10 @@
* not null, then it will be read to the user.
*/
protected void notifySuccess(CharSequence prompt) {
+ if (prompt != null) {
+ Toast.makeText(this, prompt, Toast.LENGTH_LONG).show();
+ }
+
if (getVoiceInteractor() != null) {
getVoiceInteractor().submitRequest(new CompleteVoiceRequest(prompt, null));
}
@@ -85,8 +91,14 @@
/**
* Indicates when the setting could not be changed.
*/
- protected void notifyFailure(String reason) {
- getVoiceInteractor().submitRequest(new VoiceInteractor.AbortVoiceRequest(reason, null));
+ protected void notifyFailure(CharSequence prompt) {
+ if (prompt != null) {
+ Toast.makeText(this, prompt, Toast.LENGTH_LONG).show();
+ }
+
+ if (getVoiceInteractor() != null) {
+ getVoiceInteractor().submitRequest(new AbortVoiceRequest(prompt, null));
+ }
}
protected void showFragment(Fragment fragment, String tag) {