Fix bug #13962001 Search - need to finish indexing "Data usage" Settings

- index missing strings

Change-Id: I015452b58bf7dc576bce8fee03b55b38c0094097
This commit is contained in:
Fabrice Di Meglio
2014-04-10 13:47:30 -07:00
parent 981efd1778
commit 758c3ff8e9
2 changed files with 55 additions and 4 deletions

View File

@@ -86,6 +86,7 @@ import android.os.ServiceManager;
import android.os.SystemProperties; import android.os.SystemProperties;
import android.os.UserHandle; import android.os.UserHandle;
import android.preference.Preference; import android.preference.Preference;
import android.provider.SearchIndexableResource;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.format.DateUtils; import android.text.format.DateUtils;
@@ -133,6 +134,8 @@ import com.android.settings.net.NetworkPolicyEditor;
import com.android.settings.net.SummaryForAllUidLoader; import com.android.settings.net.SummaryForAllUidLoader;
import com.android.settings.net.UidDetail; import com.android.settings.net.UidDetail;
import com.android.settings.net.UidDetailProvider; import com.android.settings.net.UidDetailProvider;
import com.android.settings.search.Indexable;
import com.android.settings.search.SearchIndexableRaw;
import com.android.settings.widget.ChartDataUsageView; import com.android.settings.widget.ChartDataUsageView;
import com.android.settings.widget.ChartDataUsageView.DataUsageChartListener; import com.android.settings.widget.ChartDataUsageView.DataUsageChartListener;
import com.android.settings.widget.PieChartView; import com.android.settings.widget.PieChartView;
@@ -149,7 +152,7 @@ import java.util.Locale;
* Panel showing data usage history across various networks, including options * Panel showing data usage history across various networks, including options
* to inspect based on usage cycle and control through {@link NetworkPolicy}. * to inspect based on usage cycle and control through {@link NetworkPolicy}.
*/ */
public class DataUsageSummary extends Fragment { public class DataUsageSummary extends Fragment implements Indexable {
private static final String TAG = "DataUsage"; private static final String TAG = "DataUsage";
private static final boolean LOGD = false; private static final boolean LOGD = false;
@@ -2380,4 +2383,51 @@ public class DataUsageSummary extends Fragment {
summary.setVisibility(View.VISIBLE); summary.setVisibility(View.VISIBLE);
summary.setText(string); summary.setText(string);
} }
/**
* For search
*/
public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new SearchIndexProvider() {
@Override
public List<SearchIndexableResource> getXmlResourcesToIndex(
Context context, boolean enabled) {
return null;
}
@Override
public List<SearchIndexableRaw> getRawDataToIndex(Context context, boolean enabled) {
final List<SearchIndexableRaw> result = new ArrayList<SearchIndexableRaw>();
final Resources res = context.getResources();
// Add fragment title
SearchIndexableRaw data = new SearchIndexableRaw(context);
data.title = res.getString(R.string.data_usage_summary_title);
data.screenTitle = res.getString(R.string.data_usage_summary_title);
result.add(data);
// Mobile data
data = new SearchIndexableRaw(context);
data.title = res.getString(R.string.data_usage_enable_mobile);
data.screenTitle = res.getString(R.string.data_usage_summary_title);
result.add(data);
// Set mobile data limit
data = new SearchIndexableRaw(context);
data.title = res.getString(R.string.data_usage_disable_mobile_limit);
data.screenTitle = res.getString(R.string.data_usage_summary_title);
result.add(data);
// Data usage cycke
data = new SearchIndexableRaw(context);
data.title = res.getString(R.string.data_usage_cycle);
data.screenTitle = res.getString(R.string.data_usage_summary_title);
result.add(data);
return result;
}
};
} }

View File

@@ -17,6 +17,7 @@
package com.android.settings.search; package com.android.settings.search;
import android.provider.SearchIndexableResource; import android.provider.SearchIndexableResource;
import com.android.settings.DataUsageSummary;
import com.android.settings.DateTimeSettings; import com.android.settings.DateTimeSettings;
import com.android.settings.DevelopmentSettings; import com.android.settings.DevelopmentSettings;
import com.android.settings.DeviceInfoSettings; import com.android.settings.DeviceInfoSettings;
@@ -87,10 +88,10 @@ public final class SearchIndexableResources {
BluetoothSettings.class.getName(), BluetoothSettings.class.getName(),
R.drawable.ic_settings_bluetooth2)); R.drawable.ic_settings_bluetooth2));
sResMap.put(DataUsageMeteredSettings.class.getName(), sResMap.put(DataUsageSummary.class.getName(),
new SearchIndexableResource(RANK_DATA_USAGE, new SearchIndexableResource(RANK_DATA_USAGE,
R.xml.data_usage_metered_prefs, NO_DATA_RES_ID,
DataUsageMeteredSettings.class.getName(), DataUsageSummary.class.getName(),
R.drawable.ic_settings_data_usage)); R.drawable.ic_settings_data_usage));
sResMap.put(WirelessSettings.class.getName(), sResMap.put(WirelessSettings.class.getName(),