Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 07:42:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 711428: Awesomescreen tab indicators needs to be curved [r=mfinkle]

Browse Source
This commit is contained in:
Sriram Ramasubramanian 2011-12-20 12:53:56 -08:00
parent 35be13eed4
commit 9db71d25d3
17 changed files with 45 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mobile/android/base/Makefile.in
View File

@ -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 \

BIN
mobile/android/base/resources/drawable-hdpi-v8/awesomebar_tab.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 337 B

BIN
mobile/android/base/resources/drawable-hdpi-v8/awesomebar_tab_pressed.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 400 B

BIN
mobile/android/base/resources/drawable-mdpi-v8/awesomebar_tab.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 241 B

BIN
mobile/android/base/resources/drawable-mdpi-v8/awesomebar_tab_pressed.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 279 B

BIN
mobile/android/base/resources/drawable-xhdpi-v11/awesomebar_tab.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 413 B

BIN
mobile/android/base/resources/drawable-xhdpi-v11/awesomebar_tab_pressed.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 492 B

10
mobile/android/base/resources/drawable/awesomebar_tab_focus.xml
View File

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:top="46dip">
<shape android:shape="rectangle">
<solid android:color="#000000"/>
</shape>
</item>
</layer-list>

10
mobile/android/base/resources/drawable/awesomebar_tab_focus_selected.xml
View File

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:top="36dip">
<shape android:shape="rectangle">
<solid android:color="#111111"/>
</shape>
</item>
</layer-list>

31
mobile/android/base/resources/drawable/awesomebar_tab_indicator.xml
View File

@ -1,28 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Non focused states -->
<item android:state_focused="false"
android:state_selected="false"
android:state_pressed="false"
android:drawable="@drawable/awesomebar_tab_unselected"/>
<item android:state_focused="false"
android:state_selected="true"
android:state_pressed="false"
android:drawable="@drawable/awesomebar_tab_selected"/>
<!-- Focused states -->
<item android:state_focused="true"
android:state_selected="false"
android:state_pressed="false"
android:drawable="@drawable/awesomebar_tab_focus"/>
<item android:state_focused="true"
android:state_selected="true"
android:state_pressed="false"
android:drawable="@drawable/awesomebar_tab_focus_selected"/>
<!-- Pressed -->
<item android:state_pressed="true"
android:state_selected="false"
@ -32,4 +10,13 @@
android:state_selected="true"
android:drawable="@drawable/awesomebar_tab_press_selected"/>
<!-- Default states -->
<item android:state_selected="false"
android:state_pressed="false"
android:drawable="@drawable/awesomebar_tab_unselected"/>
<item android:state_selected="true"
android:state_pressed="false"
android:drawable="@drawable/awesomebar_tab_selected"/>
</selector>

5
mobile/android/base/resources/drawable/awesomebar_tab_press_selected.xml
View File

@ -1,7 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:top="36dip">
<item android:bottom="2dip"
android:drawable="@drawable/awesomebar_tab_pressed"/>
<item android:top="46dip">
<shape android:shape="rectangle">
<solid android:color="#111111"/>
</shape>

5
mobile/android/base/resources/drawable/awesomebar_tab_selected.xml
View File

@ -1,7 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:top="36dip">
<item android:bottom="2dip"
android:drawable="@drawable/awesomebar_tab"/>
<item android:top="46dip">
<shape android:shape="rectangle">
<solid android:color="#000000"/>
</shape>

4
mobile/android/base/resources/layout/awesomebar_tabs.xml
View File

@ -6,9 +6,7 @@
android:layout_height="fill_parent">
<TabWidget android:id="@android:id/tabs"
android:layout_width="fill_parent"
android:layout_height="48dip"
android:background="@drawable/tabs_tray_bg_repeat"/>
style="@style/TabWidget"/>
<FrameLayout android:id="@android:id/tabcontent"
android:layout_width="fill_parent"

9
mobile/android/base/resources/values-v11/styles.xml
View File

@ -28,4 +28,13 @@
<item name="android:layout_weight">1</item>
</style>
<!-- TabWidget -->
<style name="TabWidget">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">48dip</item>
<item name="android:background">@drawable/tabs_tray_bg_repeat</item>
<item name="android:divider">@android:color/transparent</item>
<item name="android:tabStripEnabled">false</item>
</style>
</resources>

2
mobile/android/base/resources/values-v11/themes.xml
View File

@ -3,6 +3,7 @@
<style name="Gecko" parent="@android:style/Theme.Holo">
<item name="android:windowBackground">@color/splash_background</item>
<item name="android:windowContentOverlay">@null</item>
</style>
<style name="Gecko.TitleBar" parent="Gecko"/>
@ -15,6 +16,7 @@
<style name="Gecko.Light" parent="@android:style/Theme.Holo.Light">
<item name="android:windowBackground">@color/splash_background</item>
<item name="android:windowContentOverlay">@null</item>
</style>
<style name="Gecko.Light.TitleBar" parent="Gecko.Light"/>

8
mobile/android/base/resources/values/styles.xml
View File

@ -69,4 +69,12 @@
<item name="android:layout_height">fill_parent</item>
<item name="android:layout_weight">1</item>
</style>
<!-- TabWidget -->
<style name="TabWidget">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">48dip</item>
<item name="android:background">@drawable/tabs_tray_bg_repeat</item>
</style>
</resources>

2
mobile/android/base/resources/values/themes.xml
View File

@ -4,6 +4,7 @@
<style name="Gecko" parent="@android:style/Theme">
<item name="android:windowNoTitle">true</item>
<item name="android:windowBackground">@color/splash_background</item>
<item name="android:windowContentOverlay">@null</item>
</style>
<style name="Gecko.TitleBar" parent="Gecko">
@ -15,6 +16,7 @@
<style name="Gecko.Light" parent="@android:style/Theme.Light">
<item name="android:windowNoTitle">true</item>
<item name="android:windowBackground">@color/splash_background</item>
<item name="android:windowContentOverlay">@null</item>
</style>
<style name="Gecko.Light.TitleBar" parent="Gecko.Light">