Bug 697189 - Don't use transparent theme on AwesomeBar screen (r=mfinkle)
authorLucas Rocha <lucasr@mozilla.com>
Thu, 17 Nov 2011 10:52:23 +0000
changeset 83512 d7fa4814218d624e8945e8d413ea007d74972b28
parent 83511 a82e7bcd93fa271158ed8836d300e2c332c0e57f
child 83513 f84023d2e919886347511c0bb0a262af3680e732
push id519
push userakeybl@mozilla.com
push dateWed, 01 Feb 2012 00:38:35 +0000
treeherdermozilla-beta@788ea1ef610b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle
bugs697189
milestone11.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 697189 - Don't use transparent theme on AwesomeBar screen (r=mfinkle) Otherwise the current web page will be visible 'under' the AwesomeBar screen while SKB slides in and out.
embedding/android/AndroidManifest.xml.in
embedding/android/resources/layout/awesomebar_header_row.xml
embedding/android/resources/layout/awesomebar_row.xml
--- a/embedding/android/AndroidManifest.xml.in
+++ b/embedding/android/AndroidManifest.xml.in
@@ -125,17 +125,17 @@
             <!--  This intent-filter allows your shortcuts to be created in the launcher. -->
             <intent-filter>
                 <action android:name="android.intent.action.CREATE_SHORTCUT" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
 
         <activity android:name="org.mozilla.gecko.AwesomeBar"
-                  android:theme="@android:style/Theme.Translucent"
+                  android:theme="@android:style/Theme.Light"
                   android:configChanges="orientation"
                   android:windowSoftInputMode="stateAlwaysVisible|adjustResize"
                   android:windowIsTranslucent="true"
                   android:windowContentOverlay="@null"
                   android:windowNoTitle="true"
                   android:windowIsFloating="true"
                   android:backgroundDimEnabled="false">
         </activity>
--- a/embedding/android/resources/layout/awesomebar_header_row.xml
+++ b/embedding/android/resources/layout/awesomebar_header_row.xml
@@ -1,8 +1,9 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
           style="?android:attr/listSeparatorTextViewStyle"
+          android:textColor="?android:attr/textColorPrimary"
           android:id="@+id/title"
           android:layout_width="fill_parent"
           android:layout_height="wrap_content"
           android:paddingTop="2dip"
           android:paddingBottom="2dip"
           android:paddingLeft="5dip"/>
--- a/embedding/android/resources/layout/awesomebar_row.xml
+++ b/embedding/android/resources/layout/awesomebar_row.xml
@@ -12,27 +12,27 @@
                android:minWidth="32dip"
                android:minHeight="32dip"
                android:src="@drawable/favicon"
                android:scaleType="fitCenter"/>
 
     <TextView android:id="@+id/title"
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
-              android:textAppearance="?android:attr/textAppearanceMediumInverse"
-              android:textColor="?android:attr/textColorPrimaryInverse"
+              android:textAppearance="?android:attr/textAppearanceMedium"
+              android:textColor="?android:attr/textColorPrimary"
               android:layout_toRightOf="@id/favicon"
               android:singleLine="true"
               android:ellipsize="middle"/>
 
     <TextView android:id="@+id/url"
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
-              android:textAppearance="?android:attr/textAppearanceSmallInverse"
-              android:textColor="?android:attr/textColorSecondaryInverse"
+              android:textAppearance="?android:attr/textAppearanceSmall"
+              android:textColor="?android:attr/textColorSecondary"
               android:layout_marginTop="2dip"
               android:layout_below="@id/title"
               android:layout_alignLeft="@id/title"
               android:includeFontPadding="false"
               android:singleLine="true"
               android:ellipsize="middle"/>
 
 </RelativeLayout>