diff options
author | nicolasroard <nicolasroard@google.com> | 2013-04-25 08:47:11 -0700 |
---|---|---|
committer | nicolasroard <nicolasroard@google.com> | 2013-04-25 08:54:51 -0700 |
commit | c7b38f384ce7d4dd8cc472c802d691e490c8e162 (patch) | |
tree | 6783f1dc65626a9a4ad1ab19de559eabb1be1238 /res/layout-land/filtershow_state_panel_new.xml | |
parent | 261a2e3d16c138448135bac3947481c3a4593bc1 (diff) | |
parent | 6cc7a476fd56f758e287b7c46092371aa281c0ec (diff) | |
download | android_packages_apps_Gallery2-c7b38f384ce7d4dd8cc472c802d691e490c8e162.tar.gz android_packages_apps_Gallery2-c7b38f384ce7d4dd8cc472c802d691e490c8e162.tar.bz2 android_packages_apps_Gallery2-c7b38f384ce7d4dd8cc472c802d691e490c8e162.zip |
resolved conflicts for merge of 6cc7a476 to gb-ub-photos-carlsbad
Change-Id: Ide133370403bbcc6a509aa9f064ee8da38abac25
Diffstat (limited to 'res/layout-land/filtershow_state_panel_new.xml')
-rw-r--r-- | res/layout-land/filtershow_state_panel_new.xml | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/res/layout-land/filtershow_state_panel_new.xml b/res/layout-land/filtershow_state_panel_new.xml new file mode 100644 index 000000000..c83cd8833 --- /dev/null +++ b/res/layout-land/filtershow_state_panel_new.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:custom="http://schemas.android.com/apk/res/com.android.gallery3d" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <ScrollView + android:layout_width="match_parent" + android:layout_height="0dip" + android:layout_weight="1" + android:scrollbars="none"> + + <com.android.gallery3d.filtershow.state.StatePanelTrack + android:id="@+id/listStates" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent" + custom:elemSize="72dip" + custom:elemEndSize="32dip" + android:layout_margin="8dip" + android:animateLayoutChanges="true" /> + + </ScrollView> + + <View + android:background="@color/state_panel_separation_line" + android:layout_height="6dip" + android:layout_width="match_parent" + android:paddingTop="8dip"/> + +</LinearLayout> |