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

Commit 63c23061 authored by Julian Mancini's avatar Julian Mancini Committed by android-build-merger
Browse files

Merge "Adding building blocks for UI" into arc-apps 

am: 26ce3ea0

Change-Id: I51656e404a23b17eab353541f27b7c7655b3bd3a
parents 68deb289 26ce3ea0

res/layout/document_inspector_fragment.xml

+2 −8
Original line number Diff line number Diff line
@@ -14,14 +14,8 @@ 
    See the License for the specific language governing permissions and

    limitations under the License.

-->

<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:orientation="vertical"

    android:layout_width="match_parent"

    android:layout_height="match_parent">



  <TextView

      android:id="@+id/hello_world"

      android:layout_width="wrap_content"

      android:layout_height="wrap_content"

      android:textSize="20dp" />

</FrameLayout>
 
</LinearLayout>

res/layout/document_inspector_segment.xml

0 → 100644
+19 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:orientation="horizontal"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:padding="20sp">

    <TextView

        android:id="@+id/data_title"

        android:layout_width="0dp"

        android:layout_weight="1"

        android:layout_height="wrap_content"

        android:textSize="14sp" />

    <TextView

        android:id="@+id/data_info"

        android:layout_width="0dp"

        android:layout_weight="3"

        android:layout_height="wrap_content"

        android:textSize="14sp" />

</LinearLayout>
 
 No newline at end of file

res/layout/inspector_header.xml

0 → 100644
+21 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent">

    <ImageView

        android:id="@+id/inspector_thumbnail"

        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:layout_weight="1"

        android:visibility="gone"/>

    <TextView

        android:id="@+id/inspector_file_title"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_alignLeft="@id/inspector_thumbnail"

        android:layout_alignTop="@id/inspector_thumbnail"

        android:layout_alignRight="@id/inspector_thumbnail"

        android:layout_alignBottom="@id/inspector_thumbnail"

        android:gravity="start">

    </TextView>

</RelativeLayout>
 
 No newline at end of file

res/layout/inspector_text.xml

0 → 100644
+20 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:orientation="horizontal"

    android:layout_width="match_parent"

    android:layout_height="match_parent">

    <TextView

        android:id="@+id/inspector_text_title"

        android:layout_height="wrap_content"

        android:layout_width="0dp"

        android:layout_weight="1"

        android:textColor="#000000">

    </TextView>

    <TextView

        android:id="@+id/inspector_text_info"

        android:layout_height="wrap_content"

        android:layout_width="0dp"

        android:layout_weight="1"

        android:textColor="#d3d3d3">

    </TextView>

</LinearLayout>
 
 No newline at end of file

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

+31 −26
Original line number Diff line number Diff line
@@ -20,8 +20,12 @@ import android.app.FragmentManager; 
import android.content.Intent;

import android.net.Uri;

import android.os.Bundle;

import android.view.MenuItem;

import android.view.Window;

import android.widget.Toolbar;



import com.android.documentsui.R;

import com.android.documentsui.files.FilesActivity;



public class DocumentInspectorActivity extends Activity {
@@ -30,11 +34,12 @@ public class DocumentInspectorActivity extends Activity { 
    @Override

    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);



        requestWindowFeature(Window.FEATURE_ACTION_BAR);

        setContentView(R.layout.document_inspector_activity);



        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);

        setActionBar(toolbar);

        getActionBar().setDisplayHomeAsUpEnabled(true);



        FragmentManager fragmentManager = getFragmentManager();

        mFragment = (DocumentInspectorFragment) fragmentManager.findFragmentById(