mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1193974 - Remove new from tablet_* dimens. r=mhaigh 

We could remove tablet_* and move these values to the values-large
configuration but it's scope creeping for not much gain. The
attributes are prepended with tablet_* so they should be easy to
fix in the future should we choose to.

Refactoring automated w/ Intellij.

--HG--
extra : commitid : 5hpv5cg2MUF
extra : rebase_source : 696b181495e6943effd40f0db5051c647ab54bda
This commit is contained in:
Michael Comella 2015-08-19 16:13:08 -07:00
Родитель 0d50659002
Коммит aaf1e1346e
18 изменённых файлов: 82 добавлений и 82 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

40
mobile/android/base/resources/drawable-large-v11/browser_toolbar_action_bar_button.xml
Просмотреть файл

@ -10,13 +10,13 @@
android:state_pressed="true"
android:state_enabled="true">
<inset android:insetTop="@dimen/new_tablet_browser_toolbar_menu_item_inset_vertical"
android:insetBottom="@dimen/new_tablet_browser_toolbar_menu_item_inset_vertical"
android:insetLeft="@dimen/new_tablet_browser_toolbar_menu_item_inset_horizontal"
android:insetRight="@dimen/new_tablet_browser_toolbar_menu_item_inset_horizontal">
<inset android:insetTop="@dimen/tablet_browser_toolbar_menu_item_inset_vertical"
android:insetBottom="@dimen/tablet_browser_toolbar_menu_item_inset_vertical"
android:insetLeft="@dimen/tablet_browser_toolbar_menu_item_inset_horizontal"
android:insetRight="@dimen/tablet_browser_toolbar_menu_item_inset_horizontal">
<shape android:shape="rectangle">
<solid android:color="@color/text_and_tabs_tray_grey"/>
<corners android:radius="@dimen/new_tablet_browser_toolbar_menu_item_corner_radius"/>
<corners android:radius="@dimen/tablet_browser_toolbar_menu_item_corner_radius"/>
</shape>
</inset>
@ -26,13 +26,13 @@
android:state_focused="true"
android:state_pressed="false">
<inset android:insetTop="@dimen/new_tablet_browser_toolbar_menu_item_inset_vertical"
android:insetBottom="@dimen/new_tablet_browser_toolbar_menu_item_inset_vertical"
android:insetLeft="@dimen/new_tablet_browser_toolbar_menu_item_inset_horizontal"
android:insetRight="@dimen/new_tablet_browser_toolbar_menu_item_inset_horizontal">
<inset android:insetTop="@dimen/tablet_browser_toolbar_menu_item_inset_vertical"
android:insetBottom="@dimen/tablet_browser_toolbar_menu_item_inset_vertical"
android:insetLeft="@dimen/tablet_browser_toolbar_menu_item_inset_horizontal"
android:insetRight="@dimen/tablet_browser_toolbar_menu_item_inset_horizontal">
<shape android:shape="rectangle">
<solid android:color="@color/placeholder_active_grey"/>
<corners android:radius="@dimen/new_tablet_browser_toolbar_menu_item_corner_radius"/>
<corners android:radius="@dimen/tablet_browser_toolbar_menu_item_corner_radius"/>
</shape>
</inset>
@ -41,13 +41,13 @@
<item android:state_pressed="true"
android:state_enabled="true">
<inset android:insetTop="@dimen/new_tablet_browser_toolbar_menu_item_inset_vertical"
android:insetBottom="@dimen/new_tablet_browser_toolbar_menu_item_inset_vertical"
android:insetLeft="@dimen/new_tablet_browser_toolbar_menu_item_inset_horizontal"
android:insetRight="@dimen/new_tablet_browser_toolbar_menu_item_inset_horizontal">
<inset android:insetTop="@dimen/tablet_browser_toolbar_menu_item_inset_vertical"
android:insetBottom="@dimen/tablet_browser_toolbar_menu_item_inset_vertical"
android:insetLeft="@dimen/tablet_browser_toolbar_menu_item_inset_horizontal"
android:insetRight="@dimen/tablet_browser_toolbar_menu_item_inset_horizontal">
<shape android:shape="rectangle">
<solid android:color="@color/toolbar_grey_pressed"/>
<corners android:radius="@dimen/new_tablet_browser_toolbar_menu_item_corner_radius"/>
<corners android:radius="@dimen/tablet_browser_toolbar_menu_item_corner_radius"/>
</shape>
</inset>
@ -56,13 +56,13 @@
<item android:state_focused="true"
android:state_pressed="false">
<inset android:insetTop="@dimen/new_tablet_browser_toolbar_menu_item_inset_vertical"
android:insetBottom="@dimen/new_tablet_browser_toolbar_menu_item_inset_vertical"
android:insetLeft="@dimen/new_tablet_browser_toolbar_menu_item_inset_horizontal"
android:insetRight="@dimen/new_tablet_browser_toolbar_menu_item_inset_horizontal">
<inset android:insetTop="@dimen/tablet_browser_toolbar_menu_item_inset_vertical"
android:insetBottom="@dimen/tablet_browser_toolbar_menu_item_inset_vertical"
android:insetLeft="@dimen/tablet_browser_toolbar_menu_item_inset_horizontal"
android:insetRight="@dimen/tablet_browser_toolbar_menu_item_inset_horizontal">
<shape android:shape="rectangle">
<solid android:color="@color/tablet_highlight_focused"/>
<corners android:radius="@dimen/new_tablet_browser_toolbar_menu_item_corner_radius"/>
<corners android:radius="@dimen/tablet_browser_toolbar_menu_item_corner_radius"/>
</shape>
</inset>

20
mobile/android/base/resources/drawable-large-v11/tab_strip_button.xml
Просмотреть файл

@ -9,13 +9,13 @@
<item android:state_pressed="true"
android:state_enabled="true">
<inset android:insetTop="@dimen/new_tablet_tab_strip_button_inset"
android:insetBottom="@dimen/new_tablet_tab_strip_button_inset"
android:insetLeft="@dimen/new_tablet_tab_strip_button_inset"
android:insetRight="@dimen/new_tablet_tab_strip_button_inset">
<inset android:insetTop="@dimen/tablet_tab_strip_button_inset"
android:insetBottom="@dimen/tablet_tab_strip_button_inset"
android:insetLeft="@dimen/tablet_tab_strip_button_inset"
android:insetRight="@dimen/tablet_tab_strip_button_inset">
<shape android:shape="rectangle">
<solid android:color="@color/highlight_dark"/>
<corners android:radius="@dimen/new_tablet_browser_toolbar_menu_item_corner_radius"/>
<corners android:radius="@dimen/tablet_browser_toolbar_menu_item_corner_radius"/>
</shape>
</inset>
@ -24,13 +24,13 @@
<item android:state_focused="true"
android:state_pressed="false">
<inset android:insetTop="@dimen/new_tablet_tab_strip_button_inset"
android:insetBottom="@dimen/new_tablet_tab_strip_button_inset"
android:insetLeft="@dimen/new_tablet_tab_strip_button_inset"
android:insetRight="@dimen/new_tablet_tab_strip_button_inset">
<inset android:insetTop="@dimen/tablet_tab_strip_button_inset"
android:insetBottom="@dimen/tablet_tab_strip_button_inset"
android:insetLeft="@dimen/tablet_tab_strip_button_inset"
android:insetRight="@dimen/tablet_tab_strip_button_inset">
<shape android:shape="rectangle">
<solid android:color="@color/tablet_highlight_focused"/>
<corners android:radius="@dimen/new_tablet_browser_toolbar_menu_item_corner_radius"/>
<corners android:radius="@dimen/tablet_browser_toolbar_menu_item_corner_radius"/>
</shape>
</inset>

10
mobile/android/base/resources/layout-large-v11/browser_toolbar.xml
Просмотреть файл

@ -11,7 +11,7 @@
android:layout_height="match_parent"
android:layout_alignLeft="@+id/back"
android:layout_toLeftOf="@id/menu_items"
android:layout_marginLeft="@dimen/new_tablet_nav_button_width_half"
android:layout_marginLeft="@dimen/tablet_nav_button_width_half"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:duplicateParentState="true"
@ -51,14 +51,14 @@
android:src="@drawable/ic_menu_forward"
android:background="@drawable/url_bar_nav_button"
android:alpha="0"
android:layout_width="@dimen/new_tablet_nav_button_width_plus_half"
android:layout_marginLeft="@dimen/new_tablet_nav_button_width_half"
android:layout_width="@dimen/tablet_nav_button_width_plus_half"
android:layout_marginLeft="@dimen/tablet_nav_button_width_half"
android:paddingLeft="18dp"/>
<org.mozilla.gecko.toolbar.BackButton android:id="@id/back"
style="@style/UrlBar.ImageButton"
android:layout_width="@dimen/new_tablet_nav_button_width"
android:layout_height="@dimen/new_tablet_nav_button_width"
android:layout_width="@dimen/tablet_nav_button_width"
android:layout_height="@dimen/tablet_nav_button_width"
android:layout_centerVertical="true"
android:layout_marginLeft="12dp"
android:layout_alignParentLeft="true"

2
mobile/android/base/resources/layout-large-v11/tab_strip_inner.xml
Просмотреть файл

@ -17,7 +17,7 @@
<org.mozilla.gecko.widget.ThemedImageButton
android:id="@+id/add_tab"
style="@style/UrlBar.ImageButton"
android:layout_width="@dimen/new_tablet_tab_strip_height"
android:layout_width="@dimen/tablet_tab_strip_height"
android:src="@drawable/tab_strip_add_tab"
android:contentDescription="@string/new_tab"
android:layout_marginRight="9dp"

2
mobile/android/base/resources/layout-large-v11/tab_strip_item.xml
Просмотреть файл

@ -7,7 +7,7 @@
the close button within the TabStripItemView -->
<org.mozilla.gecko.tabs.TabStripItemView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="@dimen/new_tablet_tab_strip_item_width"
android:layout_width="@dimen/tablet_tab_strip_item_width"
android:layout_height="match_parent"
android:paddingLeft="28dp"
android:paddingRight="12dp"/>

2
mobile/android/base/resources/layout-large-v11/tabs_panel_back_button.xml
Просмотреть файл

@ -12,6 +12,6 @@
android:src="@drawable/tabs_panel_nav_back"
android:contentDescription="@string/back"
android:background="@drawable/action_bar_button_inverse"
gecko:dividerVerticalPadding="@dimen/new_tablet_tab_panel_divider_vertical_padding"
gecko:dividerVerticalPadding="@dimen/tablet_tab_panel_divider_vertical_padding"
gecko:rightDivider="@drawable/tab_indicator_divider"/>

12
mobile/android/base/resources/layout-v11/tablet_tabs_item_cell.xml
Просмотреть файл

@ -16,9 +16,9 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:duplicateParentState="true"
android:paddingLeft="@dimen/new_tablet_tab_highlight_stroke_width"
android:paddingRight="@dimen/new_tablet_tab_highlight_stroke_width"
android:paddingBottom="@dimen/new_tablet_tab_highlight_stroke_width">
android:paddingLeft="@dimen/tablet_tab_highlight_stroke_width"
android:paddingRight="@dimen/tablet_tab_highlight_stroke_width"
android:paddingBottom="@dimen/tablet_tab_highlight_stroke_width">
<org.mozilla.gecko.widget.FadedSingleColorTextView
android:id="@+id/title"
@ -62,13 +62,13 @@
android:id="@+id/wrapper"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="@dimen/new_tablet_tab_highlight_stroke_width"
android:padding="@dimen/tablet_tab_highlight_stroke_width"
android:background="@drawable/tab_thumbnail"
android:duplicateParentState="true">
<org.mozilla.gecko.widget.ThumbnailView android:id="@+id/thumbnail"
android:layout_width="@dimen/new_tablet_tab_thumbnail_width"
android:layout_height="@dimen/new_tablet_tab_thumbnail_height"
android:layout_width="@dimen/tablet_tab_thumbnail_width"
android:layout_height="@dimen/tablet_tab_thumbnail_height"
/>
</org.mozilla.gecko.widget.TabThumbnailWrapper>

2
mobile/android/base/resources/layout/gecko_app.xml
Просмотреть файл

@ -102,7 +102,7 @@
android:inflatedId="@id/new_tablet_tab_strip"
android:layout="@layout/tab_strip"
android:layout_width="match_parent"
android:layout_height="@dimen/new_tablet_tab_strip_height"
android:layout_height="@dimen/tablet_tab_strip_height"
android:visibility="gone"/>
<org.mozilla.gecko.widget.GeckoViewFlipper

2
mobile/android/base/resources/layout/tabs_panel_default.xml
Просмотреть файл

@ -28,7 +28,7 @@
android:layout_height="match_parent"
android:tabStripEnabled="false"
android:divider="@drawable/tab_indicator_divider"
android:dividerPadding="@dimen/new_tablet_tab_panel_divider_vertical_padding"
android:dividerPadding="@dimen/tablet_tab_panel_divider_vertical_padding"
android:layout="@layout/tabs_panel_indicator"/>
<View android:layout_width="0dip"

2
mobile/android/base/resources/values-land/dimens.xml
Просмотреть файл

@ -9,5 +9,5 @@
<dimen name="home_remote_tabs_top_padding">16dp</dimen>
<dimen name="page_group_height">64dp</dimen>
<dimen name="new_tablet_tab_panel_grid_padding">48dp</dimen>
<dimen name="tablet_tab_panel_grid_padding">48dp</dimen>
</resources>

6
mobile/android/base/resources/values-large-v11/styles.xml
Просмотреть файл

@ -6,7 +6,7 @@
<resources>
<style name="UrlBar.ImageButton" parent="UrlBar.ImageButtonBase">
<item name="android:layout_width">@dimen/new_tablet_browser_toolbar_menu_item_width</item>
<item name="android:layout_width">@dimen/tablet_browser_toolbar_menu_item_width</item>
</style>
<style name="UrlBar.ImageButton.TabCount">
@ -54,8 +54,8 @@
* The reload button contains whitespace at the top of the image to lower it -->
<item name="android:paddingTop">19dp</item>
<item name="android:paddingBottom">21dp</item>
<item name="android:paddingLeft">@dimen/new_tablet_browser_toolbar_menu_item_padding_horizontal</item>
<item name="android:paddingRight">@dimen/new_tablet_browser_toolbar_menu_item_padding_horizontal</item>
<item name="android:paddingLeft">@dimen/tablet_browser_toolbar_menu_item_padding_horizontal</item>
<item name="android:paddingRight">@dimen/tablet_browser_toolbar_menu_item_padding_horizontal</item>
</style>
<style name="Widget.MenuItemSecondaryActionBar" parent="Widget.MenuItemSecondaryActionBarBase">

2
mobile/android/base/resources/values-xlarge-land-v11/dimens.xml
Просмотреть файл

@ -5,6 +5,6 @@
<resources>
<dimen name="new_tablet_tab_panel_grid_padding">64dp</dimen>
<dimen name="tablet_tab_panel_grid_padding">64dp</dimen>
</resources>

2
mobile/android/base/resources/values-xlarge-v11/dimens.xml
Просмотреть файл

@ -6,6 +6,6 @@
<resources>
<dimen name="panel_grid_view_column_width">250dp</dimen>
<dimen name="new_tablet_tab_panel_grid_padding">48dp</dimen>
<dimen name="tablet_tab_panel_grid_padding">48dp</dimen>
</resources>

42
mobile/android/base/resources/values/dimens.xml
Просмотреть файл

@ -28,25 +28,25 @@
<dimen name="browser_toolbar_shadow_size">2dp</dimen>
<!-- If you update one of these values, update the others. -->
<dimen name="new_tablet_nav_button_width">42dp</dimen>
<dimen name="new_tablet_nav_button_width_half">21dp</dimen>
<dimen name="new_tablet_nav_button_width_plus_half">63dp</dimen>
<dimen name="tablet_nav_button_width">42dp</dimen>
<dimen name="tablet_nav_button_width_half">21dp</dimen>
<dimen name="tablet_nav_button_width_plus_half">63dp</dimen>
<!-- This is the system default for the vertical padding for the divider of the TabWidget.
Used to mimic the divider padding on the tablet tabs panel back button. -->
<dimen name="new_tablet_tab_panel_divider_vertical_padding">12dp</dimen>
<dimen name="tablet_tab_panel_divider_vertical_padding">12dp</dimen>
<dimen name="new_tablet_tab_strip_height">48dp</dimen>
<dimen name="new_tablet_tab_strip_item_width">208dp</dimen>
<dimen name="new_tablet_tab_strip_item_margin">-28dp</dimen>
<dimen name="new_tablet_tab_strip_fading_edge_size">15dp</dimen>
<dimen name="new_tablet_browser_toolbar_menu_item_width">56dp</dimen>
<dimen name="tablet_tab_strip_height">48dp</dimen>
<dimen name="tablet_tab_strip_item_width">208dp</dimen>
<dimen name="tablet_tab_strip_item_margin">-28dp</dimen>
<dimen name="tablet_tab_strip_fading_edge_size">15dp</dimen>
<dimen name="tablet_browser_toolbar_menu_item_width">56dp</dimen>
<!-- Padding combines with an 18dp image to form the menu item width and height. -->
<dimen name="new_tablet_browser_toolbar_menu_item_padding_horizontal">19dp</dimen>
<dimen name="new_tablet_browser_toolbar_menu_item_inset_vertical">5dp</dimen>
<dimen name="new_tablet_browser_toolbar_menu_item_inset_horizontal">3dp</dimen>
<dimen name="new_tablet_browser_toolbar_menu_item_corner_radius">5dp</dimen>
<dimen name="new_tablet_tab_strip_button_inset">5dp</dimen>
<dimen name="tablet_browser_toolbar_menu_item_padding_horizontal">19dp</dimen>
<dimen name="tablet_browser_toolbar_menu_item_inset_vertical">5dp</dimen>
<dimen name="tablet_browser_toolbar_menu_item_inset_horizontal">3dp</dimen>
<dimen name="tablet_browser_toolbar_menu_item_corner_radius">5dp</dimen>
<dimen name="tablet_tab_strip_button_inset">5dp</dimen>
<!-- Dimensions used by Favicons and FaviconView -->
<dimen name="favicon_bg">32dp</dimen>
@ -145,14 +145,14 @@
<dimen name="validation_message_height">50dp</dimen>
<dimen name="validation_message_margin_top">6dp</dimen>
<dimen name="new_tablet_tab_thumbnail_width">168dp</dimen>
<dimen name="new_tablet_tab_thumbnail_height">140dp</dimen>
<dimen name="new_tablet_tab_panel_column_width">178dp</dimen>
<dimen name="new_tablet_tab_panel_grid_padding">19dp</dimen>
<dimen name="new_tablet_tab_panel_grid_vspacing">21dp</dimen>
<dimen name="new_tablet_tab_panel_grid_padding_top">24dp</dimen>
<dimen name="tablet_tab_thumbnail_width">168dp</dimen>
<dimen name="tablet_tab_thumbnail_height">140dp</dimen>
<dimen name="tablet_tab_panel_column_width">178dp</dimen>
<dimen name="tablet_tab_panel_grid_padding">19dp</dimen>
<dimen name="tablet_tab_panel_grid_vspacing">21dp</dimen>
<dimen name="tablet_tab_panel_grid_padding_top">24dp</dimen>
<dimen name="new_tablet_tab_highlight_stroke_width">5dp</dimen>
<dimen name="tablet_tab_highlight_stroke_width">5dp</dimen>
<!-- PageActionButtons dimensions -->
<dimen name="page_action_button_width">32dp</dimen>

4
mobile/android/base/resources/values/styles.xml
Просмотреть файл

@ -208,9 +208,9 @@
<item name="android:scrollbarStyle">outsideOverlay</item>
<item name="android:gravity">center</item>
<item name="android:numColumns">auto_fit</item>
<item name="android:columnWidth">@dimen/new_tablet_tab_panel_column_width</item>
<item name="android:columnWidth">@dimen/tablet_tab_panel_column_width</item>
<item name="android:horizontalSpacing">2dp</item>
<item name="android:verticalSpacing">@dimen/new_tablet_tab_panel_grid_vspacing</item>
<item name="android:verticalSpacing">@dimen/tablet_tab_panel_grid_vspacing</item>
<item name="android:drawSelectorOnTop">true</item>
<item name="android:clipToPadding">false</item>
</style>

4
mobile/android/base/tabs/TabStripView.java
Просмотреть файл

@ -70,14 +70,14 @@ public class TabStripView extends TwoWayView {
divider.getPadding(dividerPadding);
final int itemMargin =
resources.getDimensionPixelSize(R.dimen.new_tablet_tab_strip_item_margin);
resources.getDimensionPixelSize(R.dimen.tablet_tab_strip_item_margin);
setItemMargin(itemMargin);
animatorListener = new TabAnimatorListener();
fadingEdgePaint = new Paint();
fadingEdgeSize =
resources.getDimensionPixelOffset(R.dimen.new_tablet_tab_strip_fading_edge_size);
resources.getDimensionPixelOffset(R.dimen.tablet_tab_strip_fading_edge_size);
adapter = new TabStripAdapter(context);
setAdapter(adapter);

8
mobile/android/base/tabs/TabsGridLayout.java
Просмотреть файл

@ -88,10 +88,10 @@ class TabsGridLayout extends GridView
setClipToPadding(false);
final Resources resources = getResources();
mColumnWidth = resources.getDimensionPixelSize(R.dimen.new_tablet_tab_panel_column_width);
mColumnWidth = resources.getDimensionPixelSize(R.dimen.tablet_tab_panel_column_width);
final int padding = resources.getDimensionPixelSize(R.dimen.new_tablet_tab_panel_grid_padding);
final int paddingTop = resources.getDimensionPixelSize(R.dimen.new_tablet_tab_panel_grid_padding_top);
final int padding = resources.getDimensionPixelSize(R.dimen.tablet_tab_panel_grid_padding);
final int paddingTop = resources.getDimensionPixelSize(R.dimen.tablet_tab_panel_grid_padding_top);
// Lets set double the top padding on the bottom so that the last row shows up properly!
// Your demise, GridView, cannot come fast enough.
@ -142,7 +142,7 @@ class TabsGridLayout extends GridView
final int removedHeight = getChildAt(0).getMeasuredHeight();
final int verticalSpacing =
getResources().getDimensionPixelOffset(R.dimen.new_tablet_tab_panel_grid_vspacing);
getResources().getDimensionPixelOffset(R.dimen.tablet_tab_panel_grid_vspacing);
ValueAnimator paddingAnimator = ValueAnimator.ofInt(getPaddingBottom() + removedHeight + verticalSpacing, getPaddingBottom());
paddingAnimator.setDuration(ANIM_TIME_MS * 2);

2
mobile/android/base/toolbar/BrowserToolbarTablet.java
Просмотреть файл

@ -36,7 +36,7 @@ class BrowserToolbarTablet extends BrowserToolbarTabletBase {
super(context, attrs);
forwardButtonTranslationWidth =
getResources().getDimensionPixelOffset(R.dimen.new_tablet_nav_button_width);
getResources().getDimensionPixelOffset(R.dimen.tablet_nav_button_width);
// The forward button is initially expanded (in the layout file)
// so translate it for start of the expansion animation; future