From 9db71d25d3a05238790b9400b5337ec4f0c91920 Mon Sep 17 00:00:00 2001 From: Sriram Ramasubramanian Date: Tue, 20 Dec 2011 12:53:56 -0800 Subject: [PATCH] Bug 711428: Awesomescreen tab indicators needs to be curved [r=mfinkle] --- mobile/android/base/Makefile.in | 8 +++-- .../drawable-hdpi-v8/awesomebar_tab.9.png | Bin 0 -> 337 bytes .../awesomebar_tab_pressed.9.png | Bin 0 -> 400 bytes .../drawable-mdpi-v8/awesomebar_tab.9.png | Bin 0 -> 241 bytes .../awesomebar_tab_pressed.9.png | Bin 0 -> 279 bytes .../drawable-xhdpi-v11/awesomebar_tab.9.png | Bin 0 -> 413 bytes .../awesomebar_tab_pressed.9.png | Bin 0 -> 492 bytes .../drawable/awesomebar_tab_focus.xml | 10 ------ .../awesomebar_tab_focus_selected.xml | 10 ------ .../drawable/awesomebar_tab_indicator.xml | 31 +++++------------- .../awesomebar_tab_press_selected.xml | 5 ++- .../drawable/awesomebar_tab_selected.xml | 5 ++- .../base/resources/layout/awesomebar_tabs.xml | 4 +-- .../base/resources/values-v11/styles.xml | 9 +++++ .../base/resources/values-v11/themes.xml | 2 ++ .../android/base/resources/values/styles.xml | 8 +++++ .../android/base/resources/values/themes.xml | 2 ++ 17 files changed, 45 insertions(+), 49 deletions(-) create mode 100644 mobile/android/base/resources/drawable-hdpi-v8/awesomebar_tab.9.png create mode 100644 mobile/android/base/resources/drawable-hdpi-v8/awesomebar_tab_pressed.9.png create mode 100644 mobile/android/base/resources/drawable-mdpi-v8/awesomebar_tab.9.png create mode 100644 mobile/android/base/resources/drawable-mdpi-v8/awesomebar_tab_pressed.9.png create mode 100644 mobile/android/base/resources/drawable-xhdpi-v11/awesomebar_tab.9.png create mode 100644 mobile/android/base/resources/drawable-xhdpi-v11/awesomebar_tab_pressed.9.png delete mode 100644 mobile/android/base/resources/drawable/awesomebar_tab_focus.xml delete mode 100644 mobile/android/base/resources/drawable/awesomebar_tab_focus_selected.xml diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in index ade71a55308a..337eefb866de 100644 --- a/mobile/android/base/Makefile.in +++ b/mobile/android/base/Makefile.in @@ -243,6 +243,8 @@ RES_DRAWABLE_MDPI_V8 = \ res/drawable-mdpi-v8/abouthome_separator.9.png \ res/drawable-mdpi-v8/abouthome_topsite_placeholder.png \ res/drawable-mdpi-v8/abouthome_topsite_shadow.9.png \ + res/drawable-mdpi-v8/awesomebar_tab.9.png \ + res/drawable-mdpi-v8/awesomebar_tab_pressed.9.png \ res/drawable-mdpi-v8/ic_awesomebar_go.png \ res/drawable-mdpi-v8/ic_awesomebar_search.png \ res/drawable-mdpi-v8/ic_menu_bookmark_add.png \ @@ -280,6 +282,8 @@ RES_DRAWABLE_HDPI_V8 = \ res/drawable-hdpi-v8/abouthome_separator.9.png \ res/drawable-hdpi-v8/abouthome_topsite_placeholder.png \ res/drawable-hdpi-v8/abouthome_topsite_shadow.9.png \ + res/drawable-hdpi-v8/awesomebar_tab.9.png \ + res/drawable-hdpi-v8/awesomebar_tab_pressed.9.png \ res/drawable-hdpi-v8/ic_awesomebar_go.png \ res/drawable-hdpi-v8/ic_awesomebar_search.png \ res/drawable-hdpi-v8/ic_menu_bookmark_add.png \ @@ -355,6 +359,8 @@ RES_DRAWABLE_XHDPI_V11 = \ res/drawable-xhdpi-v11/abouthome_separator.9.png \ res/drawable-xhdpi-v11/abouthome_topsite_placeholder.png \ res/drawable-xhdpi-v11/abouthome_topsite_shadow.9.png \ + res/drawable-xhdpi-v11/awesomebar_tab.9.png \ + res/drawable-xhdpi-v11/awesomebar_tab_pressed.9.png \ res/drawable-xhdpi-v11/ic_awesomebar_go.png \ res/drawable-xhdpi-v11/ic_awesomebar_search.png \ res/drawable-xhdpi-v11/ic_menu_bookmark_add.png \ @@ -449,8 +455,6 @@ MOZ_ANDROID_DRAWABLES += mobile/android/base/resources/drawable/abouthome_bg_rep mobile/android/base/resources/drawable/address_bar_url_default.xml \ mobile/android/base/resources/drawable/address_bar_url_pressed.xml \ mobile/android/base/resources/drawable/autocomplete_list_bg.9.png \ - mobile/android/base/resources/drawable/awesomebar_tab_focus.xml \ - mobile/android/base/resources/drawable/awesomebar_tab_focus_selected.xml \ mobile/android/base/resources/drawable/awesomebar_tab_indicator.xml \ mobile/android/base/resources/drawable/awesomebar_tab_press.xml \ mobile/android/base/resources/drawable/awesomebar_tab_press_selected.xml \ diff --git a/mobile/android/base/resources/drawable-hdpi-v8/awesomebar_tab.9.png b/mobile/android/base/resources/drawable-hdpi-v8/awesomebar_tab.9.png new file mode 100644 index 0000000000000000000000000000000000000000..cfbc86b6be53e67cff36b58b597136cb4671352b GIT binary patch literal 337 zcmV-X0j~auP)8|NibOj!MY@vOr|Aaci>H!1e3`N5CoGKU=juk=qpRwfG;5GZ288@`5#g7pa# z2^Luk))ZHQM25YX`c$qH0pg3VEqZAS7A}hy!b6Jv*f`F%_;YZn!C81fP*00000NkvXXu0mjfKJbSV literal 0 HcmV?d00001 diff --git a/mobile/android/base/resources/drawable-hdpi-v8/awesomebar_tab_pressed.9.png b/mobile/android/base/resources/drawable-hdpi-v8/awesomebar_tab_pressed.9.png new file mode 100644 index 0000000000000000000000000000000000000000..6f4b9220f38e91cdcc103718deaaadef73e57b5e GIT binary patch literal 400 zcmV;B0dM|^P)0fOa{TVli=j!5(L*mCoiDTsUQdi zA-)GvDTVsed`BU9K6vQ%CA{b1{G>^zV^<|K2GcTcNKuP!As7`@u(c~q)1xFwuEdKd zp%J`^dyVaB6h-O32&Rj7brVkvM&p@!(f(AhYSwxs{Pv(RA86<|f(us7T*%c<$u5Em z7RT{3VYildjsIRS!PNYikXz4PFu~OPmVlYXoO8S8f)z!vspc~R261LCSaotFT<|=a z3#O)*1Pk+JGSBlZYr%#D3v>K|&rC2aj|YSbOM=~)3FeQcgbGW{vMk%KEtneh2oqM& zuO*lo?1%|LLXEvx`ITHFLWJ+$wvc3pzY?rk7RQ7KKi!Xs^A(RS%FnkXWa5c_9|#QA u#BZmr{j%wt+xP$eEY4tj=m0@J9{B)cfiRl=FtUsQ0000_(RO3ba`;fG pu#O?gULnk}Z^p#~k|~QXGHmBOtDLQCxew?E22WQ%mvv4FO#ln7Sq1+xKqaXQe%}n&xHpp3l7@5GtV^Q;W>Ww zz=M>k(0lQ~lDvy-M|O$0@?2n;eX(H)XWnv?q+9OH z6V-kwE)^^;H4(^cZf$Knd!kDsf%{N`2?P5Yi{JhF+jV4lZDu`szG%@R8x>cc6~-n~ z1tl-9e-V;3yx{TE2FN*l)k2v~LzDfDM;pUS(Z!6W3O{TF!WoJu$ji&m=PK%xlx37l bS$vU!gK2(DRIa~2(5DQZu6{1-oD!M4%P)qDQzeas(qqVIiBVIbYzAJ+Lc8oQI+XhC`H8`zWoGd%X(6F(%L_wAOMS}We?lqZ zeH?EtVj0{@=dYpc$evtt1dJtq9Dfu$=*<1+Qq30w;CJB%eBrK@+afHJ00000NkvXX Hu0mjfhBmTH literal 0 HcmV?d00001 diff --git a/mobile/android/base/resources/drawable-xhdpi-v11/awesomebar_tab_pressed.9.png b/mobile/android/base/resources/drawable-xhdpi-v11/awesomebar_tab_pressed.9.png new file mode 100644 index 0000000000000000000000000000000000000000..4f122b12fc3f3109be80d85d54aeff6d6daadf5d GIT binary patch literal 492 zcmVsZ&I!=+voe*QIO3(y3E)idZ6I znZ7S`*h?fc@B2QppNEe*?Y`rA-p{^2X5MYJ!bJg4F+n4Eg9KqL3Pd4@Sc6Ho+s!(i z&YrH9&bdcjC!zqTm^bmDK6a{W-;5|;kn*NKDI!GRN&RmpX;CzSZ0knfDHg;=vRtc6 zE+i+4Ztg&QQzS@;QLooqOhy#hyM-i>D7Q(7lIQtSxuBvbkm@w-D7q-+!kvOZ(mP}R z2R)i7eus0prKV4}3!?KKh(M!63riW<8h;b4?$p6AQ8i=xrQakd1EGpt<{ zHF8Cw!8jlOt&-YADbJgbXfTiZ@_8+yWLdV#p)6>aEW4G8;`g4#Gs%U9G4ZpcN<`6@ zt&3NZ3JvAUIk*3BQT+S+ejdlkMVOPrU3XeuZ2n0UiLs#%4a5ywz%Z|`72U i%%zw$1^|Bf>((E+5%S*7(4U$B0000 - - - - - - - - - diff --git a/mobile/android/base/resources/drawable/awesomebar_tab_focus_selected.xml b/mobile/android/base/resources/drawable/awesomebar_tab_focus_selected.xml deleted file mode 100644 index 6a189a138eb6..000000000000 --- a/mobile/android/base/resources/drawable/awesomebar_tab_focus_selected.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/mobile/android/base/resources/drawable/awesomebar_tab_indicator.xml b/mobile/android/base/resources/drawable/awesomebar_tab_indicator.xml index 624024bea2a7..860197f3fc63 100644 --- a/mobile/android/base/resources/drawable/awesomebar_tab_indicator.xml +++ b/mobile/android/base/resources/drawable/awesomebar_tab_indicator.xml @@ -1,28 +1,6 @@ - - - - - - - - - - + + + + + diff --git a/mobile/android/base/resources/drawable/awesomebar_tab_press_selected.xml b/mobile/android/base/resources/drawable/awesomebar_tab_press_selected.xml index 6a189a138eb6..fdde9c8fae15 100644 --- a/mobile/android/base/resources/drawable/awesomebar_tab_press_selected.xml +++ b/mobile/android/base/resources/drawable/awesomebar_tab_press_selected.xml @@ -1,7 +1,10 @@ - + + + diff --git a/mobile/android/base/resources/drawable/awesomebar_tab_selected.xml b/mobile/android/base/resources/drawable/awesomebar_tab_selected.xml index e5fc7291e1e2..2873e5471c0e 100644 --- a/mobile/android/base/resources/drawable/awesomebar_tab_selected.xml +++ b/mobile/android/base/resources/drawable/awesomebar_tab_selected.xml @@ -1,7 +1,10 @@ - + + + diff --git a/mobile/android/base/resources/layout/awesomebar_tabs.xml b/mobile/android/base/resources/layout/awesomebar_tabs.xml index 50759f046850..2c50e72ff63a 100644 --- a/mobile/android/base/resources/layout/awesomebar_tabs.xml +++ b/mobile/android/base/resources/layout/awesomebar_tabs.xml @@ -6,9 +6,7 @@ android:layout_height="fill_parent"> + style="@style/TabWidget"/> 1 + + + diff --git a/mobile/android/base/resources/values-v11/themes.xml b/mobile/android/base/resources/values-v11/themes.xml index 11481e27f084..28d5a6ebb95d 100644 --- a/mobile/android/base/resources/values-v11/themes.xml +++ b/mobile/android/base/resources/values-v11/themes.xml @@ -3,6 +3,7 @@ + + + + diff --git a/mobile/android/base/resources/values/themes.xml b/mobile/android/base/resources/values/themes.xml index 6012e93d4330..e8481bc7e768 100644 --- a/mobile/android/base/resources/values/themes.xml +++ b/mobile/android/base/resources/values/themes.xml @@ -4,6 +4,7 @@