Place sharing settings in ShareSettingsActivity to support

ICS up navigation in the action bar.
This commit is contained in:
Jimmy Shih
2012-05-03 10:56:37 -07:00
parent 234f1f4a0a
commit 92821be777
16 changed files with 246 additions and 126 deletions
+2 -3
View File
@@ -180,9 +180,6 @@ limitations under the License.
<activity
android:label="@string/menu_sensor_state"
android:name="com.google.android.apps.mytracks.SensorStateActivity" />
<activity
android:label="@string/settings_title"
android:name="com.google.android.apps.mytracks.SettingsActivity" />
<activity android:name="com.google.android.apps.mytracks.TrackDetailActivity" />
<activity
android:name="com.google.android.apps.mytracks.TrackEditActivity" />
@@ -210,6 +207,8 @@ limitations under the License.
<activity android:name="com.google.android.apps.mytracks.io.sendtogoogle.AccountChooserActivity" />
<activity android:name="com.google.android.apps.mytracks.io.sendtogoogle.UploadResultActivity" />
<activity android:name="com.google.android.apps.mytracks.io.sendtogoogle.UploadServiceChooserActivity" />
<activity android:name="com.google.android.apps.mytracks.settings.SettingsActivity" />
<activity android:name="com.google.android.apps.mytracks.settings.SharingSettingsActivity" />
<!-- Services -->
<service
android:exported="false"