diff options
| author | Maxime Biais <maxime.biais@gmail.com> | 2015-03-05 14:30:56 +0100 |
|---|---|---|
| committer | Maxime Biais <maxime.biais@gmail.com> | 2015-03-05 14:30:56 +0100 |
| commit | f16712574134f123d5245fec89d7cd9fa6ac9e3e (patch) | |
| tree | 3e1fc6dfe7359cc44543df0255547f9ae3755d26 | |
| parent | 62cfbd2e8f14f4e624dcd7c5221fd1d1b9d4fd6e (diff) | |
| parent | 6cd7432527cc908c1e910f25e1d341b299a09858 (diff) | |
| download | gradle-perf-android-medium-f16712574134f123d5245fec89d7cd9fa6ac9e3e.tar.gz | |
Merge pull request #2392 from wordpress-mobile/issue/2391-tab-elevation
Added elevation to tabs
4 files changed, 9 insertions, 4 deletions
diff --git a/WordPress/src/main/java/org/wordpress/android/widgets/FloatingActionButton.java b/WordPress/src/main/java/org/wordpress/android/widgets/FloatingActionButton.java index ca7c026e5..bd18ca635 100644 --- a/WordPress/src/main/java/org/wordpress/android/widgets/FloatingActionButton.java +++ b/WordPress/src/main/java/org/wordpress/android/widgets/FloatingActionButton.java @@ -40,7 +40,8 @@ public class FloatingActionButton extends ImageButton { void init(Context context) { mIsLollipop = (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP); if (mIsLollipop) { - setElevation(DisplayUtils.dpToPx(context, 4)); + int elevation = context.getResources().getDimensionPixelSize(R.dimen.fab_elevation); + setElevation(elevation); } int fabColor = context.getResources().getColor(R.color.fab_color); diff --git a/WordPress/src/main/res/layout/reader_activity_subs.xml b/WordPress/src/main/res/layout/reader_activity_subs.xml index 619da3833..435c5dccb 100644 --- a/WordPress/src/main/res/layout/reader_activity_subs.xml +++ b/WordPress/src/main/res/layout/reader_activity_subs.xml @@ -23,6 +23,7 @@ android:layout_height="wrap_content" android:layout_gravity="top" android:background="@color/tab_background" + android:elevation="@dimen/tabs_elevation" android:paddingBottom="@dimen/margin_large" android:paddingTop="@dimen/margin_large" android:textAppearance="@style/ReaderTabStripTextAppearance" /> diff --git a/WordPress/src/main/res/layout/theme_browser_activity.xml b/WordPress/src/main/res/layout/theme_browser_activity.xml index ccf5040d0..7810afac7 100644 --- a/WordPress/src/main/res/layout/theme_browser_activity.xml +++ b/WordPress/src/main/res/layout/theme_browser_activity.xml @@ -9,7 +9,8 @@ android:id="@+id/sliding_tabs" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/tab_background" /> + android:background="@color/tab_background" + android:elevation="@dimen/tabs_elevation" /> <android.support.v4.view.ViewPager android:id="@+id/theme_browser_pager" diff --git a/WordPress/src/main/res/values/dimens.xml b/WordPress/src/main/res/values/dimens.xml index dd0fdc677..36bf93c6c 100644 --- a/WordPress/src/main/res/values/dimens.xml +++ b/WordPress/src/main/res/values/dimens.xml @@ -12,11 +12,13 @@ <dimen name="fab_margin">@dimen/fab_margin_default</dimen> <dimen name="fab_margin_default">16dp</dimen> <dimen name="fab_margin_tablet">24dp</dimen> + <dimen name="fab_elevation">8dp</dimen> - <dimen name="card_elevation">1dp</dimen> - <dimen name="card_elevation_pressed">4dp</dimen> + <dimen name="card_elevation">2dp</dimen> + <dimen name="card_elevation_pressed">8dp</dimen> <dimen name="message_bar_elevation">2dp</dimen> + <dimen name="tabs_elevation">4dp</dimen> <dimen name="drawer_width_static">300dp</dimen> <dimen name="drawer_row_height">40dp</dimen> |