Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-22 17:55:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1106935 - Use Android resource system on tablet in ToolbarDisplayLayout. r=mhaigh

Browse Source 
We couldn't use it before because of the new/old tablet divide.

--HG--
rename : mobile/android/base/resources/drawable-large-v11/new_tablet_site_security_level.xml => mobile/android/base/resources/drawable-large-v11/site_security_level.xml
rename : mobile/android/base/resources/drawable-large-v11/new_tablet_site_security_unknown.xml => mobile/android/base/resources/drawable-large-v11/site_security_unknown.xml
extra : rebase_source : 26a5a3b8164dd48875100f3469a00b4628d62010
This commit is contained in:
Michael Comella 2015-04-01 15:55:22 -07:00
parent 17fcfdf486
commit ebb6d4982c
6 changed files with 28 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/android/base/resources/drawable-large-v11/new_tablet_site_security_level.xml → mobile/android/base/resources/drawable-large-v11/site_security_level.xml
View File

@ -5,7 +5,7 @@
<level-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:maxLevel="0" android:drawable="@drawable/new_tablet_site_security_unknown"/>
<item android:maxLevel="0" android:drawable="@drawable/site_security_unknown"/>
<item android:maxLevel="1" android:drawable="@drawable/lock_identified"/>
<item android:maxLevel="2" android:drawable="@drawable/lock_verified"/>
<item android:maxLevel="3" android:drawable="@drawable/shield_enabled"/>

4
mobile/android/base/resources/drawable-large-v11/new_tablet_site_security_unknown.xml → mobile/android/base/resources/drawable-large-v11/site_security_unknown.xml
View File

@ -8,5 +8,5 @@
<inset
xmlns:android="http://schemas.android.com/apk/res/android"
android:drawable="@drawable/favicon_globe"
android:insetTop="@dimen/new_tablet_site_security_unknown_inset_top"
android:insetBottom="@dimen/new_tablet_site_security_unknown_inset_bottom"/>
android:insetTop="@dimen/site_security_unknown_inset_top"
android:insetBottom="@dimen/site_security_unknown_inset_bottom"/>

9
mobile/android/base/resources/layout/toolbar_display_layout.xml
View File

@ -18,9 +18,14 @@
<ImageButton android:id="@+id/site_security"
style="@style/UrlBar.ImageButton"
android:layout_width="@dimen/browser_toolbar_site_security_width"
android:layout_height="@dimen/browser_toolbar_site_security_height"
android:scaleType="fitCenter"
android:layout_marginRight="4dip"
android:layout_marginBottom="@dimen/site_security_bottom_margin"
android:layout_marginRight="@dimen/browser_toolbar_site_security_margin_right"
android:layout_marginBottom="@dimen/browser_toolbar_site_security_margin_bottom"
android:paddingLeft="@dimen/browser_toolbar_site_security_padding_horizontal"
android:paddingRight="@dimen/browser_toolbar_site_security_padding_horizontal"
android:paddingTop="@dimen/browser_toolbar_site_security_padding_vertical"
android:paddingBottom="@dimen/browser_toolbar_site_security_padding_vertical"
android:src="@drawable/site_security_level"
android:contentDescription="@string/site_security"
android:visibility="gone"/>

7
mobile/android/base/resources/values-large-v11/dimens.xml
View File

@ -12,6 +12,13 @@
<dimen name="browser_toolbar_button_padding">16dp</dimen>
<dimen name="browser_toolbar_favicon_size">16dp</dimen>
<dimen name="browser_toolbar_site_security_height">60dp</dimen>
<dimen name="browser_toolbar_site_security_width">34dp</dimen>
<dimen name="browser_toolbar_site_security_margin_right">1dp</dimen>
<!-- We primarily use padding (instead of margins) to increase the hit area. -->
<dimen name="browser_toolbar_site_security_padding_vertical">21dp</dimen>
<dimen name="browser_toolbar_site_security_padding_horizontal">8dp</dimen>
<dimen name="tabs_counter_size">26sp</dimen>
<dimen name="panel_grid_view_column_width">200dp</dimen>

20
mobile/android/base/resources/values/dimens.xml
View File

@ -13,7 +13,7 @@
<dimen name="browser_toolbar_height">48dp</dimen>
<dimen name="browser_toolbar_button_padding">12dp</dimen>
<dimen name="browser_toolbar_icon_width">48dp</dimen>
<dimen name="browser_toolbar_site_security_width">12dp</dimen>
<!-- favicon_size includes 4dp of right padding. We can't use margin (which would allow us to
specify the actual size) because that would decrease the size of our hit target. -->
<dimen name="browser_toolbar_favicon_size">21.33dip</dimen>
@ -32,12 +32,6 @@
<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_site_security_height">60dp</dimen>
<dimen name="new_tablet_site_security_width">34dp</dimen>
<!-- We primarily use padding (instead of margins) to increase the hit area. -->
<dimen name="new_tablet_site_security_padding_vertical">21dp</dimen>
<dimen name="new_tablet_site_security_padding_horizontal">8dp</dimen>
<dimen name="new_tablet_site_security_right_margin">1dp</dimen>
<dimen name="new_tablet_browser_toolbar_height">60dp</dimen>
<dimen name="new_tablet_browser_toolbar_menu_item_width">56dp</dimen>
<!-- Padding combines with an 18dp image to form the menu item width and height. -->
@ -70,10 +64,16 @@
<dimen name="tab_queue_container_width">@dimen/match_parent</dimen>
<!-- Site security icon -->
<dimen name="browser_toolbar_site_security_height">@dimen/match_parent</dimen>
<dimen name="browser_toolbar_site_security_width">12dp</dimen>
<dimen name="browser_toolbar_site_security_margin_right">4dp</dimen>
<dimen name="browser_toolbar_site_security_padding_vertical">0dp</dimen>
<dimen name="browser_toolbar_site_security_padding_horizontal">0dp</dimen>
<!-- If one of these values changes, they all should. -->
<dimen name="site_security_bottom_margin">.5dp</dimen>
<dimen name="new_tablet_site_security_unknown_inset_top">1dp</dimen>
<dimen name="new_tablet_site_security_unknown_inset_bottom">-1dp</dimen>
<dimen name="browser_toolbar_site_security_margin_bottom">.5dp</dimen>
<dimen name="site_security_unknown_inset_top">1dp</dimen>
<dimen name="site_security_unknown_inset_bottom">-1dp</dimen>
<!-- Regular page row on about:home -->
<dimen name="page_row_height">64dp</dimen>

21
mobile/android/base/toolbar/ToolbarDisplayLayout.java
View File

@ -12,7 +12,6 @@ import java.util.List;
import org.mozilla.gecko.AboutPages;
import org.mozilla.gecko.AppConstants.Versions;
import org.mozilla.gecko.BrowserApp;
import org.mozilla.gecko.NewTabletUI;
import org.mozilla.gecko.R;
import org.mozilla.gecko.ReaderModeUtils;
import org.mozilla.gecko.SiteIdentity;
@ -158,26 +157,8 @@ public class ToolbarDisplayLayout extends ThemedLinearLayout
mFavicon = (ImageButton) findViewById(R.id.favicon);
mSiteSecurity = (ImageButton) findViewById(R.id.site_security);
if (NewTabletUI.isEnabled(context)) {
if (HardwareUtils.isTablet()) {
mSiteSecurity.setVisibility(View.VISIBLE);
// TODO: Rename this resource and remove this call when new tablet is default.
mSiteSecurity.setImageResource(R.drawable.new_tablet_site_security_level);
// TODO: This can likely be set statically in resources when new tablet is default.
// Dynamically update parameters for new tablet.
final LinearLayout.LayoutParams lp =
(LinearLayout.LayoutParams) mSiteSecurity.getLayoutParams();
lp.height = res.getDimensionPixelSize(R.dimen.new_tablet_site_security_height);
lp.width = res.getDimensionPixelSize(R.dimen.new_tablet_site_security_width);
// TODO: Override a common static value when new tablet is standard.
lp.rightMargin = res.getDimensionPixelSize(R.dimen.new_tablet_site_security_right_margin);
mSiteSecurity.setLayoutParams(lp);
final int siteSecurityVerticalPadding =
res.getDimensionPixelSize(R.dimen.new_tablet_site_security_padding_vertical);
final int siteSecurityHorizontalPadding =
res.getDimensionPixelSize(R.dimen.new_tablet_site_security_padding_horizontal);
mSiteSecurity.setPadding(siteSecurityHorizontalPadding, siteSecurityVerticalPadding,
siteSecurityHorizontalPadding, siteSecurityVerticalPadding);
// We don't show favicons in the toolbar on new tablet. Note that while we could
// null the favicon reference, we don't do so to avoid excessive null-checking.