diff options
author | Chris Warrington <cmw@google.com> | 2016-10-18 12:29:21 +0100 |
---|---|---|
committer | Chris Warrington <cmw@google.com> | 2016-10-18 12:34:18 +0100 |
commit | e3780081075c01aa1dff6d1f373cb43192b33e68 (patch) | |
tree | fb734615933a39f3d009210dc0d1457160479b35 /WordPress/src/main/res/layout/media_browser_activity.xml | |
parent | 7e05eb7e57827eddc885570bc00aed8a50320dbf (diff) | |
parent | 025b8b226c8d8edba2b309ca878572f40512eca7 (diff) | |
download | gradle-perf-android-medium-e3780081075c01aa1dff6d1f373cb43192b33e68.tar.gz |
Merge remote-tracking branch 'origin/upstream-master' into masterHEADstudio-3.4.0studio-3.2.1studio-3.1.2studio-3.0studio-2.3gradle_3.4.0gradle_3.1.2gradle_3.0.0gradle_2.3.0studio-master-devmirror-goog-studio-master-devmastermain
Change-Id: I63f5e16d09297c48432192761b840310935eb903
Diffstat (limited to 'WordPress/src/main/res/layout/media_browser_activity.xml')
-rw-r--r-- | WordPress/src/main/res/layout/media_browser_activity.xml | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/WordPress/src/main/res/layout/media_browser_activity.xml b/WordPress/src/main/res/layout/media_browser_activity.xml new file mode 100644 index 000000000..60475f259 --- /dev/null +++ b/WordPress/src/main/res/layout/media_browser_activity.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <include + layout="@layout/toolbar" + android:id="@+id/toolbar" /> + + <LinearLayout + android:id="@+id/media_browser_container" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <fragment + android:id="@+id/mediaGridFragment" + android:name="org.wordpress.android.ui.media.MediaGridFragment" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + + <fragment + android:id="@+id/mediaAddFragment" + android:name="org.wordpress.android.ui.media.MediaAddFragment" + android:layout_width="0dp" + android:layout_height="0dp" /> + </LinearLayout> + +</LinearLayout> |