Snap for 4517567 from 295f9d3368319ea047e55c35cf1ecaca7dc69283 to pi-release

Change-Id: I8dcea2301d44cbbbf40c9136722c4b74c996ef4c

1 files changed, 4 insertions, 10 deletions

diff --git a/src/com/android/settings/intelligence/search/SearchFragment.java b/src/com/android/settings/intelligence/search/SearchFragment.java
index e92e301..1f6a6c8 100644
--- a/src/com/android/settings/intelligence/search/SearchFragment.java
+++ b/src/com/android/settings/intelligence/search/SearchFragment.java
@@ -17,23 +17,20 @@
 
 package com.android.settings.intelligence.search;
 
-import static com.android.settings.intelligence.nano.SettingsIntelligenceLogProto
-        .SettingsIntelligenceEvent;
+import static com.android.settings.intelligence.nano.SettingsIntelligenceLogProto.SettingsIntelligenceEvent;
 
 import android.app.Activity;
 import android.app.Fragment;
 import android.app.LoaderManager;
 import android.content.Context;
 import android.content.Loader;
-import android.content.res.Resources;
-import android.content.res.TypedArray;
 import android.os.Bundle;
 import android.support.annotation.VisibleForTesting;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
+import android.util.EventLog;
 import android.util.Log;
-import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -42,7 +39,6 @@ import android.view.ViewGroup;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.LinearLayout;
 import android.widget.SearchView;
-import android.widget.TextView;
 import android.widget.Toolbar;
 
 import com.android.settings.intelligence.R;
@@ -177,10 +173,6 @@ public class SearchFragment extends Fragment implements SearchView.OnQueryTextLi
         mSearchView.setOnQueryTextListener(this);
         mSearchView.requestFocus();
 
-        // TODO Refactor
-//        ActionBarShadowController.attachToRecyclerView(
-//                view.findViewById(R.id.search_bar_container), getLifecycle(),
-// mResultsRecyclerView);
         return view;
     }
 
@@ -325,6 +317,8 @@ public class SearchFragment extends Fragment implements SearchView.OnQueryTextLi
             mNoResultsView.setVisibility(View.VISIBLE);
             mMetricsFeatureProvider.logEvent(SettingsIntelligenceEvent.SHOW_SEARCH_NO_RESULT,
                     queryToResultLatencyMs);
+            EventLog.writeEvent(90204 /* settings_latency*/, 1 /* query_to_result_latency */,
+                    (int) queryToResultLatencyMs);
         } else {
             mNoResultsView.setVisibility(View.GONE);
             mResultsRecyclerView.scrollToPosition(0);