From 8d9790fdd1b0eee2cdfad164e3b58c95d61bf5b4 Mon Sep 17 00:00:00 2001
From: Amith Yamasani <yamasani@google.com>
Date: Thu, 23 Jun 2011 15:24:06 -0700
Subject: [PATCH 1/4] Turn off hardware acceleration to avoid crashes due to
 driver.

TODO: Turn this back on when driver bug is fixed.

Bug: 4883047
Change-Id: I8efb6d77035595650fff8acb8ddbd95a93fc711c
---
 AndroidManifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9b3360093fc..5e37d065eb8 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -54,7 +54,7 @@
     <application android:label="@string/settings_label"
             android:icon="@mipmap/ic_launcher_settings"
             android:taskAffinity=""
-            android:hardwareAccelerated="true">
+            android:hardwareAccelerated="false">
 
         <!-- Settings -->
 

From 380c93476b37ed88c148e3788bbfdb36ed0ba546 Mon Sep 17 00:00:00 2001
From: Narayan Kamath <narayan@google.com>
Date: Wed, 24 Aug 2011 20:12:26 +0100
Subject: [PATCH 2/4] Call setLanguage( ) on the TTS engine before the sample.

This makes the sample play faster, and results in a reliable
return value from getLanguage().

bug:5207139
Change-Id: Ic6ca4a2f4aed299d35c320ecc3f327579c66471b
---
 .../settings/tts/TextToSpeechSettings.java     | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/tts/TextToSpeechSettings.java b/src/com/android/settings/tts/TextToSpeechSettings.java
index 210cb9c241d..e8255bf8af8 100644
--- a/src/com/android/settings/tts/TextToSpeechSettings.java
+++ b/src/com/android/settings/tts/TextToSpeechSettings.java
@@ -192,16 +192,31 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment implements
         checkVoiceData(mCurrentEngine);
     }
 
+    private void maybeUpdateTtsLanguage(String currentEngine) {
+        if (currentEngine != null && mTts != null) {
+            final String localeString = mEnginesHelper.getLocalePrefForEngine(
+                    currentEngine);
+            if (localeString != null) {
+                final String[] locale = TtsEngines.parseLocalePref(localeString);
+
+                if (DBG) Log.d(TAG, "Loading language ahead of sample check : " + locale);
+                mTts.setLanguage(new Locale(locale[0], locale[1], locale[2]));
+            }
+        }
+    }
+
     /**
      * Ask the current default engine to return a string of sample text to be
      * spoken to the user.
      */
     private void getSampleText() {
         String currentEngine = mTts.getCurrentEngine();
-        Locale currentLocale = mTts.getLanguage();
 
         if (TextUtils.isEmpty(currentEngine)) currentEngine = mTts.getDefaultEngine();
 
+        maybeUpdateTtsLanguage(currentEngine);
+        Locale currentLocale = mTts.getLanguage();
+
         // TODO: This is currently a hidden private API. The intent extras
         // and the intent action should be made public if we intend to make this
         // a public API. We fall back to using a canned set of strings if this
@@ -220,7 +235,6 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment implements
             startActivityForResult(intent, GET_SAMPLE_TEXT);
         } catch (ActivityNotFoundException ex) {
             Log.e(TAG, "Failed to get sample text, no activity found for " + intent + ")");
-            onSampleTextReceived(TextToSpeech.ERROR, null);
         }
     }
 

From 00c4de44f67ea7117bbb94a234b8069084494d1a Mon Sep 17 00:00:00 2001
From: Justin Ho <justinho@google.com>
Date: Tue, 6 Sep 2011 14:49:46 -0700
Subject: [PATCH 3/4] Update PowerWidget minWidth/minHeight so it reports as
 4x1 We may update this value again

Bug: 5255991
Change-Id: I7297e6d4255dcb4925bc2fca67bdd75ae01ad1cc
---
 res/xml/appwidget_info.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/xml/appwidget_info.xml b/res/xml/appwidget_info.xml
index 79d11dd665f..7a89cecbc07 100644
--- a/res/xml/appwidget_info.xml
+++ b/res/xml/appwidget_info.xml
@@ -15,8 +15,8 @@
 -->
 
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
-    android:minWidth="294dip"
-    android:minHeight="72dip"
+    android:minWidth="288dip"
+    android:minHeight="48dip"
     android:previewImage="@drawable/preview"
     android:initialLayout="@layout/widget"
     >

From 07c0fd957a26f3d9fa338fea663a46b2c2cdbbbf Mon Sep 17 00:00:00 2001
From: Justin Ho <justinho@google.com>
Date: Thu, 8 Sep 2011 16:22:38 -0700
Subject: [PATCH 4/4] Updated PowerWidget dimens Bug: 5278970

Change-Id: I70386349ac47cc58230c1ec0d18220e7af99a6e6
---
 res/xml/appwidget_info.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/xml/appwidget_info.xml b/res/xml/appwidget_info.xml
index 7a89cecbc07..dc90d4e32c3 100644
--- a/res/xml/appwidget_info.xml
+++ b/res/xml/appwidget_info.xml
@@ -15,8 +15,8 @@
 -->
 
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
-    android:minWidth="288dip"
-    android:minHeight="48dip"
+    android:minWidth="260dip"
+    android:minHeight="40dip"
     android:previewImage="@drawable/preview"
     android:initialLayout="@layout/widget"
     >