зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1054371 - Part 1: Use solid stroke in back/forward buttons (r=mcomella)
This commit is contained in:
Родитель
43f59b6ba5
Коммит
a81952916f
|
@ -8,7 +8,7 @@
|
||||||
<style name="UrlBar.ImageButton.Forward">
|
<style name="UrlBar.ImageButton.Forward">
|
||||||
<item name="android:contentDescription">@string/forward</item>
|
<item name="android:contentDescription">@string/forward</item>
|
||||||
<item name="android:layout_width">45dip</item>
|
<item name="android:layout_width">45dip</item>
|
||||||
<item name="android:layout_height">36dip</item>
|
<item name="android:layout_height">37dip</item>
|
||||||
<item name="android:paddingLeft">10dp</item>
|
<item name="android:paddingLeft">10dp</item>
|
||||||
<item name="android:paddingTop">7dp</item>
|
<item name="android:paddingTop">7dp</item>
|
||||||
<item name="android:paddingBottom">7dp</item>
|
<item name="android:paddingBottom">7dp</item>
|
||||||
|
|
|
@ -53,7 +53,7 @@
|
||||||
<dimen name="menu_item_more_offset">5dp</dimen>
|
<dimen name="menu_item_more_offset">5dp</dimen>
|
||||||
<dimen name="menu_popup_offset">12dp</dimen>
|
<dimen name="menu_popup_offset">12dp</dimen>
|
||||||
<dimen name="menu_popup_width">256dp</dimen>
|
<dimen name="menu_popup_width">256dp</dimen>
|
||||||
<dimen name="nav_button_border_width">0.75dp</dimen>
|
<dimen name="nav_button_border_width">1dp</dimen>
|
||||||
<dimen name="prompt_service_group_padding_size">32dp</dimen>
|
<dimen name="prompt_service_group_padding_size">32dp</dimen>
|
||||||
<dimen name="prompt_service_icon_size">36dp</dimen>
|
<dimen name="prompt_service_icon_size">36dp</dimen>
|
||||||
<dimen name="prompt_service_icon_text_padding">10dp</dimen>
|
<dimen name="prompt_service_icon_text_padding">10dp</dimen>
|
||||||
|
|
|
@ -28,10 +28,11 @@ public class BackButton extends ShapedButton {
|
||||||
// Paint to draw the border.
|
// Paint to draw the border.
|
||||||
mBorderPaint = new Paint();
|
mBorderPaint = new Paint();
|
||||||
mBorderPaint.setAntiAlias(true);
|
mBorderPaint.setAntiAlias(true);
|
||||||
mBorderPaint.setColor(0xFF000000);
|
mBorderPaint.setColor(0xFFB5B5B5);
|
||||||
mBorderPaint.setStyle(Paint.Style.STROKE);
|
mBorderPaint.setStyle(Paint.Style.STROKE);
|
||||||
|
|
||||||
mBorderPrivatePaint = new Paint(mBorderPaint);
|
mBorderPrivatePaint = new Paint(mBorderPaint);
|
||||||
|
mBorderPrivatePaint.setColor(0xFF363B40);
|
||||||
|
|
||||||
// Path is masked.
|
// Path is masked.
|
||||||
mPath = new Path();
|
mPath = new Path();
|
||||||
|
@ -51,16 +52,6 @@ public class BackButton extends ShapedButton {
|
||||||
|
|
||||||
mBorderPath.reset();
|
mBorderPath.reset();
|
||||||
mBorderPath.addCircle(width/2, height/2, (width/2) - borderWidth, Path.Direction.CW);
|
mBorderPath.addCircle(width/2, height/2, (width/2) - borderWidth, Path.Direction.CW);
|
||||||
|
|
||||||
mBorderPaint.setShader(new LinearGradient(0, 0,
|
|
||||||
0, height,
|
|
||||||
0xFFB5BBC1, 0xFFFAFBFC,
|
|
||||||
Shader.TileMode.CLAMP));
|
|
||||||
|
|
||||||
mBorderPrivatePaint.setShader(new LinearGradient(0, 0,
|
|
||||||
0, height,
|
|
||||||
0xFF040607, 0xFF0B0D0E,
|
|
||||||
Shader.TileMode.CLAMP));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -27,10 +27,11 @@ public class ForwardButton extends ShapedButton {
|
||||||
// Paint to draw the border.
|
// Paint to draw the border.
|
||||||
mBorderPaint = new Paint();
|
mBorderPaint = new Paint();
|
||||||
mBorderPaint.setAntiAlias(true);
|
mBorderPaint.setAntiAlias(true);
|
||||||
mBorderPaint.setColor(0xFF000000);
|
mBorderPaint.setColor(0xFFB5B5B5);
|
||||||
mBorderPaint.setStyle(Paint.Style.STROKE);
|
mBorderPaint.setStyle(Paint.Style.STROKE);
|
||||||
|
|
||||||
mBorderPrivatePaint = new Paint(mBorderPaint);
|
mBorderPrivatePaint = new Paint(mBorderPaint);
|
||||||
|
mBorderPrivatePaint.setColor(0xFF363B40);
|
||||||
|
|
||||||
mBorderPath = new Path();
|
mBorderPath = new Path();
|
||||||
}
|
}
|
||||||
|
@ -46,16 +47,6 @@ public class ForwardButton extends ShapedButton {
|
||||||
mBorderPath.reset();
|
mBorderPath.reset();
|
||||||
mBorderPath.moveTo(width - borderWidth, 0);
|
mBorderPath.moveTo(width - borderWidth, 0);
|
||||||
mBorderPath.lineTo(width - borderWidth, height);
|
mBorderPath.lineTo(width - borderWidth, height);
|
||||||
|
|
||||||
mBorderPaint.setShader(new LinearGradient(0, 0,
|
|
||||||
0, height,
|
|
||||||
0xFFB5BBC1, 0xFFFAFBFC,
|
|
||||||
Shader.TileMode.CLAMP));
|
|
||||||
|
|
||||||
mBorderPrivatePaint.setShader(new LinearGradient(0, 0,
|
|
||||||
0, height,
|
|
||||||
0xFF040607, 0xFF0B0D0E,
|
|
||||||
Shader.TileMode.CLAMP));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
Загрузка…
Ссылка в новой задаче