зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1214630 - Rename 'tabContentStart' attribute of TabMenuStripLayout. r=mcomella
This will resolve conflicts when introducing the android design support library in bug 1189306. --HG-- extra : commitid : 6mkNPj0xng4 extra : rebase_source : 3feee4e9f361cb3e18e7c7c02f6ec206de6cb015
This commit is contained in:
Родитель
d874c1f117
Коммит
557dca1b5e
|
@ -54,7 +54,7 @@ class TabMenuStripLayout extends LinearLayout
|
|||
final int stripResId = a.getResourceId(R.styleable.TabMenuStrip_strip, -1);
|
||||
|
||||
titlebarFill = a.getBoolean(R.styleable.TabMenuStrip_titlebarFill, false);
|
||||
tabContentStart = a.getDimensionPixelSize(R.styleable.TabMenuStrip_tabContentStart, 0);
|
||||
tabContentStart = a.getDimensionPixelSize(R.styleable.TabMenuStrip_tabsMarginLeft, 0);
|
||||
activeTextColor = a.getColor(R.styleable.TabMenuStrip_activeTextColor, R.color.text_and_tabs_tray_grey);
|
||||
inactiveTextColor = a.getColorStateList(R.styleable.TabMenuStrip_inactiveTextColor);
|
||||
a.recycle();
|
||||
|
|
|
@ -20,6 +20,6 @@
|
|||
gecko:strip="@drawable/home_tab_menu_strip"
|
||||
gecko:activeTextColor="@color/placeholder_grey"
|
||||
gecko:inactiveTextColor="@color/tab_text_color"
|
||||
gecko:tabContentStart="@dimen/tab_strip_content_start" />
|
||||
gecko:tabsMarginLeft="@dimen/tab_strip_content_start" />
|
||||
|
||||
</org.mozilla.gecko.home.HomePager>
|
||||
|
|
|
@ -162,7 +162,7 @@
|
|||
|
||||
<declare-styleable name="TabMenuStrip">
|
||||
<attr name="strip" format="reference"/>
|
||||
<attr name="tabContentStart" format="dimension" />
|
||||
<attr name="tabsMarginLeft" format="dimension" />
|
||||
<attr name="activeTextColor" format="color" />
|
||||
<attr name="inactiveTextColor" format="color" />
|
||||
<attr name="titlebarFill" format="boolean" />
|
||||
|
|
Загрузка…
Ссылка в новой задаче