Merge "Import translations. DO NOT MERGE"
diff --git a/res/drawable-hdpi/ic_ab_search.png b/res/drawable-hdpi/ic_ab_search.png
deleted file mode 100644
index d86b219..0000000
--- a/res/drawable-hdpi/ic_ab_search.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_ab_search.png b/res/drawable-mdpi/ic_ab_search.png
deleted file mode 100644
index 2b23b1e..0000000
--- a/res/drawable-mdpi/ic_ab_search.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_ab_search.png b/res/drawable-xhdpi/ic_ab_search.png
deleted file mode 100644
index 71f7827..0000000
--- a/res/drawable-xhdpi/ic_ab_search.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_ab_search.png b/res/drawable-xxhdpi/ic_ab_search.png
deleted file mode 100644
index 142c545..0000000
--- a/res/drawable-xxhdpi/ic_ab_search.png
+++ /dev/null
Binary files differ
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index a9eb217..f5a2d3e 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -310,9 +310,9 @@
}
}
- if (mIsDialpadShown && mSmartDialSearchFragment != null) {
+ if (mSmartDialSearchFragment != null && mSmartDialSearchFragment.isVisible()) {
mSmartDialSearchFragment.setQueryString(mSearchQuery, false /* delaySelection */);
- } else if (mRegularSearchFragment != null) {
+ } else if (mRegularSearchFragment != null && mRegularSearchFragment.isVisible()) {
mRegularSearchFragment.setQueryString(mSearchQuery, false /* delaySelection */);
}
}
@@ -550,13 +550,6 @@
mDialpadFragment.dialButtonPressed();
}
break;
- case R.id.search_close_button:
- // Clear the search field
- if (!TextUtils.isEmpty(mSearchView.getText())) {
- mDialpadFragment.clearDialpad();
- mSearchView.setText(null);
- }
- break;
case R.id.voice_search_button:
try {
startActivityForResult(new Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH),
@@ -1137,18 +1130,14 @@
// tab.
if (position == ListsFragment.TAB_INDEX_SPEED_DIAL && !mIsLandscape) {
mFloatingActionButtonController.onPageScrolled(positionOffset);
+ } else if (position != ListsFragment.TAB_INDEX_SPEED_DIAL) {
+ mFloatingActionButtonController.onPageScrolled(1);
}
}
@Override
public void onPageSelected(int position) {
mCurrentTabPosition = position;
- // Prevents jittery movement when clicking on tabs.
- if (mCurrentTabPosition != ListsFragment.TAB_INDEX_SPEED_DIAL) {
- mFloatingActionButtonController.manuallyTranslate(
- mFloatingActionButtonController.getTranslationXForAlignment(
- FloatingActionButtonController.ALIGN_RIGHT), 0);
- }
}
@Override
diff --git a/src/com/android/dialer/list/ShortcutCardsAdapter.java b/src/com/android/dialer/list/ShortcutCardsAdapter.java
index dd198ec..766bdda 100644
--- a/src/com/android/dialer/list/ShortcutCardsAdapter.java
+++ b/src/com/android/dialer/list/ShortcutCardsAdapter.java
@@ -64,6 +64,7 @@
private final int mCallLogPaddingTop;
private final int mCallLogPaddingBottom;
private final int mCardMaxHorizontalClip;
+ private final int mShortCardBackgroundColor;
private final Context mContext;
@@ -124,6 +125,8 @@
resources.getDimensionPixelSize(R.dimen.recent_call_log_item_padding_top);
mCallLogPaddingBottom =
resources.getDimensionPixelSize(R.dimen.recent_call_log_item_padding_bottom);
+ mShortCardBackgroundColor = resources.getColor(R.color.call_log_expanded_background_color);
+
mCallLogAdapter = callLogAdapter;
mObserver = new CustomDataSetObserver();
@@ -257,6 +260,9 @@
callLogItem.setAlpha(1);
callLogItem.setClipBounds(null);
setChildrenOpacity(callLogItem, 1.0f);
+
+ callLogItem.findViewById(R.id.call_log_row)
+ .setBackgroundColor(mShortCardBackgroundColor);
}
@Override
diff --git a/tests/res/layout/fill_call_log_test.xml b/tests/res/layout/fill_call_log_test.xml
index 6de9b91..9b89e4a 100644
--- a/tests/res/layout/fill_call_log_test.xml
+++ b/tests/res/layout/fill_call_log_test.xml
@@ -183,4 +183,23 @@
android:text="@string/addToCallLogButton"
android:onClick="addManualEntry"
/>
+ <LinearLayout
+ android:orientation="horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="left"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/delta_after_add"
+ />
+ <EditText
+ android:id="@+id/delta_after_add"
+ android:layout_width="90dp"
+ android:layout_height="wrap_content"
+ android:text="-1"
+ android:inputType="number"
+ />
+ </LinearLayout>
</LinearLayout>
diff --git a/tests/res/values/donottranslate_strings.xml b/tests/res/values/donottranslate_strings.xml
index bdeb304..25c3a5a 100644
--- a/tests/res/values/donottranslate_strings.xml
+++ b/tests/res/values/donottranslate_strings.xml
@@ -50,4 +50,5 @@
<string name="presentation_restricted">Restricted</string>
<string name="presentation_unknown">Unknown</string>
<string name="presentation_payphone">Payphone</string>
+ <string name="delta_after_add">Offset call time after add (min): </string>
</resources>
diff --git a/tests/src/com/android/dialer/tests/calllog/FillCallLogTestActivity.java b/tests/src/com/android/dialer/tests/calllog/FillCallLogTestActivity.java
index 3a1682e..1e5c257 100644
--- a/tests/src/com/android/dialer/tests/calllog/FillCallLogTestActivity.java
+++ b/tests/src/com/android/dialer/tests/calllog/FillCallLogTestActivity.java
@@ -37,6 +37,7 @@
import android.widget.Button;
import android.widget.CheckBox;
import android.widget.DatePicker;
+import android.widget.EditText;
import android.widget.ProgressBar;
import android.widget.RadioButton;
import android.widget.TextView;
@@ -75,6 +76,7 @@
private TextView mCallDate;
private TextView mCallTime;
private TextView mPhoneNumber;
+ private EditText mOffset;
private int mCallTimeHour;
private int mCallTimeMinute;
@@ -124,6 +126,7 @@
mCallTime = (TextView) findViewById(R.id.call_time);
mCallDate = (TextView) findViewById(R.id.call_date);
mPhoneNumber = (TextView) findViewById(R.id.phone_number);
+ mOffset = (EditText) findViewById(R.id.delta_after_add);
// Use the current time as the default values for the picker
final Calendar c = Calendar.getInstance();
@@ -469,5 +472,16 @@
Calls.addCall(null, this, mPhoneNumber.getText().toString(), getManualPresentation(),
getManualCallType(), dateTime.getTimeInMillis(), RNG.nextInt(60 * 60));
+ // Subtract offset from the call date/time and store as new date/time
+ int offset = Integer.parseInt(mOffset.getText().toString());
+
+ dateTime.add(Calendar.MINUTE, offset);
+ mCallDateYear = dateTime.get(Calendar.YEAR);
+ mCallDateMonth = dateTime.get(Calendar.MONTH);
+ mCallDateDay = dateTime.get(Calendar.DAY_OF_MONTH);
+ mCallTimeHour = dateTime.get(Calendar.HOUR_OF_DAY);
+ mCallTimeMinute = dateTime.get(Calendar.MINUTE);
+ setDisplayDate();
+ setDisplayTime();
}
}
