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

Commit ef5a0a55 authored by Austin Kolander's avatar Austin Kolander
Browse files

Encapsulate fragment in activity 

Change-Id: I8daccb95fb49a99d933f5838006e6841c3365296
parent fbf68586

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 
        <activity

            android:enabled="@bool/feature_inspector"

            android:name=".inspector.DocumentInspectorActivity"

            android:label="Properties"

            android:label="@string/menu_inspector"

            android:icon="@drawable/launcher_icon"

            android:theme="@style/DocumentsTheme">

        </activity>

res/layout/document_inspector_activity.xml

+3 −4
Original line number Diff line number Diff line
@@ -30,11 +30,10 @@ 
        android:popupTheme="?actionBarPopupTheme">

    </Toolbar>



    <fragment

        android:name="com.android.documentsui.inspector.DocumentInspectorFragment"

        android:id="@+id/properties_fragment"

    <FrameLayout

        android:id="@+id/fragment_container"

        android:layout_width="match_parent"

        android:layout_height="match_parent">

    </fragment>

    </FrameLayout>



</LinearLayout>

src/com/android/documentsui/inspector/DocumentInspectorActivity.java

+13 −1
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ package com.android.documentsui.inspector; 


import android.app.Activity;

import android.app.FragmentManager;

import android.content.Intent;

import android.net.Uri;

import android.os.Bundle;

import android.widget.Toolbar;

import com.android.documentsui.R;
@@ -36,6 +38,16 @@ public class DocumentInspectorActivity extends Activity { 


      FragmentManager fragmentManager = getFragmentManager();

      mFragment = (DocumentInspectorFragment) fragmentManager.findFragmentById(

          R.id.properties_fragment);

          R.id.fragment_container);



      if (mFragment == null) {

          Intent intent = getIntent();

          Uri docUri = intent.getData();



          mFragment = DocumentInspectorFragment.newInstance(docUri);

          fragmentManager.beginTransaction()

                  .add(R.id.fragment_container, mFragment)

                  .commit();

       }

  }

}
 
 No newline at end of file

src/com/android/documentsui/inspector/DocumentInspectorFragment.java

+21 −5
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
package com.android.documentsui.inspector;



import android.app.Fragment;

import android.net.Uri;

import android.os.Bundle;

import android.view.LayoutInflater;

import android.view.View;
@@ -24,9 +25,24 @@ import com.android.documentsui.R; 


public class DocumentInspectorFragment extends Fragment {



  private static final String DOC_URI_ARG = "docUri";

  private Uri docUri;



  @Override

  public View onCreateView(LayoutInflater inflater, ViewGroup container,

      Bundle savedInstanceState) {



      Bundle args = getArguments();

      docUri = (Uri) args.get(DOC_URI_ARG);



      return inflater.inflate(R.layout.document_inspector_fragment, container, false);

  }



  public static DocumentInspectorFragment newInstance(Uri uri) {

    Bundle args = new Bundle();

    args.putParcelable(DOC_URI_ARG, uri);

    DocumentInspectorFragment fragment = new DocumentInspectorFragment();

    fragment.setArguments(args);

    return fragment;

  }

}