Merge pull request #66 from wordpress-mobile/feature/match-wpandroid-…

…api-level Feature/match wpandroid api level
WordPress · Nov 1, 2018 · 9d96fff · 9d96fff
2 parents b2ecf28 + e25607f
commit 9d96fff
Show file tree

Hide file tree

Showing 22 changed files with 10 additions and 352 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -40,7 +40,7 @@ android {
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 26
 
         ndk {
             abiFilters "armeabi-v7a", "x86"

diff --git a/android/src/main/res/drawable-hdpi/tile.9.png b/android/src/main/res/drawable-hdpi/tile.9.png
diff --git a/android/src/main/res/drawable/ic_reorder_black_24dp.xml b/android/src/main/res/drawable/ic_reorder_black_24dp.xml
diff --git a/android/src/main/res/menu/main.xml b/android/src/main/res/menu/main.xml
diff --git a/android/src/main/res/values-sw600dp/template-dimens.xml b/android/src/main/res/values-sw600dp/template-dimens.xml
diff --git a/android/src/main/res/values-sw600dp/template-styles.xml b/android/src/main/res/values-sw600dp/template-styles.xml
diff --git a/android/src/main/res/values-v11/template-styles.xml b/android/src/main/res/values-v11/template-styles.xml
diff --git a/android/src/main/res/values-v21/base-colors.xml b/android/src/main/res/values-v21/base-colors.xml
diff --git a/android/src/main/res/values-v21/base-template-styles.xml b/android/src/main/res/values-v21/base-template-styles.xml
diff --git a/android/src/main/res/values/base-strings.xml b/android/src/main/res/values/base-strings.xml
diff --git a/android/src/main/res/values/dimens.xml b/android/src/main/res/values/dimens.xml
diff --git a/android/src/main/res/values/fragmentview_strings.xml b/android/src/main/res/values/fragmentview_strings.xml
diff --git a/android/src/main/res/values/strings.xml b/android/src/main/res/values/strings.xml
@@ -16,7 +16,5 @@
 -->
 
 <resources>
-    <string name="element_text">Element</string>
-    <string name="grid_layout_manager">Grid Layout Manager</string>
-    <string name="linear_layout_manager">Linear Layout Manager</string>
+    <string name="app_name">Aztec React Native example</string>
 </resources>
diff --git a/android/src/main/res/values/template-dimens.xml b/android/src/main/res/values/template-dimens.xml
@@ -18,15 +18,8 @@
 
     <!-- Define standard dimensions to comply with Holo-style grids and rhythm. -->
 
-    <dimen name="margin_tiny">4dp</dimen>
     <dimen name="margin_small">8dp</dimen>
     <dimen name="margin_medium">16dp</dimen>
     <dimen name="margin_large">32dp</dimen>
-    <dimen name="margin_huge">64dp</dimen>
-
-    <!-- Semantic definitions -->
-
-    <dimen name="horizontal_page_margin">@dimen/margin_medium</dimen>
-    <dimen name="vertical_page_margin">@dimen/margin_medium</dimen>
 
 </resources>
diff --git a/android/src/main/res/values/template-styles.xml b/android/src/main/res/values/template-styles.xml
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
@@ -91,7 +91,7 @@ android {
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 26
 
         ndk {
             abiFilters "armeabi-v7a", "x86"

diff --git a/example/android/app/src/main/res/values-v11/template-styles.xml b/example/android/app/src/main/res/values-v11/template-styles.xml
diff --git a/example/android/app/src/main/res/values-v21/base-template-styles.xml b/example/android/app/src/main/res/values-v21/base-template-styles.xml
diff --git a/example/android/app/src/main/res/values/base-strings.xml b/example/android/app/src/main/res/values/base-strings.xml