Bug 735209: No application icon in AwesomeBar's clipboard bar. [r=mfinkle]
authorSriram Ramasubramanian <sriram@mozilla.com>
Tue, 13 Mar 2012 11:59:02 -0700
changeset 88963 4960666240eeb656de5b8d3f467141e8e22cee74
parent 88962 fd30aea30b032eea5036da9cb52db27f7c4c24df
child 88964 9b09f6e06408162bc2be6aa958c7019178f4c0f6
push id7086
push usersramasubramanian@mozilla.com
push dateTue, 13 Mar 2012 18:59:07 +0000
treeherdermozilla-inbound@4960666240ee [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle
bugs735209
milestone13.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 735209: No application icon in AwesomeBar's clipboard bar. [r=mfinkle]
mobile/android/base/Makefile.in
mobile/android/base/resources/layout/awesomebar_actionbar.xml
mobile/android/base/resources/values-v11/styles.xml
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -228,16 +228,17 @@ ICON_PATH = $(topsrcdir)/$(MOZ_BRANDING_
 ICON_PATH_HDPI = $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/content/icon64.png
 DEFINES += -DMOZ_ANDROID_SHARED_ID="$(ANDROID_PACKAGE_NAME).sharedID"
 endif
 
 RES_LAYOUT = \
   $(SYNC_RES_LAYOUT) \
   res/layout/autocomplete_list_item.xml \
   res/layout/awesomebar.xml \
+  res/layout/awesomebar_actionbar.xml \
   res/layout/awesomebar_folder_row.xml \
   res/layout/awesomebar_folder_header_row.xml \
   res/layout/awesomebar_header_row.xml \
   res/layout/awesomebar_row.xml \
   res/layout/awesomebar_search.xml \
   res/layout/awesomebar_tab_indicator.xml \
   res/layout/awesomebar_tabs.xml \
   res/layout/bookmark_edit.xml \
new file mode 100644
--- /dev/null
+++ b/mobile/android/base/resources/layout/awesomebar_actionbar.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              style="@style/AddressBar"/>
--- a/mobile/android/base/resources/values-v11/styles.xml
+++ b/mobile/android/base/resources/values-v11/styles.xml
@@ -34,16 +34,18 @@
     <style name="ActionBar.GeckoApp">
          <item name="android:background">@drawable/gecko_actionbar_bg</item>
          <item name="android:displayOptions">showCustom</item>
          <item name="android:customNavigationLayout">@layout/browser_toolbar</item>
     </style>
 
     <!-- AwesomeBar ActionBar -->
     <style name="ActionBar.AwesomeBar">
+         <item name="android:displayOptions">showCustom</item>
+         <item name="android:customNavigationLayout">@layout/awesomebar_actionbar</item>
          <item name="android:visibility">gone</item>
     </style>
  
     <!-- GeckoPreferences ActionBar -->
     <style name="ActionBar.GeckoPreferences">
          <item name="android:displayOptions">showHome|homeAsUp|showTitle</item>
     </style>