Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb8e1f7a authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Fix DataUsageSummary formatting"

parents 27e0f927 e634ff37

src/com/android/settings/DataUsageSummary.java

+94 −94
Original line number Diff line number Diff line
@@ -2690,48 +2690,6 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable 
        summary.setText(string);

    }



    /**

     * For search

     */

    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

        new BaseSearchIndexProvider() {

            @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.key = DATA_USAGE_ENABLE_MOBILE_KEY;

                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.key = DATA_USAGE_DISABLE_MOBILE_LIMIT_KEY;

                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 cycle

                data = new SearchIndexableRaw(context);

                data.key = DATA_USAGE_CYCLE_KEY;

                data.title = res.getString(R.string.data_usage_cycle);

                data.screenTitle = res.getString(R.string.data_usage_summary_title);

                result.add(data);



                return result;

            }

        };



    private void addMobileTab(Context context, SubscriptionInfo subInfo, boolean isMultiSim) {

        if (subInfo != null && mMobileTagMap != null) {

            if (hasReadyMobileRadio(context, subInfo.getSubscriptionId())) {
@@ -2841,4 +2799,46 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable 
            return new SummaryProvider(activity, summaryLoader);

        }

    };



    /**

     * For search

     */

    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

        new BaseSearchIndexProvider() {

            @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.key = DATA_USAGE_ENABLE_MOBILE_KEY;

                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.key = DATA_USAGE_DISABLE_MOBILE_LIMIT_KEY;

                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 cycle

                data = new SearchIndexableRaw(context);

                data.key = DATA_USAGE_CYCLE_KEY;

                data.title = res.getString(R.string.data_usage_cycle);

                data.screenTitle = res.getString(R.string.data_usage_summary_title);

                result.add(data);



                return result;

            }

        };

}