PeterCxy/SetupWizardLibrary
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "[SetupWizardLib] Use AppCompat themes for icsCompat" into ub-setupwizard-alatar

Browse source
This commit is contained in:
Maurice Lam 2015-03-23 20:51:30 +00:00 committed by Android (Google) Code Review
parent 2a0078763f a36954a3da
commit cbce1423d8
5 changed files with 65 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
library/Android.mk
View file

@ -1,10 +1,13 @@
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_SDK_VERSION := current LOCAL_AAPT_FLAGS := --auto-add-overlay
LOCAL_MANIFEST_FILE := main/AndroidManifest.xml LOCAL_MANIFEST_FILE := main/AndroidManifest.xml
LOCAL_MODULE := setup-wizard-lib LOCAL_MODULE := setup-wizard-lib
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/main/res 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)
include $(BUILD_STATIC_JAVA_LIBRARY) include $(BUILD_STATIC_JAVA_LIBRARY)

4
library/build.gradle
View file

@ -28,6 +28,10 @@ android {
} }
} }
platform {
res.srcDirs = ['platform/res']
}
icsCompat { icsCompat {
res.srcDirs = ['ics/res'] res.srcDirs = ['ics/res']
} }

4
library/common.mk
View file

@ -12,6 +12,8 @@
# include frameworks/opt/setupwizard/library/common.mk # include frameworks/opt/setupwizard/library/common.mk
# #
LOCAL_RESOURCE_DIR += $(call my-dir)/main/res LOCAL_RESOURCE_DIR += \
$(call my-dir)/main/res \
$(call my-dir)/platform/res
LOCAL_AAPT_FLAGS += --auto-add-overlay --extra-packages com.android.setupwizardlib LOCAL_AAPT_FLAGS += --auto-add-overlay --extra-packages com.android.setupwizardlib
LOCAL_STATIC_JAVA_LIBRARIES += setup-wizard-lib LOCAL_STATIC_JAVA_LIBRARIES += setup-wizard-lib

28
library/main/res/values-v21/styles.xml
View file

@ -17,34 +17,6 @@
<resources> <resources>
<!-- General styles -->
<style name="SuwThemeMaterial" parent="android:Theme.Material.NoActionBar">
<item name="android:colorAccent">@color/suw_color_accent_dark</item>
<item name="android:navigationBarColor">@android:color/black</item>
<item name="android:statusBarColor">@android:color/black</item>
<item name="android:textColorLink">@color/suw_link_color_dark</item>
<item name="android:textColorSecondary">@color/suw_color_secondary_dark</item>
<item name="android:windowAnimationStyle">@style/Animation.SuwWindowAnimation</item>
<item name="android:windowSoftInputMode">adjustPan</item>
<item name="suwCardBackground">@drawable/suw_card_bg</item>
<item name="suwNavBarTheme">@style/SuwNavBarThemeDark</item>
</style>
<style name="SuwThemeMaterial.Light" parent="android:Theme.Material.Light.NoActionBar">
<item name="android:colorAccent">@color/suw_color_accent_light</item>
<item name="android:navigationBarColor">@android:color/black</item>
<item name="android:statusBarColor">@android:color/black</item>
<item name="android:textColorLink">@color/suw_link_color_light</item>
<item name="android:textColorSecondary">@color/suw_color_secondary_light</item>
<item name="android:windowAnimationStyle">@style/Animation.SuwWindowAnimation</item>
<item name="android:windowSoftInputMode">adjustPan</item>
<item name="suwCardBackground">@drawable/suw_card_bg</item>
<item name="suwNavBarTheme">@style/SuwNavBarThemeLight</item>
</style>
<!-- Content styles --> <!-- Content styles -->
<style name="SuwDescription"> <style name="SuwDescription">

53
library/platform/res/values-v21/styles.xml Normal file
View file

@ -0,0 +1,53 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
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.
-->
<!-- These styles are only included in the platform build, to make sure that they do not
override the corresponding styles in the compatibility build. -->
<resources>
<!-- General styles -->
<!-- These themes should only be used in platform builds because support libraries'
FragmentActivity and ActionBarActivity expects the activity theme to inherit from
Theme.AppCompat. -->
<style name="SuwThemeMaterial" parent="android:Theme.Material.NoActionBar">
<item name="android:colorAccent">@color/suw_color_accent_dark</item>
<item name="android:navigationBarColor">@android:color/black</item>
<item name="android:statusBarColor">@android:color/black</item>
<item name="android:textColorLink">@color/suw_link_color_dark</item>
<item name="android:textColorSecondary">@color/suw_color_secondary_dark</item>
<item name="android:windowAnimationStyle">@style/Animation.SuwWindowAnimation</item>
<item name="android:windowSoftInputMode">adjustPan</item>
<item name="suwCardBackground">@drawable/suw_card_bg</item>
<item name="suwNavBarTheme">@style/SuwNavBarThemeDark</item>
</style>
<style name="SuwThemeMaterial.Light" parent="android:Theme.Material.Light.NoActionBar">
<item name="android:colorAccent">@color/suw_color_accent_light</item>
<item name="android:navigationBarColor">@android:color/black</item>
<item name="android:statusBarColor">@android:color/black</item>
<item name="android:textColorLink">@color/suw_link_color_light</item>
<item name="android:textColorSecondary">@color/suw_color_secondary_light</item>
<item name="android:windowAnimationStyle">@style/Animation.SuwWindowAnimation</item>
<item name="android:windowSoftInputMode">adjustPan</item>
<item name="suwCardBackground">@drawable/suw_card_bg</item>
<item name="suwNavBarTheme">@style/SuwNavBarThemeLight</item>
</style>
</resources>