nutomic/syncthing-android
1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2024-11-22 20:31:16 +00:00
Code Releases Activity

Moved SettingsActivity and WebGuiActivity to gui folder.

Browse source
This commit is contained in:
Felix Ableitner 2014-05-31 18:44:32 +02:00
parent d3a5b09568
commit 0278210471
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/AndroidManifest.xml
View file

@ -18,7 +18,7 @@
android:theme="@style/Theme.AppCompat" > android:theme="@style/Theme.AppCompat" >
<activity <activity
android:name=".WebGuiActivity" android:name=".gui.WebGuiActivity"
android:label="@string/app_name" android:label="@string/app_name"
android:launchMode="singleTop" > android:launchMode="singleTop" >
<intent-filter> <intent-filter>
@ -28,7 +28,7 @@
</activity> </activity>
<activity <activity
android:name=".SettingsActivity" android:name=".gui.SettingsActivity"
android:label="@string/settings_title" > android:label="@string/settings_title" >
<meta-data <meta-data
android:name="android.support.PARENT_ACTIVITY" android:name="android.support.PARENT_ACTIVITY"

4
src/main/java/com/nutomic/syncthingandroid/SettingsActivity.java → src/main/java/com/nutomic/syncthingandroid/gui/SettingsActivity.java
View file

@ -1,4 +1,4 @@
package com.nutomic.syncthingandroid; package com.nutomic.syncthingandroid.gui;
import android.annotation.TargetApi; import android.annotation.TargetApi;
import android.content.ComponentName; import android.content.ComponentName;
@ -16,9 +16,9 @@ import android.preference.PreferenceActivity;
import android.preference.PreferenceScreen; import android.preference.PreferenceScreen;
import android.support.v4.app.NavUtils; import android.support.v4.app.NavUtils;
import android.text.InputType; import android.text.InputType;
import android.util.Log;
import android.view.MenuItem; import android.view.MenuItem;
import com.nutomic.syncthingandroid.R;
import com.nutomic.syncthingandroid.syncthing.RestApi; import com.nutomic.syncthingandroid.syncthing.RestApi;
import com.nutomic.syncthingandroid.syncthing.SyncthingService; import com.nutomic.syncthingandroid.syncthing.SyncthingService;
import com.nutomic.syncthingandroid.syncthing.SyncthingServiceBinder; import com.nutomic.syncthingandroid.syncthing.SyncthingServiceBinder;

3
src/main/java/com/nutomic/syncthingandroid/WebGuiActivity.java → src/main/java/com/nutomic/syncthingandroid/gui/WebGuiActivity.java
View file

@ -1,4 +1,4 @@
package com.nutomic.syncthingandroid; package com.nutomic.syncthingandroid.gui;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.app.Activity; import android.app.Activity;
@ -17,6 +17,7 @@ import android.webkit.WebViewClient;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import android.widget.TextView; import android.widget.TextView;
import com.nutomic.syncthingandroid.R;
import com.nutomic.syncthingandroid.syncthing.SyncthingService; import com.nutomic.syncthingandroid.syncthing.SyncthingService;
import com.nutomic.syncthingandroid.syncthing.SyncthingServiceBinder; import com.nutomic.syncthingandroid.syncthing.SyncthingServiceBinder;

2
src/main/java/com/nutomic/syncthingandroid/syncthing/SyncthingService.java
View file

@ -14,7 +14,7 @@ import android.util.Log;
import android.util.Pair; import android.util.Pair;
import com.nutomic.syncthingandroid.R; import com.nutomic.syncthingandroid.R;
import com.nutomic.syncthingandroid.WebGuiActivity; import com.nutomic.syncthingandroid.gui.WebGuiActivity;
import org.apache.http.HttpResponse; import org.apache.http.HttpResponse;
import org.apache.http.HttpStatus; import org.apache.http.HttpStatus;