Merge pull request #1 from AmolAmrit/7.x
Themes: Expose hard coded background in java & Expose all elevations
diff --git a/res/layout/display.xml b/res/layout/display.xml
index 638f0d2..043b531 100644
--- a/res/layout/display.xml
+++ b/res/layout/display.xml
@@ -21,7 +21,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/display_background_color"
- android:elevation="4dip">
+ android:elevation="@dimen/display_elevation">
<Toolbar
android:id="@+id/toolbar"
diff --git a/res/values-port/styles.xml b/res/values-port/styles.xml
index a6d2013..9e7e1df 100644
--- a/res/values-port/styles.xml
+++ b/res/values-port/styles.xml
@@ -65,7 +65,7 @@
</style>
<style name="PadLayoutStyle.Advanced">
- <item name="android:elevation">4dip</item>
+ <item name="android:elevation">@dimen/pad_elevation</item>
<item name="android:paddingTop">12dip</item>
<item name="android:paddingBottom">20dip</item>
<item name="android:paddingStart">20dip</item>
diff --git a/res/values/projekt_colors.xml b/res/values/projekt_colors.xml
new file mode 100644
index 0000000..9e15ffc
--- /dev/null
+++ b/res/values/projekt_colors.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2016 Projekt Substratum
+
+ 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.
+-->
+<resources>
+ <color name="pad_view_pager_background">#ff000000</color>
+</resources>
diff --git a/res/values/projekt_dimens.xml b/res/values/projekt_dimens.xml
new file mode 100644
index 0000000..c1a0196
--- /dev/null
+++ b/res/values/projekt_dimens.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2017 Projekt Substratum
+
+ 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.
+-->
+<resources>
+ <dimen name="display_elevation">4.0dip</dimen>
+ <dimen name="pad_elevation">4.0dip</dimen>
+</resources>
diff --git a/src/com/android/calculator2/CalculatorPadViewPager.java b/src/com/android/calculator2/CalculatorPadViewPager.java
index d4520c5..5b02e4b 100644
--- a/src/com/android/calculator2/CalculatorPadViewPager.java
+++ b/src/com/android/calculator2/CalculatorPadViewPager.java
@@ -92,7 +92,7 @@
super(context, attrs);
setAdapter(mStaticPagerAdapter);
- setBackgroundColor(Color.BLACK);
+ setBackgroundColor(context.getColor(R.color.pad_view_pager_background));
setPageMargin(getResources().getDimensionPixelSize(R.dimen.pad_page_margin));
setPageTransformer(false, mPageTransformer);
addOnPageChangeListener(mOnPageChangeListener);