PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Block inline-results from Settings search" into oc-dr1-dev

Browse Source 
am: bea9a5d739

Change-Id: Ie9ba24744922dccedfec07a034c2374695f77214
This commit is contained in:
Matthew Fritze
2017-06-21 17:42:48 +00:00
committed by android-build-merger
parent 776fe841f9 bea9a5d739
commit eeec8eecc0
3 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/display/AutoBrightnessPreferenceController.java
View File

@@ -19,6 +19,7 @@ import android.provider.Settings;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import com.android.settings.DisplaySettings;
import com.android.settings.core.PreferenceController;
import com.android.settings.search.DatabaseIndexingUtils;
import com.android.settings.search.InlineSwitchPayload;
@@ -69,7 +70,7 @@ public class AutoBrightnessPreferenceController extends PreferenceController imp
@Override
public ResultPayload getResultPayload() {
final Intent intent = DatabaseIndexingUtils.buildSubsettingIntent(mContext,
getClass().getName(), mAutoBrightnessKey,
DisplaySettings.class.getName(), mAutoBrightnessKey,
mContext.getString(R.string.display_settings));
return new InlineSwitchPayload(SCREEN_BRIGHTNESS_MODE,

6
src/com/android/settings/search/SearchResultsAdapter.java
View File

@@ -106,8 +106,10 @@ public class SearchResultsAdapter extends RecyclerView.Adapter<SearchViewHolder>
view = inflater.inflate(R.layout.search_intent_item, parent, false);
return new IntentSearchViewHolder(view);
case ResultPayload.PayloadType.INLINE_SWITCH:
view = inflater.inflate(R.layout.search_inline_switch_item, parent, false);
return new InlineSwitchViewHolder(view, context);
// TODO (b/62807132) replace layout InlineSwitchViewHolder and return an
// InlineSwitchViewHolder.
view = inflater.inflate(R.layout.search_intent_item, parent, false);
return new IntentSearchViewHolder(view);
case ResultPayload.PayloadType.SAVED_QUERY:
view = inflater.inflate(R.layout.search_saved_query_item, parent, false);
return new SavedQueryViewHolder(view);