From 28f389e553ef84a5e2720f678edc225f24d15b2c Mon Sep 17 00:00:00 2001 From: Matthew Fritze Date: Wed, 22 Mar 2017 09:02:01 -0700 Subject: [PATCH] Rename remaining layouts to original search names Change-Id: Ibb0aa087e797c3e7ae93556cf4a00d9746694532 Fixes: 32590887 Test: make RunSettingsGoogleRoboTests --- res/layout/{search_panel_2.xml => search_panel.xml} | 0 src/com/android/settings/search2/SearchFragment.java | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename res/layout/{search_panel_2.xml => search_panel.xml} (100%) 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 diff --git a/src/com/android/settings/search2/SearchFragment.java b/src/com/android/settings/search2/SearchFragment.java index eb760ee52b..8e1e1b4571 100644 --- a/src/com/android/settings/search2/SearchFragment.java +++ b/src/com/android/settings/search2/SearchFragment.java @@ -157,7 +157,7 @@ public class SearchFragment extends InstrumentedFragment implements SearchView.O @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())); -- 2.11.0