diff options
| author | Maurice Lam <yukl@google.com> | 2014-12-20 02:16:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-20 02:16:37 +0000 |
| commit | 26abd73aa1ffbf616fabca73b0a996b62ceb21b0 (patch) | |
| tree | 2852306eefc68043355d9cdf32e26c94cf9b4b40 /navigationbar | |
| parent | ee2b9b0bc3b6472b01b6a76644ca7174fb443f32 (diff) | |
| parent | f993f7100afe422da048ec2450bfdf452d71c5db (diff) | |
| download | android_frameworks_opt_setupwizard-26abd73aa1ffbf616fabca73b0a996b62ceb21b0.tar.gz android_frameworks_opt_setupwizard-26abd73aa1ffbf616fabca73b0a996b62ceb21b0.tar.bz2 android_frameworks_opt_setupwizard-26abd73aa1ffbf616fabca73b0a996b62ceb21b0.zip | |
Merge "Refactor dimension values to dimens.xml"
Diffstat (limited to 'navigationbar')
| -rw-r--r-- | navigationbar/res/drawable/setup_wizard_navbar_ic_back.xml | 4 | ||||
| -rw-r--r-- | navigationbar/res/drawable/setup_wizard_navbar_ic_next.xml | 4 | ||||
| -rw-r--r-- | navigationbar/res/values/dimens.xml | 9 | ||||
| -rw-r--r-- | navigationbar/res/values/styles.xml | 14 |
4 files changed, 20 insertions, 11 deletions
diff --git a/navigationbar/res/drawable/setup_wizard_navbar_ic_back.xml b/navigationbar/res/drawable/setup_wizard_navbar_ic_back.xml index 7f044fc..260e913 100644 --- a/navigationbar/res/drawable/setup_wizard_navbar_ic_back.xml +++ b/navigationbar/res/drawable/setup_wizard_navbar_ic_back.xml @@ -16,8 +16,8 @@ --> <vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" - android:width="24dp" - android:height="24dp" + android:width="@dimen/setup_wizard_navbar_ic_intrinsic_size" + android:height="@dimen/setup_wizard_navbar_ic_intrinsic_size" android:viewportWidth="24" android:viewportHeight="24"> diff --git a/navigationbar/res/drawable/setup_wizard_navbar_ic_next.xml b/navigationbar/res/drawable/setup_wizard_navbar_ic_next.xml index 056b0bf..1b40776 100644 --- a/navigationbar/res/drawable/setup_wizard_navbar_ic_next.xml +++ b/navigationbar/res/drawable/setup_wizard_navbar_ic_next.xml @@ -16,8 +16,8 @@ --> <vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" - android:width="24dp" - android:height="24dp" + android:width="@dimen/setup_wizard_navbar_ic_intrinsic_size" + android:height="@dimen/setup_wizard_navbar_ic_intrinsic_size" android:viewportWidth="24" android:viewportHeight="24"> diff --git a/navigationbar/res/values/dimens.xml b/navigationbar/res/values/dimens.xml new file mode 100644 index 0000000..df67d9f --- /dev/null +++ b/navigationbar/res/values/dimens.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <dimen name="setup_wizard_navbar_button_drawable_padding">6dp</dimen> + <dimen name="setup_wizard_navbar_button_padding_sides">10dp</dimen> + <dimen name="setup_wizard_navbar_height">56dp</dimen> + <dimen name="setup_wizard_navbar_ic_intrinsic_size">24dp</dimen> + <dimen name="setup_wizard_navbar_padding_sides">24dp</dimen> + <dimen name="setup_wizard_navbar_text_size">16sp</dimen> +</resources> diff --git a/navigationbar/res/values/styles.xml b/navigationbar/res/values/styles.xml index 366aa2d..9aa9a85 100644 --- a/navigationbar/res/values/styles.xml +++ b/navigationbar/res/values/styles.xml @@ -7,12 +7,12 @@ <style name="setup_wizard_navbar_style"> <item name="android:orientation">horizontal</item> - <item name="android:layout_height">56dp</item> + <item name="android:layout_height">@dimen/setup_wizard_navbar_height</item> <item name="android:layout_width">match_parent</item> <item name="android:layout_alignParentBottom">true</item> <item name="android:background">?attr/setup_wizard_navbar_bg_color</item> - <item name="android:paddingStart">24dp</item> - <item name="android:paddingEnd">24dp</item> + <item name="android:paddingStart">@dimen/setup_wizard_navbar_padding_sides</item> + <item name="android:paddingEnd">@dimen/setup_wizard_navbar_padding_sides</item> </style> <style name="setup_wizard_navbar_theme_dark"> @@ -30,14 +30,14 @@ <item name="android:layout_height">match_parent</item> <item name="android:layout_weight">0</item> <item name="android:background">@drawable/setup_wizard_navbar_btn_bg</item> - <item name="android:drawablePadding">6dp</item> + <item name="android:drawablePadding">@dimen/setup_wizard_navbar_button_drawable_padding</item> <item name="android:fontFamily">sans-serif</item> <item name="android:minWidth">0dp</item> - <item name="android:paddingEnd">10dp</item> - <item name="android:paddingStart">10dp</item> + <item name="android:paddingEnd">@dimen/setup_wizard_navbar_button_padding_sides</item> + <item name="android:paddingStart">@dimen/setup_wizard_navbar_button_padding_sides</item> <item name="android:textAllCaps">true</item> <item name="android:textColor">?attr/setup_wizard_navbar_text_color</item> - <item name="android:textSize">16sp</item> + <item name="android:textSize">@dimen/setup_wizard_navbar_text_size</item> </style> </resources> |