summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--AndroidManifest.xml11
-rw-r--r--res/values/styles.xml7
2 files changed, 13 insertions, 5 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e77ee054..e0317c02 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -38,6 +38,7 @@
<application android:name="CalendarApplication"
android:label="@string/app_label" android:icon="@drawable/app_icon"
+ android:theme="@style/CalendarDefaultTheme"
android:taskAffinity="android.task.calendar">
<!-- TODO: Remove dependency of application on the test runner
(android.test) library. -->
@@ -66,11 +67,11 @@
<activity android:name="DayActivity" android:label="@string/day_view"
android:theme="@style/CalendarTheme" />
<activity android:name="AgendaActivity" android:label="@string/agenda_view"
- android:theme="@android:style/Theme.Light"
+ android:theme="@style/AgendaActivityTheme"
android:exported="true" />
<activity android:name="EditEvent" android:label="@string/event_edit_title"
- android:theme="@android:style/Theme"
+ android:theme="@style/EditEventTheme"
android:configChanges="orientation|keyboardHidden">
<intent-filter>
@@ -81,7 +82,7 @@
</activity>
<activity android:name="EventInfoActivity" android:label="@string/event_info_title"
- android:theme="@android:style/Theme.Light"
+ android:theme="@style/EventInfoActivityTheme"
android:configChanges="orientation|keyboardHidden">
<intent-filter>
@@ -92,7 +93,7 @@
</activity>
<activity android:name="GoogleCalendarUriIntentFilter" android:label="@string/app_label"
- android:theme="@android:style/Theme.Light"
+ android:theme="@style/GoogleCalendarUriIntentFilterTheme"
android:configChanges="orientation|keyboardHidden">
<intent-filter>
@@ -109,7 +110,7 @@
<activity android:name="SelectCalendarsActivity" android:label="@string/calendars_title" />
<activity android:name="CalendarPreferenceActivity" android:label="@string/preferences_title" />
<activity android:name="AlertActivity" android:launchMode="singleInstance"
- android:theme="@android:style/Theme.Light" android:excludeFromRecents="true" />
+ android:theme="@style/AlertActivityTheme" android:excludeFromRecents="true" />
<receiver android:name="AlertReceiver">
<intent-filter>
<action android:name="android.intent.action.EVENT_REMINDER" />
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 62659f8d..4a720fb0 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -19,6 +19,13 @@
-->
<resources>
+ <style name="CalendarDefaultTheme" parent="@android:style/Theme" />
+ <style name="AgendaActivityTheme" parent="@android:style/Theme.Light" />
+ <style name="EditEventTheme" parent="@android:style/Theme" />
+ <style name="EventInfoActivityTheme" parent="@android:style/Theme.Light" />
+ <style name="GoogleCalendarUriIntentFilterTheme" parent="@android:style/Theme.Light" />
+ <style name="AlertActivityTheme" parent="@android:style/Theme.Light" />
+
<style name="Alert" parent="android:Theme.Dialog">
<item name="android:windowBackground">@null</item>
</style>