diff options
| author | Kenneth Westin <kenneth.westin@sonyericsson.com> | 2011-01-03 14:14:56 +0100 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2011-02-01 08:35:57 -0500 |
| commit | 600239bdaeb6720d62d6c03349fe833fc42c28ef (patch) | |
| tree | 02b633c3f764c2a1caef6a02c1aefbcc1a032f6e | |
| parent | fd003ed1777793cba11f501df95e8c22d586ec4f (diff) | |
| download | android_packages_apps_Calendar-600239bdaeb6720d62d6c03349fe833fc42c28ef.tar.gz android_packages_apps_Calendar-600239bdaeb6720d62d6c03349fe833fc42c28ef.tar.bz2 android_packages_apps_Calendar-600239bdaeb6720d62d6c03349fe833fc42c28ef.zip | |
Make it possible to override the Calendar theme through overlays.
As of change I5969bb8a it is possible to set style parent through
overlays. With this change it is possible to use that mechanism
to set the theme for the Calendar.
Change-Id: I5ebf91a27587eafb1556b406aae613736e96e287
| -rw-r--r-- | AndroidManifest.xml | 11 | ||||
| -rw-r--r-- | res/values/styles.xml | 7 |
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> |