diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-06-29 01:14:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-06-29 01:14:29 +0000 |
| commit | e479c7d417573ac142b336c904ce0643e010f7dd (patch) | |
| tree | da969d7848ed5e86dc55858778fa912219c4be74 /java/com/android/dialer/searchfragment/list | |
| parent | 2e3e5ff3f2dfd4106b22835c1bf68bf551dcc032 (diff) | |
| parent | 70c045940de7ca1270cad559229ae3d5e9273301 (diff) | |
Merge changes I40cf6e7d,Iff515ae2,If8ca1f57,I1eec7a73,Iccb4e72c, ...
* changes:
Removed line deemed incompatible with Dialer open source.
Avoid updating system call log cache when the call log is being built
Make sure we have a host for the search fragment before loading data.
Fix scroll for new favorites
UI refresh for bottom nav bar.
UI refresh for FAB.
Use ConcurrentMap to log Contacts Provider metrics in the old call log.
Also ignore IllegalStateException thrown by SQLiteClosable when coalescing fails.
UI refresh for search fragment.
Add voicemail greeting setting screen to voicemail settings.
Diffstat (limited to 'java/com/android/dialer/searchfragment/list')
| -rw-r--r-- | java/com/android/dialer/searchfragment/list/NewSearchFragment.java | 18 | ||||
| -rw-r--r-- | java/com/android/dialer/searchfragment/list/res/layout/header_layout.xml | 2 |
2 files changed, 16 insertions, 4 deletions
diff --git a/java/com/android/dialer/searchfragment/list/NewSearchFragment.java b/java/com/android/dialer/searchfragment/list/NewSearchFragment.java index 65ce87340..809f91775 100644 --- a/java/com/android/dialer/searchfragment/list/NewSearchFragment.java +++ b/java/com/android/dialer/searchfragment/list/NewSearchFragment.java @@ -121,11 +121,23 @@ public final class NewSearchFragment extends Fragment // the contacts in them). private final List<Directory> directories = new ArrayList<>(); private final Runnable loaderCp2ContactsRunnable = - () -> getLoaderManager().restartLoader(CONTACTS_LOADER_ID, null, this); + () -> { + if (getHost() != null) { + getLoaderManager().restartLoader(CONTACTS_LOADER_ID, null, this); + } + }; private final Runnable loadNearbyPlacesRunnable = - () -> getLoaderManager().restartLoader(NEARBY_PLACES_LOADER_ID, null, this); + () -> { + if (getHost() != null) { + getLoaderManager().restartLoader(NEARBY_PLACES_LOADER_ID, null, this); + } + }; private final Runnable loadDirectoryContactsRunnable = - () -> getLoaderManager().restartLoader(DIRECTORY_CONTACTS_LOADER_ID, null, this); + () -> { + if (getHost() != null) { + getLoaderManager().restartLoader(DIRECTORY_CONTACTS_LOADER_ID, null, this); + } + }; private final Runnable capabilitiesUpdatedRunnable = () -> adapter.notifyDataSetChanged(); private Runnable updatePositionRunnable; diff --git a/java/com/android/dialer/searchfragment/list/res/layout/header_layout.xml b/java/com/android/dialer/searchfragment/list/res/layout/header_layout.xml index ff59206ad..16f3701c6 100644 --- a/java/com/android/dialer/searchfragment/list/res/layout/header_layout.xml +++ b/java/com/android/dialer/searchfragment/list/res/layout/header_layout.xml @@ -27,5 +27,5 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - style="@style/Dialer.TextAppearance.Secondary.Ellipsize"/> + style="@style/Dialer.TextAppearance.OVERLINE.Ellipsize"/> </FrameLayout> |