Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 040ce605 authored by Lifu Tang's avatar Lifu Tang Committed by Android (Google) Code Review
Browse files

Merge "Moved LocationSettings into location sub-package"

parents 44214d46 83ab7c93

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -829,7 +829,7 @@ 
                <category android:name="com.android.settings.SHORTCUT" />

            </intent-filter>

            <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"

                android:resource="@id/location_settings" />

        </activity>

res/xml/location_settings.xml

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"

        android:title="@string/location_settings_title">



        <com.android.settings.WrappingSwitchPreference

        <com.android.settings.location.WrappingSwitchPreference

            android:key="location_toggle"

            android:title="@string/location_access_title"

            android:summary="@string/location_access_summary"
@@ -34,7 +34,7 @@ 
            android:dependency="location_toggle"

            android:persistent="false" />



        <com.android.settings.WrappingCheckBoxPreference

        <com.android.settings.location.WrappingCheckBoxPreference

            android:key="location_network"

            android:title="@string/location_network_based"

            android:summary="@string/location_neighborhood_level"

res/xml/settings_headers.xml

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ 


    <!-- Location -->

    <header

        android:fragment="com.android.settings.LocationSettings"

        android:fragment="com.android.settings.location.LocationSettings"

        android:icon="@drawable/ic_settings_location"

        android:title="@string/location_settings_title"

        android:id="@+id/location_settings" />

src/com/android/settings/fuelgauge/PowerUsageDetail.java

+1 −1
Original line number Diff line number Diff line
@@ -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 {

src/com/android/settings/LocationSettings.java→src/com/android/settings/location/LocationSettings.java

+4 −1
Original line number Diff line number Diff line
@@ -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;