commit 8f0ce2be6c7b44551be2ef585e3a77b475118f6f
author Yorke Lee <yorkelee@google.com> Tue Sep 10 23:23:21 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 10 23:23:21 2013 +0000
tree 504ae4f992ae4cf9f8fd219725162a95ba43340c
parent 63e1155b40701b3aae0da43208b55560c7ad6f02
parent 2eafb7afc46135bbbf5a79b437df33cd0fb66c0b

Merge "Clear dialpad when x is pressed" into klp-dev

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 542ddd9..82734b6 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -120,7 +120,7 @@
 
         <activity android:name="com.android.dialer.calllog.CallLogActivity"
             android:label="@string/call_log_activity_title"
-            android:theme="@style/CallLogActivityTheme"
+            android:theme="@style/DialtactsThemeWithActionBarOverlay"
             android:screenOrientation="portrait"
             android:icon="@mipmap/ic_launcher_phone">
             <intent-filter>
@@ -133,7 +133,7 @@
 
         <activity android:name="com.android.dialer.list.AllContactsActivity"
             android:label="@string/show_all_contacts_title"
-            android:theme="@style/DialtactsTheme"
+            android:theme="@style/DialtactsThemeWithActionBarOverlay"
             android:screenOrientation="portrait">
         </activity>
 

res/values/styles.xml

diff --git a/res/values/styles.xml b/res/values/styles.xml
index e7dd9f9..9b99244 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -72,7 +72,7 @@
         <item name="android:textColorPrimary">#FFFFFF</item>
     </style>
 
-    <style name="CallLogActivityTheme" parent="DialtactsTheme">
+    <style name="DialtactsThemeWithActionBarOverlay" parent="DialtactsTheme">
         <item name="android:windowActionBarOverlay">true</item>
     </style>