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

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

Merge "Push full slice index to device index" into pi-dev

parents a7fd137e fcd5f0f1

AndroidManifest.xml

+3 −0
Original line number Diff line number Diff line
@@ -3196,6 +3196,9 @@ 
            android:exported="true"

            android:permission="android.permission.DUMP" />



         <service android:name=".search.DeviceIndexUpdateJobService"

            android:permission="android.permission.BIND_JOB_SERVICE" />



        <!-- Quick Settings tiles for Developer Options -->

        <service

            android:name=".development.qstile.DevelopmentTiles$ShowLayout"

res/values/integers.xml

+2 −1
Original line number Diff line number Diff line
@@ -19,4 +19,5 @@ 
    <integer name="job_anomaly_clean_up">100</integer>

    <integer name="job_anomaly_config_update">101</integer>

    <integer name="job_anomaly_detection">102</integer>

    <integer name="device_index_update">103</integer>

</resources>

src/com/android/settings/AirplaneModeEnabler.java

+4 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.content.Context; 
import android.content.Intent;

import android.database.ContentObserver;

import android.os.Handler;

import android.os.Looper;

import android.os.Message;

import android.os.SystemProperties;

import android.os.UserHandle;
@@ -51,7 +52,7 @@ public class AirplaneModeEnabler { 
        void onAirplaneModeChanged(boolean isAirplaneModeOn);

    }



    private Handler mHandler = new Handler() {

    private Handler mHandler = new Handler(Looper.getMainLooper()) {

        @Override

        public void handleMessage(Message msg) {

            switch (msg.what) {
@@ -62,7 +63,8 @@ public class AirplaneModeEnabler { 
        }

    };



    private ContentObserver mAirplaneModeObserver = new ContentObserver(new Handler()) {

    private ContentObserver mAirplaneModeObserver = new ContentObserver(

            new Handler(Looper.getMainLooper())) {

        @Override

        public void onChange(boolean selfChange) {

            onAirplaneModeChanged();

src/com/android/settings/network/AirplaneModePreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ public class AirplaneModePreferenceController extends TogglePreferenceController 
    public AirplaneModePreferenceController(Context context, String key) {

        super(context, key);

        mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();

        mAirplaneModeEnabler = new AirplaneModeEnabler(mContext, mMetricsFeatureProvider, this);

    }



    public void setFragment(Fragment hostFragment) {
@@ -81,7 +82,6 @@ public class AirplaneModePreferenceController extends TogglePreferenceController 
        super.displayPreference(screen);

        if (isAvailable()) {

            mAirplaneModePreference = (SwitchPreference) screen.findPreference(getPreferenceKey());

            mAirplaneModeEnabler = new AirplaneModeEnabler(mContext, mMetricsFeatureProvider, this);

        }

    }

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

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ import android.support.annotation.VisibleForTesting; 
import android.text.TextUtils;

import android.util.Log;



import com.android.settings.overlay.FeatureFactory;

import com.android.settings.search.indexing.IndexData;

import com.android.settings.search.indexing.IndexDataConverter;

import com.android.settings.search.indexing.PreIndexData;