Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
diff --git a/res/layout/recents_list_footer.xml b/res/layout/recents_list_footer.xml
index 7670d81..3a56cbe 100644
--- a/res/layout/recents_list_footer.xml
+++ b/res/layout/recents_list_footer.xml
@@ -27,7 +27,7 @@
android:gravity="center"
android:fontFamily="@string/view_full_call_history_font_family"
android:textStyle="bold"
- android:textColor="@color/view_full_call_history_color"
+ android:textColor="@color/dialtacts_secondary_text_color"
android:textSize="14sp"
android:text="@string/recents_footer_text"
android:background="@drawable/recent_lists_footer_background" />
diff --git a/res/values/colors.xml b/res/values/colors.xml
index a3fd3f9..d5ec4dc 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -16,16 +16,16 @@
<resources>
<!-- Primary text color in the Dialer -->
- <color name="dialtacts_primary_text_color">#333</color>
+ <color name="dialtacts_primary_text_color">#333333</color>
<!-- Secondary text color in the Dialer -->
<color name="dialtacts_secondary_text_color">#737373</color>
<color name="dialer_red_highlight_color">#ff1744</color>
<color name="dialer_green_highlight_color">#00c853</color>
<!-- Color for the setting text. -->
- <color name="setting_primary_color">#4d4c4c</color>
+ <color name="setting_primary_color">@color/dialtacts_primary_text_color</color>
<!-- Color for the setting description text. -->
- <color name="setting_secondary_color">#989898</color>
+ <color name="setting_secondary_color">@color/dialtacts_secondary_text_color</color>
<color name="setting_background_color">#ffffff</color>
<!-- Color of the text describing an unconsumed missed call. -->
@@ -87,9 +87,6 @@
as call back, play voicemail, etc. -->
<color name="call_log_action_text">@color/dialer_theme_color</color>
- <!-- Color of view full call history item text. -->
- <color name="view_full_call_history_color">@color/dialer_theme_color</color>
-
<!-- Color for missed call icons. -->
<color name="missed_call">#ff2e58</color>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 6fc9cf4..a0ba5c3 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -164,9 +164,9 @@
<!-- Style applied to the "Settings" screen. Keep in sync with SettingsLight in Telephony. -->
<style name="SettingsStyle" parent="DialtactsThemeWithoutActionBarOverlay">
<!-- Setting text. -->
- <item name="android:textColorSecondary">@color/setting_primary_color</item>
+ <item name="android:textColor">@color/setting_primary_color</item>
<!-- Setting description. -->
- <item name="android:textColorTertiary">@color/setting_secondary_color</item>
+ <item name="android:textColorSecondary">@color/setting_secondary_color</item>
<item name="android:windowBackground">@color/setting_background_color</item>
<item name="android:colorAccent">@color/dialtacts_theme_color</item>
<item name="android:textColorLink">@color/dialtacts_theme_color</item>
diff --git a/src/com/android/dialer/calllog/PhoneAccountUtils.java b/src/com/android/dialer/calllog/PhoneAccountUtils.java
index 941ac4b..d716aee 100644
--- a/src/com/android/dialer/calllog/PhoneAccountUtils.java
+++ b/src/com/android/dialer/calllog/PhoneAccountUtils.java
@@ -71,7 +71,7 @@
final TelecomManager telecomManager =
(TelecomManager) context.getSystemService(Context.TELECOM_SERVICE);
final PhoneAccount account = telecomManager.getPhoneAccount(phoneAccount);
- if (account == null || !telecomManager.hasMultipleEnabledAccounts()) {
+ if (account == null || !telecomManager.hasMultipleCallCapableAccounts()) {
return null;
}
return account;
diff --git a/src/com/android/dialer/list/ListsFragment.java b/src/com/android/dialer/list/ListsFragment.java
index 39efa51..7cc519f 100644
--- a/src/com/android/dialer/list/ListsFragment.java
+++ b/src/com/android/dialer/list/ListsFragment.java
@@ -226,6 +226,12 @@
}
@Override
+ public void onDestroy() {
+ mCallLogAdapter.stopRequestProcessing();
+ super.onDestroy();
+ }
+
+ @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
final View parentView = inflater.inflate(R.layout.lists_fragment, container, false);
diff --git a/src/com/android/dialer/widget/ViewDragHelper.java b/src/com/android/dialer/widget/ViewDragHelper.java
index 3d55ad4..91016d1 100644
--- a/src/com/android/dialer/widget/ViewDragHelper.java
+++ b/src/com/android/dialer/widget/ViewDragHelper.java
@@ -1487,8 +1487,8 @@
if (consumed != null) {
final int unconsumedX = targetX - mCapturedView.getLeft();
final int unconsumedY = targetY - mCapturedView.getTop();
- consumed[0] = dx - unconsumedX;
- consumed[1] = dy - unconsumedY;
+ consumed[0] = unconsumedX - dx;
+ consumed[1] = unconsumedY - dy;
}
}
diff --git a/tests/src/com/android/dialer/tests/calllog/FillCallLogTestActivity.java b/tests/src/com/android/dialer/tests/calllog/FillCallLogTestActivity.java
index 81585cc..2e90c4d 100644
--- a/tests/src/com/android/dialer/tests/calllog/FillCallLogTestActivity.java
+++ b/tests/src/com/android/dialer/tests/calllog/FillCallLogTestActivity.java
@@ -399,7 +399,7 @@
private PhoneAccountHandle getManualAccount() {
TelecomManager telecomManager = TelecomManager.from(this);
- List <PhoneAccountHandle> accountHandles = telecomManager.getEnabledPhoneAccounts();
+ List <PhoneAccountHandle> accountHandles = telecomManager.getCallCapablePhoneAccounts();
if (mAccount0.isChecked()) {
return accountHandles.get(0);
} else if (mAccount1.isChecked()){