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

Moved LocationSettings into location sub-package

Browse Source 
Change-Id: I55b30df5b6889576539b8cb880e3032f417ddfd7
This commit is contained in:
Lifu Tang
2013-07-29 12:07:48 -07:00
parent 84bbb548a6
commit 83ab7c932e
5 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

@@ -829,7 +829,7 @@
<category android:name="com.android.settings.SHORTCUT" /> <category android:name="com.android.settings.SHORTCUT" />
</intent-filter> </intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS" <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.LocationSettings" /> android:value="com.android.settings.location.LocationSettings" />
<meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID" <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
android:resource="@id/location_settings" /> android:resource="@id/location_settings" />
</activity> </activity>

4
res/xml/location_settings.xml
View File

@@ -17,7 +17,7 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/location_settings_title"> android:title="@string/location_settings_title">
<com.android.settings.WrappingSwitchPreference <com.android.settings.location.WrappingSwitchPreference
android:key="location_toggle" android:key="location_toggle"
android:title="@string/location_access_title" android:title="@string/location_access_title"
android:summary="@string/location_access_summary" android:summary="@string/location_access_summary"
@@ -34,7 +34,7 @@
android:dependency="location_toggle" android:dependency="location_toggle"
android:persistent="false" /> android:persistent="false" />
<com.android.settings.WrappingCheckBoxPreference <com.android.settings.location.WrappingCheckBoxPreference
android:key="location_network" android:key="location_network"
android:title="@string/location_network_based" android:title="@string/location_network_based"
android:summary="@string/location_neighborhood_level" android:summary="@string/location_neighborhood_level"

2
res/xml/settings_headers.xml
View File

@@ -125,7 +125,7 @@
<!-- Location --> <!-- Location -->
<header <header
android:fragment="com.android.settings.LocationSettings" android:fragment="com.android.settings.location.LocationSettings"
android:icon="@drawable/ic_settings_location" android:icon="@drawable/ic_settings_location"
android:title="@string/location_settings_title" android:title="@string/location_settings_title"
android:id="@+id/location_settings" /> android:id="@+id/location_settings" />

2
src/com/android/settings/fuelgauge/PowerUsageDetail.java
View File

@@ -49,11 +49,11 @@ import android.widget.ProgressBar;
import android.widget.TextView; import android.widget.TextView;
import com.android.settings.DisplaySettings; import com.android.settings.DisplaySettings;
import com.android.settings.LocationSettings;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.WirelessSettings; import com.android.settings.WirelessSettings;
import com.android.settings.applications.InstalledAppDetails; import com.android.settings.applications.InstalledAppDetails;
import com.android.settings.bluetooth.BluetoothSettings; import com.android.settings.bluetooth.BluetoothSettings;
import com.android.settings.location.LocationSettings;
import com.android.settings.wifi.WifiSettings; import com.android.settings.wifi.WifiSettings;
public class PowerUsageDetail extends Fragment implements Button.OnClickListener { public class PowerUsageDetail extends Fragment implements Button.OnClickListener {

5
src/com/android/settings/LocationSettings.java → src/com/android/settings/location/LocationSettings.java
View File

@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package com.android.settings; package com.android.settings.location;
import android.content.ContentQueryMap; import android.content.ContentQueryMap;
@@ -33,6 +33,9 @@ import android.util.AttributeSet;
import android.view.View; import android.view.View;
import android.widget.TextView; import android.widget.TextView;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import java.util.Observable; import java.util.Observable;
import java.util.Observer; import java.util.Observer;