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

Commit c747cd8b authored by Mike Lockwood's avatar Mike Lockwood Committed by Android (Google) Code Review
Browse files

Merge "Move LocationTracker from com.google.android to com.android package."

parents 42ddfc94 191d8984

tests/LocationTracker/AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line 
<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.google.android.locationtracker">

    package="com.android.locationtracker">



    <!-- Permissions for the Location Service -->

    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
@@ -24,7 +24,7 @@ 
        <service android:name=".TrackerService" />

        <activity android:label="@string/settings_menu" android:name="SettingsActivity" />

        <provider android:name=".data.TrackerProvider"

            android:authorities="com.google.android.locationtracker" />

            android:authorities="com.android.locationtracker" />

    </application>



</manifest>

tests/LocationTracker/src/com/google/android/locationtracker/SettingsActivity.java→tests/LocationTracker/src/com/android/locationtracker/SettingsActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.google.android.locationtracker;

package com.android.locationtracker;



import android.os.Bundle;

import android.preference.PreferenceActivity;

tests/LocationTracker/src/com/google/android/locationtracker/TrackerActivity.java→tests/LocationTracker/src/com/android/locationtracker/TrackerActivity.java

+4 −4
Original line number Diff line number Diff line
@@ -14,11 +14,11 @@ 
 * limitations under the License.

 */



package com.google.android.locationtracker;

package com.android.locationtracker;



import com.google.android.locationtracker.data.DateUtils;

import com.google.android.locationtracker.data.TrackerDataHelper;

import com.google.android.locationtracker.data.TrackerListHelper;

import com.android.locationtracker.data.DateUtils;

import com.android.locationtracker.data.TrackerDataHelper;

import com.android.locationtracker.data.TrackerListHelper;



import android.app.AlertDialog;

import android.app.ListActivity;

tests/LocationTracker/src/com/google/android/locationtracker/TrackerService.java→tests/LocationTracker/src/com/android/locationtracker/TrackerService.java

+2 −2
Original line number Diff line number Diff line
@@ -14,9 +14,9 @@ 
 * limitations under the License.

 */



package com.google.android.locationtracker;

package com.android.locationtracker;



import com.google.android.locationtracker.data.TrackerDataHelper;

import com.android.locationtracker.data.TrackerDataHelper;



import android.app.Service;

import android.content.BroadcastReceiver;

tests/LocationTracker/src/com/google/android/locationtracker/data/CSVFormatter.java→tests/LocationTracker/src/com/android/locationtracker/data/CSVFormatter.java

+2 −2
Original line number Diff line number Diff line
@@ -14,9 +14,9 @@ 
 * limitations under the License.

 */



package com.google.android.locationtracker.data;

package com.android.locationtracker.data;



import com.google.android.locationtracker.data.TrackerEntry.EntryType;

import com.android.locationtracker.data.TrackerEntry.EntryType;



/**

 * Formats tracker data as CSV output