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

Commit 6158fa69 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add search providers for Connected Devices in new IA"

parents 89beefdb 762b4969

res/xml/connected_devices.xml

+3 −1
Original line number Diff line number Diff line
@@ -14,7 +14,9 @@ 
     limitations under the License.

-->



<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">

<PreferenceScreen

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:title="@string/connected_devices_dashboard_title">



    <SwitchPreference

        android:key="toggle_nfc"

src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java

+22 −0
Original line number Diff line number Diff line
@@ -16,15 +16,20 @@ 
package com.android.settings.connecteddevice;



import android.content.Context;

import android.provider.SearchIndexableResource;



import com.android.settings.R;

import com.android.settings.core.PreferenceController;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.deviceinfo.UsbBackend;

import com.android.settings.nfc.NfcPreferenceController;

import com.android.settings.overlay.FeatureFactory;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.search.Indexable;

import com.android.settingslib.drawer.CategoryKey;



import java.util.ArrayList;

import java.util.Arrays;

import java.util.List;



public class ConnectedDeviceDashboardFragment extends DashboardFragment {
@@ -65,4 +70,21 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment { 
        return controllers;

    }



    /**

     * For Search.

     */

    public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

            new BaseSearchIndexProvider() {

                @Override

                public List<SearchIndexableResource> getXmlResourcesToIndex(

                        Context context, boolean enabled) {

                    if (!FeatureFactory.getFactory(context).getDashboardFeatureProvider(context)

                            .isEnabled()) {

                        return null;

                    }

                    final SearchIndexableResource sir = new SearchIndexableResource(context);

                    sir.xmlResId = R.xml.connected_devices;

                    return Arrays.asList(sir);

                }

            };

}
 
 No newline at end of file

src/com/android/settings/core/instrumentation/MetricsFeatureProviderImpl.java

+0 −6
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
package com.android.settings.core.instrumentation;



import android.content.Context;

import android.support.annotation.VisibleForTesting;



import java.util.ArrayList;

import java.util.List;
@@ -92,9 +91,4 @@ public class MetricsFeatureProviderImpl implements MetricsFeatureProvider { 
            writer.histogram(context, name, bucket);

        }

    }



    @VisibleForTesting

    public void addLogWriter(LogWriter logWriter) {

        mLoggerWriters.add(logWriter);

    }

}

src/com/android/settings/search/Ranking.java

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import com.android.settings.accounts.AccountSettings; 
import com.android.settings.applications.AdvancedAppSettings;

import com.android.settings.applications.SpecialAccessSettings;

import com.android.settings.bluetooth.BluetoothSettings;

import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;

import com.android.settings.datausage.DataUsageMeteredSettings;

import com.android.settings.datausage.DataUsageSummary;

import com.android.settings.deviceinfo.StorageDashboardFragment;
@@ -108,6 +109,7 @@ public final class Ranking { 


        // BT

        sRankMap.put(BluetoothSettings.class.getName(), RANK_BT);

        sRankMap.put(ConnectedDeviceDashboardFragment.class.getName(), RANK_BT);



        // SIM Cards

        sRankMap.put(SimSettings.class.getName(), RANK_SIM);

src/com/android/settings/search/SearchIndexableResources.java

+14 −11
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.provider.SearchIndexableResource; 
import android.support.annotation.DrawableRes;

import android.support.annotation.VisibleForTesting;

import android.support.annotation.XmlRes;



import com.android.settings.DateTimeSettings;

import com.android.settings.DevelopmentSettings;

import com.android.settings.DeviceInfoSettings;
@@ -36,6 +37,7 @@ import com.android.settings.accounts.AccountSettings; 
import com.android.settings.applications.AdvancedAppSettings;

import com.android.settings.applications.SpecialAccessSettings;

import com.android.settings.bluetooth.BluetoothSettings;

import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;

import com.android.settings.datausage.DataUsageMeteredSettings;

import com.android.settings.datausage.DataUsageSummary;

import com.android.settings.deviceinfo.StorageDashboardFragment;
@@ -131,6 +133,7 @@ public final class SearchIndexableResources { 
                R.drawable.ic_settings_notifications);

        addIndex(SystemDashboardFragment.class, NO_DATA_RES_ID, R.drawable.ic_settings_about);

        addIndex(StorageDashboardFragment.class, NO_DATA_RES_ID, R.drawable.ic_settings_storage);

        addIndex(ConnectedDeviceDashboardFragment.class, NO_DATA_RES_ID, R.drawable.ic_bt_laptop);

        addIndex(EnterprisePrivacySettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_about);

    }