diff options
| author | Leon Scroggins <scroggo@google.com> | 2010-02-05 16:41:49 -0500 |
|---|---|---|
| committer | Leon Scroggins <scroggo@google.com> | 2010-02-05 16:41:49 -0500 |
| commit | f48d44ea4292563616e7f29b50ea94aeaff4fa3c (patch) | |
| tree | ea05e5766b918b0cc968224afa9ca12d3344d6c6 /src/com/android | |
| parent | 735a38d2d8e1db56d91b7b754b540f8643223493 (diff) | |
| download | packages_apps_Browser-f48d44ea4292563616e7f29b50ea94aeaff4fa3c.tar.gz packages_apps_Browser-f48d44ea4292563616e7f29b50ea94aeaff4fa3c.tar.bz2 packages_apps_Browser-f48d44ea4292563616e7f29b50ea94aeaff4fa3c.zip | |
Update look of title bar when in voice search mode.
Fix for http://b/issue?id=2390713
Add the arcs to the end of the title.
Change to multiline.
Use the standard long press look.
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/browser/TitleBar.java | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/src/com/android/browser/TitleBar.java b/src/com/android/browser/TitleBar.java index 743af9b0c..b86073bc4 100644 --- a/src/com/android/browser/TitleBar.java +++ b/src/com/android/browser/TitleBar.java @@ -32,6 +32,9 @@ import android.graphics.drawable.PaintDrawable; import android.os.Handler; import android.os.Message; import android.speech.RecognizerIntent; +import android.text.SpannableString; +import android.text.Spanned; +import android.text.style.ImageSpan; import android.util.TypedValue; import android.view.ContextMenu; import android.view.LayoutInflater; @@ -69,6 +72,7 @@ public class TitleBar extends LinearLayout { private boolean mInVoiceMode; private Drawable mVoiceModeBackground; private Drawable mNormalBackground; + private ImageSpan mArcsSpan; private static int LONG_PRESS = 1; @@ -113,8 +117,10 @@ public class TitleBar extends LinearLayout { mStopDrawable = resources.getDrawable(R.drawable.ic_btn_stop_v2); mBookmarkDrawable = mRtButton.getDrawable(); mVoiceModeBackground = resources.getDrawable( - R.drawable.textfield_voice_search); + R.drawable.title_voice); mNormalBackground = mTitleBg.getBackground(); + mArcsSpan = new ImageSpan(context, R.drawable.arcs, + ImageSpan.ALIGN_BASELINE); } private class MyHandler extends Handler { @@ -244,6 +250,7 @@ public class TitleBar extends LinearLayout { rightButtonDrawable = mBookmarkDrawable; } } + mTitle.setSingleLine(!mInVoiceMode); mTitleBg.setBackgroundDrawable(titleDrawable); mRtButton.setImageDrawable(rightButtonDrawable); } @@ -300,7 +307,18 @@ public class TitleBar extends LinearLayout { if (title == null) { mTitle.setText(R.string.title_bar_loading); } else { - mTitle.setText(title); + if (mInVoiceMode) { + // Add two spaces. The second one will be replaced with an + // image, and the first one will put space between it and the + // text + SpannableString spannable = new SpannableString(title + " "); + int end = spannable.length(); + spannable.setSpan(mArcsSpan, end - 1, end, + Spanned.SPAN_MARK_POINT); + mTitle.setText(spannable); + } else { + mTitle.setText(title); + } } } |
