diff options
| author | nicolasroard <nicolasroard@google.com> | 2012-10-21 15:20:13 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-21 15:20:13 -0700 |
| commit | 173c6609ad041f63126847bec241145513348a94 (patch) | |
| tree | 6cf3c33eb21427b71df29f49b08bd7624707d270 | |
| parent | bde4fbd2270354122f610a5601cacebf493d8314 (diff) | |
| parent | c4e553b141580b919125de12266db1b7b2926fad (diff) | |
| download | android_packages_apps_Snap-173c6609ad041f63126847bec241145513348a94.tar.gz android_packages_apps_Snap-173c6609ad041f63126847bec241145513348a94.tar.bz2 android_packages_apps_Snap-173c6609ad041f63126847bec241145513348a94.zip | |
am 4d276f33: Only translate the main panel if we have to.
* commit '4d276f338bbdc53f8a3b4806265bc26c7fe0ea7c':
Only translate the main panel if we have to.
| -rw-r--r-- | res/layout/filtershow_activity.xml | 91 |
1 files changed, 46 insertions, 45 deletions
diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml index e07cb1cc7..9ccb75532 100644 --- a/res/layout/filtershow_activity.xml +++ b/res/layout/filtershow_activity.xml @@ -18,6 +18,7 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" + android:id="@+id/mainView" android:background="@color/background_screen" > <LinearLayout @@ -48,51 +49,6 @@ </LinearLayout> <LinearLayout - android:id="@+id/historyPanel" - android:layout_width="200dip" - android:layout_height="match_parent" - android:layout_gravity="right" - android:orientation="vertical" - android:visibility="invisible" > - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="@android:color/transparent" - android:gravity="center" - android:padding="2dip" - android:text="@string/history" - android:textColor="@android:color/white" - android:textSize="24sp" - android:textStyle="bold" /> - - <ListView - android:id="@+id/operationsList" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_weight="1" > - </ListView> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > - - <Button - android:id="@+id/resetOperationsButton" - style="@style/FilterShowHistoryButton" - android:gravity="center" - android:text="@string/reset" /> - - <Button - android:id="@+id/saveOperationsButton" - style="@style/FilterShowHistoryButton" - android:text="@string/save" - android:visibility="gone" /> - </LinearLayout> - </LinearLayout> - - <LinearLayout android:id="@+id/mainPanel" android:layout_width="match_parent" android:layout_height="match_parent" @@ -458,4 +414,49 @@ </com.android.gallery3d.filtershow.CenteredLinearLayout> </LinearLayout> + <LinearLayout + android:id="@+id/historyPanel" + android:layout_width="200dip" + android:layout_height="match_parent" + android:layout_gravity="right" + android:orientation="vertical" + android:visibility="invisible" > + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@android:color/transparent" + android:gravity="center" + android:padding="2dip" + android:text="@string/history" + android:textColor="@android:color/white" + android:textSize="24sp" + android:textStyle="bold" /> + + <ListView + android:id="@+id/operationsList" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" > + </ListView> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" > + + <Button + android:id="@+id/resetOperationsButton" + style="@style/FilterShowHistoryButton" + android:gravity="center" + android:text="@string/reset" /> + + <Button + android:id="@+id/saveOperationsButton" + style="@style/FilterShowHistoryButton" + android:text="@string/save" + android:visibility="gone" /> + </LinearLayout> + </LinearLayout> + </FrameLayout> |