Browse Source

new wifidirect ui will now be loaded on wifidirect sync

Alexander Brakowski 9 years ago
parent
commit
ecdf710ab4

+ 10 - 1
AndroidManifest.xml

@@ -109,13 +109,22 @@
             android:exported="false" >
         </provider>
 
-        <activity
+        <!--<activity
             android:name=".sync.p2p.P2PSyncActivity"
             android:label="@string/title_activity_p2_psync"
             android:parentActivityName=".ui.activity.MainActivity" >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="de.tudarmstadt.informatik.hostage.ui.activity.MainActivity" />
+        </activity>-->
+
+        <activity
+            android:name=".sync.wifi_direct.ui.WiFiP2pSyncActivity"
+            android:label="@string/title_activity_p2_psync"
+            android:parentActivityName=".ui.activity.MainActivity" >
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="de.tudarmstadt.informatik.hostage.ui.activity.MainActivity" />
         </activity>
     </application>
 

+ 2 - 2
src/de/tudarmstadt/informatik/hostage/sync/p2p/P2PSyncActivity.java

@@ -88,9 +88,9 @@ public class P2PSyncActivity extends Activity implements WifiP2pManager.GroupInf
         //mTxtP2PHeader = (TextView) findViewById(R.id.txtP2PHeader);
         //mTxtP2PSubHeader = (TextView) findViewById(R.id.txtP2PSubheader);
         //mTxtP2PHelpBack = (TextView) findViewById(R.id.txtP2PHelpBack);
-        mViewAnimator = (ViewAnimator) findViewById(R.id.viewAnimator);
+        //mViewAnimator = (ViewAnimator) findViewById(R.id.viewAnimator);
         mDevicesContainer = (RelativeLayout) findViewById(R.id.devicesContainer);
-        mWelcomeContainer = (RelativeLayout) findViewById(R.id.welcomeContainer);
+        //mWelcomeContainer = (RelativeLayout) findViewById(R.id.welcomeContainer);
         mTxtP2PSearchProgress = (TextView) findViewById(R.id.txtP2PSearchProgress);
         mLstP2PDevices = (ListView) findViewById(R.id.lstP2PDevices);
         //mBtnP2PSearch = (Button) findViewById(R.id.btnP2PSearch);

+ 0 - 0
src/de/tudarmstadt/informatik/hostage/sync/wifi_direct/UI/WiFiP2pSyncActivity.java → src/de/tudarmstadt/informatik/hostage/sync/wifi_direct/ui/WiFiP2pSyncActivity.java


+ 2 - 4
src/de/tudarmstadt/informatik/hostage/ui/fragment/RecordOverviewFragment.java

@@ -44,14 +44,12 @@ import de.tudarmstadt.informatik.hostage.logging.MessageRecord;
 import de.tudarmstadt.informatik.hostage.logging.NetworkRecord;
 import de.tudarmstadt.informatik.hostage.logging.Record;
 import de.tudarmstadt.informatik.hostage.logging.SyncData;
-import de.tudarmstadt.informatik.hostage.logging.SyncDevice;
 import de.tudarmstadt.informatik.hostage.logging.SyncInfo;
 import de.tudarmstadt.informatik.hostage.persistence.HostageDBOpenHelper;
-import de.tudarmstadt.informatik.hostage.sync.Synchronizer;
 import de.tudarmstadt.informatik.hostage.sync.bluetooth.BluetoothSyncActivity;
 import de.tudarmstadt.informatik.hostage.sync.nfc.NFCSyncActivity;
-import de.tudarmstadt.informatik.hostage.sync.p2p.P2PSyncActivity;
 import de.tudarmstadt.informatik.hostage.sync.tracing.TracingSyncActivity;
+import de.tudarmstadt.informatik.hostage.sync.wifi_direct.ui.WiFiP2pSyncActivity;
 import de.tudarmstadt.informatik.hostage.ui.activity.MainActivity;
 import de.tudarmstadt.informatik.hostage.ui.adapter.RecordListAdapter;
 import de.tudarmstadt.informatik.hostage.ui.dialog.ChecklistDialog;
@@ -395,7 +393,7 @@ public class RecordOverviewFragment extends UpNavigatibleFragment implements Che
 								getActivity().startActivity(new Intent(getActivity(), TracingSyncActivity.class));
 								break;
                             case 3:
-                                getActivity().startActivity(new Intent(getActivity(), P2PSyncActivity.class));
+                                getActivity().startActivity(new Intent(getActivity(), WiFiP2pSyncActivity.class));
                                 break;
 						}
 					}