commit fb8e0dc5457915e22d7ddf0a6efb19b09c9e6320
author Matthew Fritze <mfritze@google.com> Wed Mar 22 17:32:18 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 22 17:32:19 2017 +0000
tree 394d36e6301c79230cb9918d1abdfa0740d2f14b
parent 422fc4a433d1bbfdddb38656b93e520d1889b99e
parent 28f389e553ef84a5e2720f678edc225f24d15b2c

Merge "Rename remaining layouts to original search names"

res/layout/search_panel.xml

diff --git a/res/layout/search_panel_2.xml b/res/layout/search_panel.xml
similarity index 100%
rename from res/layout/search_panel_2.xml
rename to res/layout/search_panel.xml

src/com/android/settings/search2/SearchFragment.java

diff --git a/src/com/android/settings/search2/SearchFragment.java b/src/com/android/settings/search2/SearchFragment.java
index eb760ee..8e1e1b4 100644
--- a/src/com/android/settings/search2/SearchFragment.java
+++ b/src/com/android/settings/search2/SearchFragment.java
@@ -157,7 +157,7 @@
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
-        final View view = inflater.inflate(R.layout.search_panel_2, container, false);
+        final View view = inflater.inflate(R.layout.search_panel, container, false);
         mResultsRecyclerView = view.findViewById(R.id.list_results);
         mResultsRecyclerView.setAdapter(mSearchAdapter);
         mResultsRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));