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

Merge "Add location as a Inline list payload" into oc-dr1-dev

Browse Source 
am: 9e2984b035

Change-Id: Iad7aa04e35d7853ade051e5a711632b20b2fbcbe
This commit is contained in:
Matthew Fritze
2017-07-10 23:32:11 +00:00
committed by android-build-merger
parent 16afefd509 9e2984b035
commit a57c59bbba
2 changed files with 60 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/location/LocationPreferenceController.java
View File

@@ -26,6 +26,9 @@ import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.PreferenceController;
import com.android.settings.search.DatabaseIndexingUtils;
import com.android.settings.search.InlineListPayload;
import com.android.settings.search.ResultPayload;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
@@ -120,4 +123,16 @@ public class LocationPreferenceController extends PreferenceController implement
}
return 0;
}
@Override
public ResultPayload getResultPayload() {
final Intent intent = DatabaseIndexingUtils.buildSubsettingIntent(mContext,
LocationSettings.class.getName(), KEY_LOCATION,
mContext.getString(R.string.location_settings_title));
return new InlineListPayload(Secure.LOCATION_MODE,
ResultPayload.SettingsSource.SECURE, intent, isAvailable(),
Secure.LOCATION_MODE_HIGH_ACCURACY + 1);
}
}