merge in klp-release history after reset to klp-dev
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>
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>
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index ca7a958..63b0cb8 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -408,6 +408,7 @@
case R.id.search_close_button:
// Clear the search field
if (!TextUtils.isEmpty(mSearchView.getText())) {
+ mDialpadFragment.clearDialpad();
mSearchView.setText("");
}
break;
diff --git a/src/com/android/dialer/calllog/CallLogFragment.java b/src/com/android/dialer/calllog/CallLogFragment.java
index b685030..9808d07 100644
--- a/src/com/android/dialer/calllog/CallLogFragment.java
+++ b/src/com/android/dialer/calllog/CallLogFragment.java
@@ -444,10 +444,8 @@
// seen the new calls yet.
// This might be called before onCreate() and thus we need to check null explicitly.
if (mKeyguardManager != null && !mKeyguardManager.inKeyguardRestrictedInputMode()) {
- // On either of the transitions we reset the new flag and update the notifications.
+ // On either of the transitions we update the missed call and voicemail notifications.
// While exiting we additionally consume all missed calls (by marking them as read).
- // This will ensure that they no more appear in the "new" section when we return back.
- mCallLogQueryHandler.markNewCallsAsOld();
if (!onEntry) {
mCallLogQueryHandler.markMissedCallsAsRead();
}
diff --git a/src/com/android/dialer/list/PhoneFavoriteMergedAdapter.java b/src/com/android/dialer/list/PhoneFavoriteMergedAdapter.java
index fba55a6..57ae2c1 100644
--- a/src/com/android/dialer/list/PhoneFavoriteMergedAdapter.java
+++ b/src/com/android/dialer/list/PhoneFavoriteMergedAdapter.java
@@ -314,6 +314,9 @@
@Override
public void onBeginDrag(View v) {
+ // We do this so the underlying ScrollView knows that it won't get
+ // the chance to intercept events anymore
+ requestDisallowInterceptTouchEvent(true);
}
@Override