diff options
author | Jan-Felix Schmakeit <jfschmakeit@google.com> | 2015-08-21 15:50:59 +1000 |
---|---|---|
committer | Jan-Felix Schmakeit <jfschmakeit@google.com> | 2015-09-01 06:25:04 +0000 |
commit | 049d382f23bae257d8cf2dd2303eb2c3a166b932 (patch) | |
tree | 58896b01fd24b83334ef586bb80c073b4481aecc | |
parent | 0623e0051e00dd8cab1d3698fa21b4bccab818c7 (diff) | |
download | android-marshmallow-mr1-release.tar.gz |
Switch runtime permission samples to AppCompat theme.android-wear-n-preview-3android-wear-n-preview-2android-wear-n-preview-1android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-preview-3android-n-preview-2android-n-preview-1android-n-iot-preview-2android-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r68android-6.0.1_r67android-6.0.1_r66android-6.0.1_r65android-6.0.1_r62android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r54android-6.0.1_r53android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r45android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21android-6.0.1_r20android-6.0.1_r17android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r41nougat-mr1-wear-releasen-iot-preview-2marshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-mr1-devmarshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-devmarshmallow-dr-dev
Fix build after rollback in
commit 76ee7753ab42505bddf7770a3aa9072f659fc6de.
Change-Id: I6bcb12be8f81cd7f20669253726507e4bc6fe3e5
-rw-r--r-- | system/RuntimePermissions/Application/src/main/AndroidManifest.xml | 2 | ||||
-rw-r--r-- | system/RuntimePermissionsBasic/Application/src/main/AndroidManifest.xml | 2 |
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"> |