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

Revert "Settings search - Navigate user to exact page"

Browse Source 
This reverts commit 08f2a58459.

Reason for revert: design changed, we decide to take the user to
the entry after clicking on a search result.
It's opposite with what we did, so we revert related CL first.

Test: robotest

Change-Id: Iadb9a94a7ef7838be34a54499e2d934d6396c336
This commit is contained in:
Edgar Wang
2020-01-09 08:53:22 +00:00
parent 4bc2ba2cb9
commit e19ee9a01f
56 changed files with 52 additions and 386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/applications/ProcessStatsSummary.java
View File

@@ -29,13 +29,7 @@ import com.android.settings.SummaryPreference;
import com.android.settings.Utils;
import com.android.settings.applications.ProcStatsData.MemInfo;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
/**
* Settings screen to provide memory stats summary
*/
@SearchIndexable
public class ProcessStatsSummary extends ProcessStatsBase implements OnPreferenceClickListener {
private static final String KEY_STATUS_HEADER = "status_header";
@@ -131,7 +125,4 @@ public class ProcessStatsSummary extends ProcessStatsBase implements OnPreferenc
}
return false;
}
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.process_stats_summary);
}

9
src/com/android/settings/applications/assist/DefaultVoiceInputPicker.java
View File

@@ -27,17 +27,11 @@ import android.text.TextUtils;
import com.android.internal.app.AssistUtils;
import com.android.settings.R;
import com.android.settings.applications.defaultapps.DefaultAppPickerFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.applications.DefaultAppInfo;
import com.android.settingslib.search.SearchIndexable;
import java.util.ArrayList;
import java.util.List;
/**
* Fragment for picking assistant voice input
*/
@SearchIndexable
public class DefaultVoiceInputPicker extends DefaultAppPickerFragment {
private VoiceInputHelper mHelper;
@@ -172,7 +166,4 @@ public class DefaultVoiceInputPicker extends DefaultAppPickerFragment {
return new Intent(Intent.ACTION_MAIN).setComponent(mInfo.settings);
}
}
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.default_voice_settings);
}

8
src/com/android/settings/applications/assist/ManageAssist.java
View File

@@ -37,6 +37,7 @@ import java.util.List;
public class ManageAssist extends DashboardFragment {
private static final String TAG = "ManageAssist";
private static final String KEY_ASSIST = "gesture_assist_application";
@Override
protected String getLogTag() {
@@ -84,5 +85,12 @@ public class ManageAssist extends DashboardFragment {
Context context) {
return buildPreferenceControllers(context, null /* lifecycle */);
}
@Override
public List<String> getNonIndexableKeys(Context context) {
List<String> keys = super.getNonIndexableKeys(context);
keys.add(KEY_ASSIST);
return keys;
}
};
}