Bug 821311: Search suggestion text illegible. [r=bnicholson]
authorSriram Ramasubramanian <sriram@mozilla.com>
Thu, 13 Dec 2012 15:21:34 -0800
changeset 125460 e1a57065f541c449b4618dc9875ba536729394e7
parent 125459 3aa1bed744bb4663204609d9ba75269df418be91
child 125461 391f4cf534e1ff6c1e7359707d46edf7396d31cd
push id2151
push userlsblakk@mozilla.com
push dateTue, 19 Feb 2013 18:06:57 +0000
treeherdermozilla-beta@4952e88741ec [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbnicholson
bugs821311
milestone20.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 821311: Search suggestion text illegible. [r=bnicholson]
mobile/android/base/awesomebar/AllPagesTab.java
mobile/android/base/resources/layout/awesomebar_suggestion_prompt.xml
--- a/mobile/android/base/awesomebar/AllPagesTab.java
+++ b/mobile/android/base/awesomebar/AllPagesTab.java
@@ -594,18 +594,19 @@ public class AllPagesTab extends Awesome
             Log.e(LOGTAG, "Error getting search engine JSON", e);
         }
 
         filterSuggestions(mSearchTerm);
     }
 
     private void showSuggestionsOptIn() {
         mSuggestionsOptInPrompt = LayoutInflater.from(mContext).inflate(R.layout.awesomebar_suggestion_prompt, (LinearLayout)getView(), false);
-        ((TextView) mSuggestionsOptInPrompt.findViewById(R.id.suggestions_prompt_title))
-                .setText(getResources().getString(R.string.suggestions_prompt, mSearchEngines.get(0).name));
+        GeckoTextView promptText = (GeckoTextView) mSuggestionsOptInPrompt.findViewById(R.id.suggestions_prompt_title);
+        promptText.setText(getResources().getString(R.string.suggestions_prompt, mSearchEngines.get(0).name));
+        promptText.setPrivateMode(Tabs.getInstance().getSelectedTab().isPrivate());
 
         final View yesButton = mSuggestionsOptInPrompt.findViewById(R.id.suggestions_prompt_yes);
         final View noButton = mSuggestionsOptInPrompt.findViewById(R.id.suggestions_prompt_no);
         OnClickListener listener = new OnClickListener() {
             public void onClick(View v) {
                 // Prevent the buttons from being clicked multiple times (bug 816902)
                 yesButton.setOnClickListener(null);
                 noButton.setOnClickListener(null);
--- a/mobile/android/base/resources/layout/awesomebar_suggestion_prompt.xml
+++ b/mobile/android/base/resources/layout/awesomebar_suggestion_prompt.xml
@@ -6,23 +6,23 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               android:layout_width="fill_parent"
               android:layout_height="wrap_content"
               android:minHeight="@dimen/awesomebar_row_height"
               android:orientation="horizontal"
               android:gravity="center_vertical"
               android:padding="10dip">
 
-    <TextView android:id="@+id/suggestions_prompt_title"
-              android:layout_height="wrap_content"
-              android:layout_width="wrap_content"
-              android:textColor="?android:attr/textColorPrimary"
-              android:layout_marginLeft="6dip"
-              android:textSize="13sp"
-              android:layout_weight="1" />
+    <Gecko.TextView android:id="@+id/suggestions_prompt_title"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:textColor="@color/awesome_bar_title"
+                    android:layout_marginLeft="6dip"
+                    android:textSize="13sp"
+                    android:layout_weight="1" />
 
     <TextView android:id="@+id/suggestions_prompt_yes"
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
             android:textSize="13sp"
             android:layout_marginLeft="15dip"
             android:background="@drawable/suggestion_selector"
             android:paddingLeft="15dp"