commit 937d3f4ba8daad2d7f61c17e204ca9fda0a0b9ad
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Wed Mar 11 13:58:59 2015 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Sat Mar 14 23:45:08 2015 -0700
tree 047991d76ec0e438195770b763b0933eeb47a8b9
parent 031774238d928fe398e0c0a3f4b4b615d0b8ed12

gui: Refactoring and integration of nfd start/stop and log viewer under main activity

Change-Id: Iad1a7a4f85b74dd488d992107fc1ae7eb5f87f11
Refs: #2434

app/src/main/AndroidManifest.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b562532..3b4f4bf 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,7 +12,7 @@
         android:theme="@style/AppTheme" >
 
         <activity
-            android:name=".NfdMainActivity"
+            android:name=".MainActivity"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -21,13 +21,12 @@
         </activity>
 
         <activity
-            android:name=".NfdLogActivity"
-            android:label="@string/nfd_logger" />
+            android:name=".LogcatSettingsActivity"
+            android:label="@string/nfd_log_settings" />
 
         <activity
-            android:name=".NfdLogSettingsActivity"
-            android:label="@string/nfd_log_settings" >
-        </activity>
+            android:name=".LogcatActivity"
+            android:label="@string/nfd_logger" />
 
         <service
             android:name=".service.NfdService"