diff --git a/library/Android.mk b/library/Android.mk index 889f8d1..67cddb5 100644 --- a/library/Android.mk +++ b/library/Android.mk @@ -8,6 +8,6 @@ LOCAL_RESOURCE_DIR := \ $(LOCAL_PATH)/main/res \ $(LOCAL_PATH)/platform/res LOCAL_SDK_VERSION := current -LOCAL_SRC_FILES := $(call all-java-files-under, main/src) +LOCAL_SRC_FILES := $(call all-java-files-under, main/src platform/src) include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/library/eclair-mr1/res/drawable-hdpi/suw_navbar_ic_down_arrow_light.png b/library/eclair-mr1/res/drawable-hdpi/suw_navbar_ic_down_arrow.png similarity index 100% rename from library/eclair-mr1/res/drawable-hdpi/suw_navbar_ic_down_arrow_light.png rename to library/eclair-mr1/res/drawable-hdpi/suw_navbar_ic_down_arrow.png diff --git a/library/eclair-mr1/res/drawable-hdpi/suw_navbar_ic_down_arrow_dark.png b/library/eclair-mr1/res/drawable-hdpi/suw_navbar_ic_down_arrow_dark.png deleted file mode 100644 index bbb4fb4..0000000 Binary files a/library/eclair-mr1/res/drawable-hdpi/suw_navbar_ic_down_arrow_dark.png and /dev/null differ diff --git a/library/eclair-mr1/res/drawable-hdpi/suw_navbar_ic_left_arrow_light.png b/library/eclair-mr1/res/drawable-hdpi/suw_navbar_ic_left_arrow.png similarity index 100% rename from library/eclair-mr1/res/drawable-hdpi/suw_navbar_ic_left_arrow_light.png rename to library/eclair-mr1/res/drawable-hdpi/suw_navbar_ic_left_arrow.png diff --git a/library/eclair-mr1/res/drawable-hdpi/suw_navbar_ic_left_arrow_dark.png b/library/eclair-mr1/res/drawable-hdpi/suw_navbar_ic_left_arrow_dark.png deleted file mode 100644 index 9ef990a..0000000 Binary files a/library/eclair-mr1/res/drawable-hdpi/suw_navbar_ic_left_arrow_dark.png and /dev/null differ diff --git a/library/eclair-mr1/res/drawable-hdpi/suw_navbar_ic_right_arrow_light.png b/library/eclair-mr1/res/drawable-hdpi/suw_navbar_ic_right_arrow.png similarity index 100% rename from library/eclair-mr1/res/drawable-hdpi/suw_navbar_ic_right_arrow_light.png rename to library/eclair-mr1/res/drawable-hdpi/suw_navbar_ic_right_arrow.png diff --git a/library/eclair-mr1/res/drawable-hdpi/suw_navbar_ic_right_arrow_dark.png b/library/eclair-mr1/res/drawable-hdpi/suw_navbar_ic_right_arrow_dark.png deleted file mode 100644 index 5df1343..0000000 Binary files a/library/eclair-mr1/res/drawable-hdpi/suw_navbar_ic_right_arrow_dark.png and /dev/null differ diff --git a/library/eclair-mr1/res/drawable/suw_navbar_ic_back_dark.xml b/library/eclair-mr1/res/drawable-ldrtl/suw_navbar_ic_back.xml similarity index 92% rename from library/eclair-mr1/res/drawable/suw_navbar_ic_back_dark.xml rename to library/eclair-mr1/res/drawable-ldrtl/suw_navbar_ic_back.xml index 0a825f3..e164e8a 100644 --- a/library/eclair-mr1/res/drawable/suw_navbar_ic_back_dark.xml +++ b/library/eclair-mr1/res/drawable-ldrtl/suw_navbar_ic_back.xml @@ -16,4 +16,4 @@ --> + android:src="@drawable/suw_navbar_ic_right_arrow" /> diff --git a/library/eclair-mr1/res/drawable-ldrtl/suw_navbar_ic_back_light.xml b/library/eclair-mr1/res/drawable-ldrtl/suw_navbar_ic_back_light.xml deleted file mode 100644 index 8fbd5fc..0000000 --- a/library/eclair-mr1/res/drawable-ldrtl/suw_navbar_ic_back_light.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - diff --git a/library/eclair-mr1/res/drawable-ldrtl/suw_navbar_ic_next_dark.xml b/library/eclair-mr1/res/drawable-ldrtl/suw_navbar_ic_next.xml similarity index 92% rename from library/eclair-mr1/res/drawable-ldrtl/suw_navbar_ic_next_dark.xml rename to library/eclair-mr1/res/drawable-ldrtl/suw_navbar_ic_next.xml index 0a825f3..8a6e137 100644 --- a/library/eclair-mr1/res/drawable-ldrtl/suw_navbar_ic_next_dark.xml +++ b/library/eclair-mr1/res/drawable-ldrtl/suw_navbar_ic_next.xml @@ -16,4 +16,4 @@ --> + android:src="@drawable/suw_navbar_ic_left_arrow" /> diff --git a/library/eclair-mr1/res/drawable-ldrtl/suw_navbar_ic_next_light.xml b/library/eclair-mr1/res/drawable-ldrtl/suw_navbar_ic_next_light.xml deleted file mode 100644 index 894398f..0000000 --- a/library/eclair-mr1/res/drawable-ldrtl/suw_navbar_ic_next_light.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - diff --git a/library/eclair-mr1/res/drawable-mdpi/suw_navbar_ic_down_arrow_light.png b/library/eclair-mr1/res/drawable-mdpi/suw_navbar_ic_down_arrow.png similarity index 100% rename from library/eclair-mr1/res/drawable-mdpi/suw_navbar_ic_down_arrow_light.png rename to library/eclair-mr1/res/drawable-mdpi/suw_navbar_ic_down_arrow.png diff --git a/library/eclair-mr1/res/drawable-mdpi/suw_navbar_ic_down_arrow_dark.png b/library/eclair-mr1/res/drawable-mdpi/suw_navbar_ic_down_arrow_dark.png deleted file mode 100644 index ef8a4b6..0000000 Binary files a/library/eclair-mr1/res/drawable-mdpi/suw_navbar_ic_down_arrow_dark.png and /dev/null differ diff --git a/library/eclair-mr1/res/drawable-mdpi/suw_navbar_ic_left_arrow_light.png b/library/eclair-mr1/res/drawable-mdpi/suw_navbar_ic_left_arrow.png similarity index 100% rename from library/eclair-mr1/res/drawable-mdpi/suw_navbar_ic_left_arrow_light.png rename to library/eclair-mr1/res/drawable-mdpi/suw_navbar_ic_left_arrow.png diff --git a/library/eclair-mr1/res/drawable-mdpi/suw_navbar_ic_left_arrow_dark.png b/library/eclair-mr1/res/drawable-mdpi/suw_navbar_ic_left_arrow_dark.png deleted file mode 100644 index 284b1f0..0000000 Binary files a/library/eclair-mr1/res/drawable-mdpi/suw_navbar_ic_left_arrow_dark.png and /dev/null differ diff --git a/library/eclair-mr1/res/drawable-mdpi/suw_navbar_ic_right_arrow_light.png b/library/eclair-mr1/res/drawable-mdpi/suw_navbar_ic_right_arrow.png similarity index 100% rename from library/eclair-mr1/res/drawable-mdpi/suw_navbar_ic_right_arrow_light.png rename to library/eclair-mr1/res/drawable-mdpi/suw_navbar_ic_right_arrow.png diff --git a/library/eclair-mr1/res/drawable-mdpi/suw_navbar_ic_right_arrow_dark.png b/library/eclair-mr1/res/drawable-mdpi/suw_navbar_ic_right_arrow_dark.png deleted file mode 100644 index 5565575..0000000 Binary files a/library/eclair-mr1/res/drawable-mdpi/suw_navbar_ic_right_arrow_dark.png and /dev/null differ diff --git a/library/eclair-mr1/res/drawable-xhdpi/suw_navbar_ic_down_arrow_light.png b/library/eclair-mr1/res/drawable-xhdpi/suw_navbar_ic_down_arrow.png similarity index 100% rename from library/eclair-mr1/res/drawable-xhdpi/suw_navbar_ic_down_arrow_light.png rename to library/eclair-mr1/res/drawable-xhdpi/suw_navbar_ic_down_arrow.png diff --git a/library/eclair-mr1/res/drawable-xhdpi/suw_navbar_ic_down_arrow_dark.png b/library/eclair-mr1/res/drawable-xhdpi/suw_navbar_ic_down_arrow_dark.png deleted file mode 100644 index 058cebb..0000000 Binary files a/library/eclair-mr1/res/drawable-xhdpi/suw_navbar_ic_down_arrow_dark.png and /dev/null differ diff --git a/library/eclair-mr1/res/drawable-xhdpi/suw_navbar_ic_left_arrow_light.png b/library/eclair-mr1/res/drawable-xhdpi/suw_navbar_ic_left_arrow.png similarity index 100% rename from library/eclair-mr1/res/drawable-xhdpi/suw_navbar_ic_left_arrow_light.png rename to library/eclair-mr1/res/drawable-xhdpi/suw_navbar_ic_left_arrow.png diff --git a/library/eclair-mr1/res/drawable-xhdpi/suw_navbar_ic_left_arrow_dark.png b/library/eclair-mr1/res/drawable-xhdpi/suw_navbar_ic_left_arrow_dark.png deleted file mode 100644 index 50c15b3..0000000 Binary files a/library/eclair-mr1/res/drawable-xhdpi/suw_navbar_ic_left_arrow_dark.png and /dev/null differ diff --git a/library/eclair-mr1/res/drawable-xhdpi/suw_navbar_ic_right_arrow_light.png b/library/eclair-mr1/res/drawable-xhdpi/suw_navbar_ic_right_arrow.png similarity index 100% rename from library/eclair-mr1/res/drawable-xhdpi/suw_navbar_ic_right_arrow_light.png rename to library/eclair-mr1/res/drawable-xhdpi/suw_navbar_ic_right_arrow.png diff --git a/library/eclair-mr1/res/drawable-xhdpi/suw_navbar_ic_right_arrow_dark.png b/library/eclair-mr1/res/drawable-xhdpi/suw_navbar_ic_right_arrow_dark.png deleted file mode 100644 index 53a294d..0000000 Binary files a/library/eclair-mr1/res/drawable-xhdpi/suw_navbar_ic_right_arrow_dark.png and /dev/null differ diff --git a/library/eclair-mr1/res/drawable-xxhdpi/suw_navbar_ic_down_arrow_light.png b/library/eclair-mr1/res/drawable-xxhdpi/suw_navbar_ic_down_arrow.png similarity index 100% rename from library/eclair-mr1/res/drawable-xxhdpi/suw_navbar_ic_down_arrow_light.png rename to library/eclair-mr1/res/drawable-xxhdpi/suw_navbar_ic_down_arrow.png diff --git a/library/eclair-mr1/res/drawable-xxhdpi/suw_navbar_ic_down_arrow_dark.png b/library/eclair-mr1/res/drawable-xxhdpi/suw_navbar_ic_down_arrow_dark.png deleted file mode 100644 index f9622b7..0000000 Binary files a/library/eclair-mr1/res/drawable-xxhdpi/suw_navbar_ic_down_arrow_dark.png and /dev/null differ diff --git a/library/eclair-mr1/res/drawable-xxhdpi/suw_navbar_ic_left_arrow_light.png b/library/eclair-mr1/res/drawable-xxhdpi/suw_navbar_ic_left_arrow.png similarity index 100% rename from library/eclair-mr1/res/drawable-xxhdpi/suw_navbar_ic_left_arrow_light.png rename to library/eclair-mr1/res/drawable-xxhdpi/suw_navbar_ic_left_arrow.png diff --git a/library/eclair-mr1/res/drawable-xxhdpi/suw_navbar_ic_left_arrow_dark.png b/library/eclair-mr1/res/drawable-xxhdpi/suw_navbar_ic_left_arrow_dark.png deleted file mode 100644 index d0a219b..0000000 Binary files a/library/eclair-mr1/res/drawable-xxhdpi/suw_navbar_ic_left_arrow_dark.png and /dev/null differ diff --git a/library/eclair-mr1/res/drawable-xxhdpi/suw_navbar_ic_right_arrow_light.png b/library/eclair-mr1/res/drawable-xxhdpi/suw_navbar_ic_right_arrow.png similarity index 100% rename from library/eclair-mr1/res/drawable-xxhdpi/suw_navbar_ic_right_arrow_light.png rename to library/eclair-mr1/res/drawable-xxhdpi/suw_navbar_ic_right_arrow.png diff --git a/library/eclair-mr1/res/drawable-xxhdpi/suw_navbar_ic_right_arrow_dark.png b/library/eclair-mr1/res/drawable-xxhdpi/suw_navbar_ic_right_arrow_dark.png deleted file mode 100644 index 1c017f4..0000000 Binary files a/library/eclair-mr1/res/drawable-xxhdpi/suw_navbar_ic_right_arrow_dark.png and /dev/null differ diff --git a/library/eclair-mr1/res/drawable-xxxhdpi/suw_navbar_ic_down_arrow_light.png b/library/eclair-mr1/res/drawable-xxxhdpi/suw_navbar_ic_down_arrow.png similarity index 100% rename from library/eclair-mr1/res/drawable-xxxhdpi/suw_navbar_ic_down_arrow_light.png rename to library/eclair-mr1/res/drawable-xxxhdpi/suw_navbar_ic_down_arrow.png diff --git a/library/eclair-mr1/res/drawable-xxxhdpi/suw_navbar_ic_down_arrow_dark.png b/library/eclair-mr1/res/drawable-xxxhdpi/suw_navbar_ic_down_arrow_dark.png deleted file mode 100644 index 30948d9..0000000 Binary files a/library/eclair-mr1/res/drawable-xxxhdpi/suw_navbar_ic_down_arrow_dark.png and /dev/null differ diff --git a/library/eclair-mr1/res/drawable-xxxhdpi/suw_navbar_ic_left_arrow_light.png b/library/eclair-mr1/res/drawable-xxxhdpi/suw_navbar_ic_left_arrow.png similarity index 100% rename from library/eclair-mr1/res/drawable-xxxhdpi/suw_navbar_ic_left_arrow_light.png rename to library/eclair-mr1/res/drawable-xxxhdpi/suw_navbar_ic_left_arrow.png diff --git a/library/eclair-mr1/res/drawable-xxxhdpi/suw_navbar_ic_left_arrow_dark.png b/library/eclair-mr1/res/drawable-xxxhdpi/suw_navbar_ic_left_arrow_dark.png deleted file mode 100644 index 038d2f8..0000000 Binary files a/library/eclair-mr1/res/drawable-xxxhdpi/suw_navbar_ic_left_arrow_dark.png and /dev/null differ diff --git a/library/eclair-mr1/res/drawable-xxxhdpi/suw_navbar_ic_right_arrow_light.png b/library/eclair-mr1/res/drawable-xxxhdpi/suw_navbar_ic_right_arrow.png similarity index 100% rename from library/eclair-mr1/res/drawable-xxxhdpi/suw_navbar_ic_right_arrow_light.png rename to library/eclair-mr1/res/drawable-xxxhdpi/suw_navbar_ic_right_arrow.png diff --git a/library/eclair-mr1/res/drawable-xxxhdpi/suw_navbar_ic_right_arrow_dark.png b/library/eclair-mr1/res/drawable-xxxhdpi/suw_navbar_ic_right_arrow_dark.png deleted file mode 100644 index b640ddc..0000000 Binary files a/library/eclair-mr1/res/drawable-xxxhdpi/suw_navbar_ic_right_arrow_dark.png and /dev/null differ diff --git a/library/eclair-mr1/res/drawable/suw_navbar_ic_more_dark.xml b/library/eclair-mr1/res/drawable/suw_navbar_ic_back.xml similarity index 92% rename from library/eclair-mr1/res/drawable/suw_navbar_ic_more_dark.xml rename to library/eclair-mr1/res/drawable/suw_navbar_ic_back.xml index 15df735..8a6e137 100644 --- a/library/eclair-mr1/res/drawable/suw_navbar_ic_more_dark.xml +++ b/library/eclair-mr1/res/drawable/suw_navbar_ic_back.xml @@ -16,4 +16,4 @@ --> + android:src="@drawable/suw_navbar_ic_left_arrow" /> diff --git a/library/eclair-mr1/res/drawable/suw_navbar_ic_back_light.xml b/library/eclair-mr1/res/drawable/suw_navbar_ic_back_light.xml deleted file mode 100644 index 894398f..0000000 --- a/library/eclair-mr1/res/drawable/suw_navbar_ic_back_light.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - diff --git a/library/eclair-mr1/res/drawable-ldrtl/suw_navbar_ic_back_dark.xml b/library/eclair-mr1/res/drawable/suw_navbar_ic_more.xml similarity index 92% rename from library/eclair-mr1/res/drawable-ldrtl/suw_navbar_ic_back_dark.xml rename to library/eclair-mr1/res/drawable/suw_navbar_ic_more.xml index 8256fc6..603e08d 100644 --- a/library/eclair-mr1/res/drawable-ldrtl/suw_navbar_ic_back_dark.xml +++ b/library/eclair-mr1/res/drawable/suw_navbar_ic_more.xml @@ -16,4 +16,4 @@ --> + android:src="@drawable/suw_navbar_ic_down_arrow" /> diff --git a/library/eclair-mr1/res/drawable/suw_navbar_ic_more_light.xml b/library/eclair-mr1/res/drawable/suw_navbar_ic_more_light.xml deleted file mode 100644 index 9c6e809..0000000 --- a/library/eclair-mr1/res/drawable/suw_navbar_ic_more_light.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - diff --git a/library/eclair-mr1/res/drawable/suw_navbar_ic_next.xml b/library/eclair-mr1/res/drawable/suw_navbar_ic_next.xml new file mode 100644 index 0000000..e164e8a --- /dev/null +++ b/library/eclair-mr1/res/drawable/suw_navbar_ic_next.xml @@ -0,0 +1,19 @@ + + + + diff --git a/library/eclair-mr1/res/drawable/suw_navbar_ic_next_dark.xml b/library/eclair-mr1/res/drawable/suw_navbar_ic_next_dark.xml deleted file mode 100644 index 8256fc6..0000000 --- a/library/eclair-mr1/res/drawable/suw_navbar_ic_next_dark.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - diff --git a/library/eclair-mr1/res/drawable/suw_navbar_ic_next_light.xml b/library/eclair-mr1/res/drawable/suw_navbar_ic_next_light.xml deleted file mode 100644 index 8fbd5fc..0000000 --- a/library/eclair-mr1/res/drawable/suw_navbar_ic_next_light.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - diff --git a/library/eclair-mr1/res/values/styles.xml b/library/eclair-mr1/res/values/styles.xml index c9d6ed5..f3cec90 100644 --- a/library/eclair-mr1/res/values/styles.xml +++ b/library/eclair-mr1/res/values/styles.xml @@ -75,21 +75,13 @@ diff --git a/library/eclair-mr1/src/com/android/setupwizardlib/view/NavigationBarButton.java b/library/eclair-mr1/src/com/android/setupwizardlib/view/NavigationBarButton.java new file mode 100644 index 0000000..85c8c3c --- /dev/null +++ b/library/eclair-mr1/src/com/android/setupwizardlib/view/NavigationBarButton.java @@ -0,0 +1,107 @@ +/* + * Copyright (C) 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.setupwizardlib.view; + +import android.content.Context; +import android.content.res.ColorStateList; +import android.graphics.drawable.Drawable; +import android.os.Build; +import android.support.v4.graphics.drawable.DrawableCompat; +import android.util.AttributeSet; +import android.widget.Button; + +public class NavigationBarButton extends Button { + + public NavigationBarButton(Context context) { + super(context); + init(); + } + + public NavigationBarButton(Context context, AttributeSet attrs) { + super(context, attrs); + init(); + } + + private void init() { + // Unfortunately, drawableStart and drawableEnd set through XML does not call the setter, + // so manually getting it and wrapping it in the compat drawable. + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { + Drawable[] drawables = getCompoundDrawablesRelative(); + for (int i = 0; i < drawables.length; i++) { + if (drawables[i] != null) { + drawables[i] = DrawableCompat.wrap(drawables[i].mutate()); + } + } + setCompoundDrawablesRelativeWithIntrinsicBounds(drawables[0], drawables[1], + drawables[2], drawables[3]); + } + } + + @Override + public void setCompoundDrawables(Drawable left, Drawable top, Drawable right, Drawable bottom) { + if (left != null) left = DrawableCompat.wrap(left.mutate()); + if (top != null) top = DrawableCompat.wrap(top.mutate()); + if (right != null) right = DrawableCompat.wrap(right.mutate()); + if (bottom != null) bottom = DrawableCompat.wrap(bottom.mutate()); + super.setCompoundDrawables(left, top, right, bottom); + tintDrawables(); + } + + @Override + public void setCompoundDrawablesRelative(Drawable start, Drawable top, Drawable end, + Drawable bottom) { + if (start != null) start = DrawableCompat.wrap(start.mutate()); + if (top != null) top = DrawableCompat.wrap(top.mutate()); + if (end != null) end = DrawableCompat.wrap(end.mutate()); + if (bottom != null) bottom = DrawableCompat.wrap(bottom.mutate()); + super.setCompoundDrawablesRelative(start, top, end, bottom); + tintDrawables(); + } + + @Override + public void setTextColor(ColorStateList colors) { + super.setTextColor(colors); + tintDrawables(); + } + + private void tintDrawables() { + final ColorStateList textColors = getTextColors(); + if (textColors != null) { + for (Drawable drawable : getAllCompoundDrawables()) { + if (drawable != null) { + DrawableCompat.setTintList(drawable, textColors); + } + } + invalidate(); + } + } + + private Drawable[] getAllCompoundDrawables() { + Drawable[] drawables = new Drawable[6]; + Drawable[] compoundDrawables = getCompoundDrawables(); + drawables[0] = compoundDrawables[0]; // left + drawables[1] = compoundDrawables[1]; // top + drawables[2] = compoundDrawables[2]; // right + drawables[3] = compoundDrawables[3]; // bottom + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { + Drawable[] compoundDrawablesRelative = getCompoundDrawablesRelative(); + drawables[4] = compoundDrawablesRelative[0]; // start + drawables[5] = compoundDrawablesRelative[2]; // end + } + return drawables; + } +} diff --git a/library/main/res/drawable-anydpi-v21/suw_navbar_ic_back.xml b/library/main/res/drawable-anydpi-v21/suw_navbar_ic_back.xml index d0ea84c..d0bff09 100644 --- a/library/main/res/drawable-anydpi-v21/suw_navbar_ic_back.xml +++ b/library/main/res/drawable-anydpi-v21/suw_navbar_ic_back.xml @@ -19,11 +19,13 @@ android:autoMirrored="true" android:width="@dimen/suw_navbar_ic_intrinsic_size" android:height="@dimen/suw_navbar_ic_intrinsic_size" + android:tint="?attr/suwNavBarTextColor" android:viewportWidth="24" android:viewportHeight="24"> + diff --git a/library/main/res/drawable-anydpi-v21/suw_navbar_ic_more.xml b/library/main/res/drawable-anydpi-v21/suw_navbar_ic_more.xml index ce4073a..f21205d 100644 --- a/library/main/res/drawable-anydpi-v21/suw_navbar_ic_more.xml +++ b/library/main/res/drawable-anydpi-v21/suw_navbar_ic_more.xml @@ -18,11 +18,13 @@ + diff --git a/library/main/res/drawable-anydpi-v21/suw_navbar_ic_next.xml b/library/main/res/drawable-anydpi-v21/suw_navbar_ic_next.xml index a91dc76..714731d 100644 --- a/library/main/res/drawable-anydpi-v21/suw_navbar_ic_next.xml +++ b/library/main/res/drawable-anydpi-v21/suw_navbar_ic_next.xml @@ -19,11 +19,13 @@ android:autoMirrored="true" android:width="@dimen/suw_navbar_ic_intrinsic_size" android:height="@dimen/suw_navbar_ic_intrinsic_size" + android:tint="?attr/suwNavBarTextColor" android:viewportWidth="24" android:viewportHeight="24"> + diff --git a/library/main/res/layout/suw_navbar_view.xml b/library/main/res/layout/suw_navbar_view.xml index 1c4cb33..38d0ce6 100644 --- a/library/main/res/layout/suw_navbar_view.xml +++ b/library/main/res/layout/suw_navbar_view.xml @@ -17,14 +17,14 @@ - + android:drawableLeft="@drawable/suw_navbar_ic_back" + android:drawableStart="@drawable/suw_navbar_ic_back" /> - - diff --git a/library/main/res/values-v21/styles.xml b/library/main/res/values-v21/styles.xml index 5fe679e..50faf1d 100644 --- a/library/main/res/values-v21/styles.xml +++ b/library/main/res/values-v21/styles.xml @@ -44,21 +44,13 @@ diff --git a/library/main/res/values/attrs.xml b/library/main/res/values/attrs.xml index 77ea36d..6d43280 100644 --- a/library/main/res/values/attrs.xml +++ b/library/main/res/values/attrs.xml @@ -20,11 +20,8 @@ - - - diff --git a/library/main/res/values/colors.xml b/library/main/res/values/colors.xml index 5e3cb7f..25c8981 100644 --- a/library/main/res/values/colors.xml +++ b/library/main/res/values/colors.xml @@ -32,7 +32,5 @@ #ff21272b #ffe4e7e9 - #deffffff - #de000000 diff --git a/library/main/res/values/styles.xml b/library/main/res/values/styles.xml index 7012ded..8dbefd5 100644 --- a/library/main/res/values/styles.xml +++ b/library/main/res/values/styles.xml @@ -116,6 +116,7 @@ ?attr/suwNavBarBackgroundColor @dimen/suw_navbar_padding_sides @dimen/suw_navbar_padding_sides + ?android:attr/textColorPrimary diff --git a/library/main/src/com/android/setupwizardlib/view/NavigationBar.java b/library/main/src/com/android/setupwizardlib/view/NavigationBar.java index 489c23c..ff1ca78 100644 --- a/library/main/src/com/android/setupwizardlib/view/NavigationBar.java +++ b/library/main/src/com/android/setupwizardlib/view/NavigationBar.java @@ -20,10 +20,7 @@ import android.annotation.TargetApi; import android.content.Context; import android.content.res.TypedArray; import android.graphics.Color; -import android.graphics.drawable.Drawable; -import android.os.Build.VERSION; import android.os.Build.VERSION_CODES; -import android.text.TextUtils; import android.util.AttributeSet; import android.view.ContextThemeWrapper; import android.view.View; @@ -127,47 +124,4 @@ public class NavigationBar extends LinearLayout implements View.OnClickListener } } } - - public static class NavButton extends Button { - - public NavButton(Context context) { - super(context); - } - - public NavButton(Context context, AttributeSet attrs) { - super(context, attrs); - } - - @Override - public void setEnabled(boolean enabled) { - super.setEnabled(enabled); - // The color of the button is #de000000 / #deffffff when enabled. When disabled, the - // alpha value = 0x3b/0xff * 0xde/0xff = 20%. - final int alpha = enabled ? 0xff : 0x3b; - setTextColor(getTextColors().withAlpha(alpha)); - if (VERSION.SDK_INT >= VERSION_CODES.JELLY_BEAN_MR1) { - final Drawable[] relativeDrawables = getCompoundDrawablesRelative(); - for (Drawable d : relativeDrawables) { - if (d != null) { - d.mutate().setAlpha(alpha); - } - } - } - final Drawable[] compoundDrawables = getCompoundDrawables(); - for (Drawable d : compoundDrawables) { - if (d != null) { - d.mutate().setAlpha(alpha); - } - } - } - - @Override - protected void onTextChanged(CharSequence text, int start, int lengthBefore, - int lengthAfter) { - super.onTextChanged(text, start, lengthBefore, lengthAfter); - setCompoundDrawablePadding(TextUtils.isEmpty(text) ? 0 : getResources() - .getDimensionPixelSize(R.dimen.suw_navbar_button_drawable_padding)); - } - } - } diff --git a/library/platform/src/com/android/setupwizardlib/view/NavigationBarButton.java b/library/platform/src/com/android/setupwizardlib/view/NavigationBarButton.java new file mode 100644 index 0000000..45d3737 --- /dev/null +++ b/library/platform/src/com/android/setupwizardlib/view/NavigationBarButton.java @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.setupwizardlib.view; + +import android.content.Context; +import android.util.AttributeSet; +import android.widget.Button; + +public class NavigationBarButton extends Button { + + public NavigationBarButton(Context context) { + super(context); + } + + public NavigationBarButton(Context context, AttributeSet attrs) { + super(context, attrs); + } +} diff --git a/library/rules.gradle b/library/rules.gradle index 4813c27..fad7f50 100644 --- a/library/rules.gradle +++ b/library/rules.gradle @@ -61,14 +61,17 @@ android { } platform { + java.srcDirs = ['platform/src'] res.srcDirs = ['platform/res'] } icsCompat { + java.srcDirs = ['eclair-mr1/src'] res.srcDirs = ['eclair-mr1/res'] } eclairMr1Compat { + java.srcDirs = ['eclair-mr1/src'] res.srcDirs = ['eclair-mr1/res'] } diff --git a/library/test/src/com/android/setupwizardlib/test/PartnerTest.java b/library/test/src/com/android/setupwizardlib/test/PartnerTest.java index 3265164..13be250 100644 --- a/library/test/src/com/android/setupwizardlib/test/PartnerTest.java +++ b/library/test/src/com/android/setupwizardlib/test/PartnerTest.java @@ -102,9 +102,9 @@ public class PartnerTest extends InstrumentationTestCase { ); ResourceEntry entry = - Partner.getResourceEntry(mTestContext, R.color.suw_navbar_text_dark); + Partner.getResourceEntry(mTestContext, R.color.suw_color_accent_dark); int partnerValue = entry.resources.getColor(entry.id); - assertEquals("Partner value should default to 0xdeffffff", 0xdeffffff, partnerValue); + assertEquals("Partner value should default to 0xff448aff", 0xff448aff, partnerValue); assertFalse("Partner value should come from fallback", entry.isOverlay); }