diff options
| author | Gilles Debunne <debunne@google.com> | 2011-08-23 14:58:59 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-23 14:58:59 -0700 |
| commit | 1a843346445ebd662fbce5197a24a0e14745297f (patch) | |
| tree | 2c8b4ae8837a58bf2e220b5f60cae8962f9263db /src/com/android | |
| parent | 8a0062fd91d86cae5782116875a2224981904274 (diff) | |
| parent | c9575c489bfbae848e3e2d2a9e35f630f2118c55 (diff) | |
| download | packages_apps_settings-1a843346445ebd662fbce5197a24a0e14745297f.zip packages_apps_settings-1a843346445ebd662fbce5197a24a0e14745297f.tar.gz packages_apps_settings-1a843346445ebd662fbce5197a24a0e14745297f.tar.bz2 | |
Merge "Bug 5038721: battery info links to new location setting for GPS management."
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/settings/fuelgauge/PowerUsageDetail.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/com/android/settings/fuelgauge/PowerUsageDetail.java b/src/com/android/settings/fuelgauge/PowerUsageDetail.java index 7717503..b70312b 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageDetail.java +++ b/src/com/android/settings/fuelgauge/PowerUsageDetail.java @@ -44,8 +44,8 @@ import android.widget.ImageView; import android.widget.TextView; import com.android.settings.DisplaySettings; +import com.android.settings.LocationSettings; import com.android.settings.R; -import com.android.settings.SecuritySettings; import com.android.settings.WirelessSettings; import com.android.settings.applications.InstalledAppDetails; import com.android.settings.bluetooth.BluetoothSettings; @@ -79,7 +79,7 @@ public class PowerUsageDetail extends Fragment implements Button.OnClickListener public static final int ACTION_BLUETOOTH_SETTINGS = 3; public static final int ACTION_WIRELESS_SETTINGS = 4; public static final int ACTION_APP_DETAILS = 5; - public static final int ACTION_SECURITY_SETTINGS = 6; + public static final int ACTION_LOCATION_SETTINGS = 6; public static final int ACTION_FORCE_STOP = 7; public static final int ACTION_REPORT = 8; @@ -280,9 +280,9 @@ public class PowerUsageDetail extends Fragment implements Button.OnClickListener case ACTION_APP_DETAILS: startApplicationDetailsActivity(); break; - case ACTION_SECURITY_SETTINGS: - pa.startPreferencePanel(SecuritySettings.class.getName(), null, - R.string.security_settings_title, null, null, 0); + case ACTION_LOCATION_SETTINGS: + pa.startPreferencePanel(LocationSettings.class.getName(), null, + R.string.location_settings_title, null, null, 0); break; case ACTION_FORCE_STOP: killProcesses(); @@ -348,8 +348,8 @@ public class PowerUsageDetail extends Fragment implements Button.OnClickListener // TODO: } if (mUsesGps) { - addControl(R.string.security_settings_title, - R.string.battery_sugg_apps_gps, ACTION_SECURITY_SETTINGS); + addControl(R.string.location_settings_title, + R.string.battery_sugg_apps_gps, ACTION_LOCATION_SETTINGS); removeHeader = false; } break; |