aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan-Felix Schmakeit <jfschmakeit@google.com>2015-08-21 15:50:59 +1000
committerJan-Felix Schmakeit <jfschmakeit@google.com>2015-09-01 06:25:04 +0000
commit049d382f23bae257d8cf2dd2303eb2c3a166b932 (patch)
tree58896b01fd24b83334ef586bb80c073b4481aecc
parent0623e0051e00dd8cab1d3698fa21b4bccab818c7 (diff)
downloadandroid-marshmallow-mr1-release.tar.gz
Fix build after rollback in commit 76ee7753ab42505bddf7770a3aa9072f659fc6de. Change-Id: I6bcb12be8f81cd7f20669253726507e4bc6fe3e5
-rw-r--r--system/RuntimePermissions/Application/src/main/AndroidManifest.xml2
-rw-r--r--system/RuntimePermissionsBasic/Application/src/main/AndroidManifest.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/system/RuntimePermissions/Application/src/main/AndroidManifest.xml b/system/RuntimePermissions/Application/src/main/AndroidManifest.xml
index 050b0515..0acbb93b 100644
--- a/system/RuntimePermissions/Application/src/main/AndroidManifest.xml
+++ b/system/RuntimePermissions/Application/src/main/AndroidManifest.xml
@@ -34,7 +34,7 @@
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
- android:theme="@style/AppTheme" >
+ android:theme="@style/Theme.AppCompat.Light" >
<activity
android:name=".MainActivity"
android:label="@string/app_name" >
diff --git a/system/RuntimePermissionsBasic/Application/src/main/AndroidManifest.xml b/system/RuntimePermissionsBasic/Application/src/main/AndroidManifest.xml
index 1f7ea6a1..bfae9b92 100644
--- a/system/RuntimePermissionsBasic/Application/src/main/AndroidManifest.xml
+++ b/system/RuntimePermissionsBasic/Application/src/main/AndroidManifest.xml
@@ -28,7 +28,7 @@
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
- android:theme="@style/AppTheme">
+ android:theme="@style/Theme.AppCompat.Light">
<activity
android:name=".MainActivity"
android:label="@string/app_name">