Create themes per activity. Makes it easier to split them going forward.
Additionally we are not using the misleading name TallTitleBarTheme anymore.
Change-Id: Iee134450fcd877551d1c0712b6772d854357b336
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 228d883..905e06d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -255,7 +255,7 @@
<!-- An activity for joining contacts -->
<activity android:name="JoinContactActivity"
- android:theme="@style/TallTitleBarTheme"
+ android:theme="@style/JoinContactActivityTheme"
android:clearTaskOnLaunch="true"
>
<intent-filter>
@@ -376,7 +376,7 @@
<activity android:name="CallDetailActivity"
android:label="@string/callDetailTitle"
- android:theme="@style/TallTitleBarTheme"
+ android:theme="@style/CallDetailActivityTheme"
>
<intent-filter>
<action android:name="android.intent.action.VIEW" />
@@ -388,7 +388,7 @@
<!-- Views the details of a single contact -->
<activity android:name=".activities.ContactDetailActivity"
android:label="@string/viewContactTitle"
- android:theme="@style/TallTitleBarTheme">
+ android:theme="@style/ContactDetailActivityTheme">
<intent-filter android:label="@string/viewContactDesription">
<action android:name="android.intent.action.VIEW" />
@@ -402,7 +402,7 @@
<!-- Create a new or edit an existing contact -->
<activity
android:name=".activities.ContactEditorActivity"
- android:theme="@style/TallTitleBarTheme"
+ android:theme="@style/ContactEditorActivityTheme"
android:windowSoftInputMode="adjustResize">
<intent-filter android:label="@string/editContactDescription">
diff --git a/res/values-xlarge/styles.xml b/res/values-xlarge/styles.xml
index fbaa342..9d354819 100644
--- a/res/values-xlarge/styles.xml
+++ b/res/values-xlarge/styles.xml
@@ -21,7 +21,16 @@
</style>
<style name="ContactsPreferencesTheme" parent="@android:Theme.Dialog">
</style>
- <style name="TallTitleBarTheme" parent="@android:Theme.Dialog">
+ <style name="JoinContactActivityTheme" parent="@android:Theme.Dialog">
+ <item name="android:windowContentOverlay">@null</item>
+ </style>
+ <style name="CallDetailActivityTheme" parent="@android:Theme.Dialog">
+ <item name="android:windowContentOverlay">@null</item>
+ </style>
+ <style name="ContactDetailActivityTheme" parent="@android:Theme.Dialog">
+ <item name="android:windowContentOverlay">@null</item>
+ </style>
+ <style name="ContactEditorActivityTheme" parent="@android:Theme.Dialog">
<item name="android:windowContentOverlay">@null</item>
</style>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index b7df91f..c52bb1f 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -50,7 +50,16 @@
<item name="android:src">@drawable/ic_btn_round_less</item>
</style>
- <style name="TallTitleBarTheme" parent="android:Theme.NoTitleBar">
+ <style name="JoinContactActivityTheme" parent="android:Theme.NoTitleBar">
+ <item name="android:windowContentOverlay">@null</item>
+ </style>
+ <style name="CallDetailActivityTheme" parent="android:Theme.NoTitleBar">
+ <item name="android:windowContentOverlay">@null</item>
+ </style>
+ <style name="ContactDetailActivityTheme" parent="android:Theme.NoTitleBar">
+ <item name="android:windowContentOverlay">@null</item>
+ </style>
+ <style name="ContactEditorActivityTheme" parent="android:Theme.NoTitleBar">
<item name="android:windowContentOverlay">@null</item>
</style>