From ee18fdbec8bb640b386f38edb11dbf4122d57455 Mon Sep 17 00:00:00 2001 From: Fabrice Di Meglio Date: Wed, 18 Jun 2014 16:37:33 -0700 Subject: [PATCH 1/3] Fix bug #15729260 Switch should not have any outer glow ripple around its circle - @null for the background Change-Id: If2fa9f3dcdbd79af42e308120ce0c3ba3bc78ea3 --- res/layout/switch_bar.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/res/layout/switch_bar.xml b/res/layout/switch_bar.xml index cdf14d7b3f4..be24ff1d991 100644 --- a/res/layout/switch_bar.xml +++ b/res/layout/switch_bar.xml @@ -32,6 +32,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:layout_marginEnd="?attr/switchBarMarginEnd" /> + android:layout_marginEnd="?attr/switchBarMarginEnd" + android:background="@null" /> From 6ac8ddb8983a4abdf37214c86394033d6bc79235 Mon Sep 17 00:00:00 2001 From: Przemyslaw Szczepaniak Date: Thu, 19 Jun 2014 16:01:39 +0100 Subject: [PATCH 2/3] Normalize TTS default locale before #toDisplayString TTS is... special in regard of Locale instances it uses. Recently ISO-3166 alpha 3 country codes went out of spec, so "English (GBR)". Bug: 15741357 Change-Id: I022105acad9d319d5e09231be340405d797c84c4 --- src/com/android/settings/tts/TextToSpeechSettings.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/tts/TextToSpeechSettings.java b/src/com/android/settings/tts/TextToSpeechSettings.java index d3f9c7b4433..8417cfdf966 100644 --- a/src/com/android/settings/tts/TextToSpeechSettings.java +++ b/src/com/android/settings/tts/TextToSpeechSettings.java @@ -268,7 +268,9 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment implements return; } - mCurrentDefaultLocale = defaultLocale; + // ISO-3166 alpha 3 country codes are out of spec. If we won't normalize, + // we may end up with English (USA)and German (DEU). + mCurrentDefaultLocale = mEnginesHelper.parseLocaleString(defaultLocale.toString()); int defaultAvailable = mTts.setLanguage(defaultLocale); if (evaluateDefaultLocale()) { From 3c9ca35ebc238b5aff028a1270fe84beb120bc56 Mon Sep 17 00:00:00 2001 From: Maurice Lam Date: Thu, 19 Jun 2014 11:36:03 -0700 Subject: [PATCH 3/3] [WifiSetup] Fix WifiDialog crash Static inner class fragments need to be public. Bug: 15742215 Change-Id: I24410b1ad6756c090fbf15f2a2ba07aa4eae5f41 --- src/com/android/settings/wifi/WifiSetupActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/settings/wifi/WifiSetupActivity.java b/src/com/android/settings/wifi/WifiSetupActivity.java index 8e4ff481b0a..86401fb62e1 100644 --- a/src/com/android/settings/wifi/WifiSetupActivity.java +++ b/src/com/android/settings/wifi/WifiSetupActivity.java @@ -185,7 +185,7 @@ public class WifiSetupActivity extends WifiPickerActivity } } - private static class WifiSkipDialog extends DialogFragment { + public static class WifiSkipDialog extends DialogFragment { public static WifiSkipDialog newInstance(int messageRes) { final Bundle args = new Bundle(); args.putInt("messageRes", messageRes);