merge in klp-release history after reset to klp-dev
diff --git a/res/layout/call_log_list_item.xml b/res/layout/call_log_list_item.xml
index 5a6c446..6f5ca67 100644
--- a/res/layout/call_log_list_item.xml
+++ b/res/layout/call_log_list_item.xml
@@ -38,8 +38,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
- android:layout_marginStart="@dimen/call_log_outer_margin"
- android:layout_marginEnd="@dimen/call_log_outer_margin"
+ android:paddingStart="@dimen/call_log_outer_margin"
+ android:paddingEnd="@dimen/call_log_outer_margin"
android:orientation="horizontal"
android:gravity="center_vertical"
android:background="?android:attr/selectableItemBackground"
diff --git a/res/layout/dialpad_fragment.xml b/res/layout/dialpad_fragment.xml
index cbbb2cc..a248549 100644
--- a/res/layout/dialpad_fragment.xml
+++ b/res/layout/dialpad_fragment.xml
@@ -50,7 +50,10 @@
android:layout_width="0dip"
android:layout_weight="1"
android:layout_height="match_parent"
+ android:paddingLeft="10dp"
android:gravity="center"
+ android:scrollHorizontally="true"
+ android:singleLine="true"
android:textAppearance="@style/DialtactsDigitsTextAppearance"
android:textColor="@color/dialpad_text_color"
android:nextFocusRight="@+id/overflow_menu"
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index d8fe1ab..4e5592a 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -76,6 +76,8 @@
import com.android.dialer.list.AllContactsActivity;
import com.android.dialer.list.PhoneFavoriteFragment;
import com.android.dialer.list.OnListFragmentScrolledListener;
+import com.android.dialer.list.RegularSearchFragment;
+import com.android.dialer.list.SearchFragment;
import com.android.dialer.list.SmartDialSearchFragment;
import com.android.dialerbind.DatabaseHelperManager;
import com.android.internal.telephony.ITelephony;
@@ -138,7 +140,7 @@
/**
* Fragment for searching phone numbers using the alphanumeric keyboard.
*/
- private SearchFragment mRegularSearchFragment;
+ private RegularSearchFragment mRegularSearchFragment;
/**
* Fragment for searching phone numbers using the dialpad.
@@ -322,7 +324,7 @@
mSmartDialSearchFragment.setOnPhoneNumberPickerActionListener(
mPhoneNumberPickerActionListener);
} else if (fragment instanceof SearchFragment) {
- mRegularSearchFragment = (SearchFragment) fragment;
+ mRegularSearchFragment = (RegularSearchFragment) fragment;
mRegularSearchFragment.setOnPhoneNumberPickerActionListener(
mPhoneNumberPickerActionListener);
} else if (fragment instanceof PhoneFavoriteFragment) {
@@ -770,7 +772,7 @@
if (smartDialSearch) {
fragment = new SmartDialSearchFragment();
} else {
- fragment = new SearchFragment();
+ fragment = new RegularSearchFragment();
}
transaction.replace(R.id.dialtacts_frame, fragment, tag);
} else {
diff --git a/src/com/android/dialer/list/RegularSearchFragment.java b/src/com/android/dialer/list/RegularSearchFragment.java
new file mode 100644
index 0000000..47dd075
--- /dev/null
+++ b/src/com/android/dialer/list/RegularSearchFragment.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.dialer.list;
+
+public class RegularSearchFragment extends SearchFragment {
+
+ private static final int SEARCH_DIRECTORY_RESULT_LIMIT = 5;
+
+ public RegularSearchFragment() {
+ configureDirectorySearch();
+ }
+
+ public void configureDirectorySearch() {
+ setDirectorySearchEnabled(true);
+ setDirectoryResultLimit(SEARCH_DIRECTORY_RESULT_LIMIT);
+ }
+}
diff --git a/src/com/android/dialer/SearchFragment.java b/src/com/android/dialer/list/SearchFragment.java
similarity index 89%
rename from src/com/android/dialer/SearchFragment.java
rename to src/com/android/dialer/list/SearchFragment.java
index 0a97804..54ee436 100644
--- a/src/com/android/dialer/SearchFragment.java
+++ b/src/com/android/dialer/list/SearchFragment.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.dialer;
+package com.android.dialer.list;
import android.app.Activity;
import android.widget.AbsListView;
@@ -26,19 +26,8 @@
public class SearchFragment extends PhoneNumberPickerFragment {
- private static final int SEARCH_DIRECTORY_RESULT_LIMIT = 5;
-
private OnListFragmentScrolledListener mActivityScrollListener;
- public SearchFragment() {
- configureDirectorySearch();
- }
-
- public void configureDirectorySearch() {
- setDirectorySearchEnabled(true);
- setDirectoryResultLimit(SEARCH_DIRECTORY_RESULT_LIMIT);
- }
-
@Override
public void onAttach(Activity activity) {
super.onAttach(activity);
diff --git a/src/com/android/dialer/list/SmartDialSearchFragment.java b/src/com/android/dialer/list/SmartDialSearchFragment.java
index fd2aa35..e3882ca 100644
--- a/src/com/android/dialer/list/SmartDialSearchFragment.java
+++ b/src/com/android/dialer/list/SmartDialSearchFragment.java
@@ -22,7 +22,6 @@
import android.util.Log;
import com.android.contacts.common.list.ContactEntryListAdapter;
-import com.android.dialer.SearchFragment;
import com.android.dialer.dialpad.SmartDialCursorLoader;
/**
@@ -31,11 +30,6 @@
public class SmartDialSearchFragment extends SearchFragment {
private static final String TAG = SmartDialSearchFragment.class.getSimpleName();
- @Override
- public void configureDirectorySearch() {
- setDirectorySearchEnabled(false);
- }
-
/**
* Creates a SmartDialListAdapter to display and operate on search results.
*/