diff options
| author | Lifu Tang <lifu@google.com> | 2013-07-30 18:43:16 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-07-30 18:43:16 +0000 |
| commit | 040ce605826af509f6391e3536204c07476dc28a (patch) | |
| tree | 8f8ae4fd50ae8245dc50091d105928be90443873 /src/com/android/settings | |
| parent | 44214d46ec2b035b805100e1a3b6479ee2a377ce (diff) | |
| parent | 83ab7c932e59fd23799f5db723e80d411918a9a5 (diff) | |
| download | packages_apps_Settings-040ce605826af509f6391e3536204c07476dc28a.tar.gz packages_apps_Settings-040ce605826af509f6391e3536204c07476dc28a.tar.bz2 packages_apps_Settings-040ce605826af509f6391e3536204c07476dc28a.zip | |
Merge "Moved LocationSettings into location sub-package"
Diffstat (limited to 'src/com/android/settings')
| -rw-r--r-- | src/com/android/settings/fuelgauge/PowerUsageDetail.java | 2 | ||||
| -rw-r--r-- | src/com/android/settings/location/LocationSettings.java (renamed from src/com/android/settings/LocationSettings.java) | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/settings/fuelgauge/PowerUsageDetail.java b/src/com/android/settings/fuelgauge/PowerUsageDetail.java index 945b86bc5f..52d8780b15 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageDetail.java +++ b/src/com/android/settings/fuelgauge/PowerUsageDetail.java @@ -49,11 +49,11 @@ import android.widget.ProgressBar; import android.widget.TextView; import com.android.settings.DisplaySettings; -import com.android.settings.LocationSettings; import com.android.settings.R; import com.android.settings.WirelessSettings; import com.android.settings.applications.InstalledAppDetails; import com.android.settings.bluetooth.BluetoothSettings; +import com.android.settings.location.LocationSettings; import com.android.settings.wifi.WifiSettings; public class PowerUsageDetail extends Fragment implements Button.OnClickListener { diff --git a/src/com/android/settings/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java index 2edefdfba1..62bd272c8a 100644 --- a/src/com/android/settings/LocationSettings.java +++ b/src/com/android/settings/location/LocationSettings.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.settings; +package com.android.settings.location; import android.content.ContentQueryMap; @@ -33,6 +33,9 @@ import android.util.AttributeSet; import android.view.View; import android.widget.TextView; +import com.android.settings.R; +import com.android.settings.SettingsPreferenceFragment; + import java.util.Observable; import java.util.Observer; |