summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/location
diff options
context:
space:
mode:
authorTom O'Neill <tomo@google.com>2014-03-19 10:38:05 -0700
committerTom O'Neill <tomo@google.com>2014-03-19 10:38:05 -0700
commita7f399123f12269a836c4c79471b7750ad673fcb (patch)
treed95b3bcfeea1cd8c8e6ff0b299da082c485926e2 /src/com/android/settings/location
parent1b35e479e64e33dabcc7cdf1825899ab1f7dc61c (diff)
downloadpackages_apps_Settings-a7f399123f12269a836c4c79471b7750ad673fcb.zip
packages_apps_Settings-a7f399123f12269a836c4c79471b7750ad673fcb.tar.gz
packages_apps_Settings-a7f399123f12269a836c4c79471b7750ad673fcb.tar.bz2
Injected settings start new task
- Bug: 13534214 Change-Id: I10b47f58651166a58a86efe8da2979e8f9a2a5cb
Diffstat (limited to 'src/com/android/settings/location')
-rw-r--r--src/com/android/settings/location/SettingsInjector.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/settings/location/SettingsInjector.java b/src/com/android/settings/location/SettingsInjector.java
index 76b3103..5f8d030 100644
--- a/src/com/android/settings/location/SettingsInjector.java
+++ b/src/com/android/settings/location/SettingsInjector.java
@@ -254,8 +254,11 @@ class SettingsInjector {
Drawable icon = pm.getDrawable(info.packageName, info.iconId, null);
pref.setIcon(icon);
+ // Activity to start if they click on the preference. Must start in new task to ensure
+ // that "android.settings.LOCATION_SOURCE_SETTINGS" brings user back to Settings > Location.
Intent settingIntent = new Intent();
settingIntent.setClassName(info.packageName, info.settingsActivity);
+ settingIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
pref.setIntent(settingIntent);
prefs.add(pref);