| commit | 2d2024dc4f92c36ad1ca221b4e69f652b7101841 | [log] [tgz] |
|---|---|---|
| author | Sridhar Gujje <sgujje@codeaurora.org> | Wed Dec 09 15:55:41 2015 +0530 |
| committer | Sridhar Gujje <sgujje@codeaurora.org> | Wed Dec 09 15:55:41 2015 +0530 |
| tree | 58896b01fd24b83334ef586bb80c073b4481aecc | |
| parent | c2103f4ca4c61bfc426805d5584fd9d8f30e8df9 [diff] | |
| parent | cf8d9876dbe06089b7e99b56542b4f42b4247a9b [diff] |
Merge tag 'android-6.0.0_r26' into HEAD Android 6.0.0 release 26 * tag 'android-6.0.0_r26': Switch runtime permission samples to AppCompat theme. Change-Id: I1b85cba76c13b5b7f8c946a86a9cfb9223727850
diff --git a/system/RuntimePermissions/Application/src/main/AndroidManifest.xml b/system/RuntimePermissions/Application/src/main/AndroidManifest.xml index 050b051..0acbb93 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 1f7ea6a..bfae9b9 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">