<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
</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"
</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>
}
}
+ private int translateMainPanel(View viewPanel) {
+ int accessoryPanelWidth = viewPanel.getWidth();
+ int mainViewWidth = findViewById(R.id.mainView).getWidth();
+ int mainPanelWidth = mImageShow.getDisplayedImageBounds().width();
+ int leftOver = mainViewWidth - mainPanelWidth - accessoryPanelWidth;
+ if (leftOver < 0) {
+ return -accessoryPanelWidth;
+ }
+ return 0;
+ }
+
private int getScreenImageSize() {
DisplayMetrics metrics = new DisplayMetrics();
Display display = getWindowManager().getDefaultDisplay();
mShowingHistoryPanel = false;
}
+ int translate = translateMainPanel(viewList);
if (!mShowingImageStatePanel) {
mShowingImageStatePanel = true;
- view.animate().setDuration(200).x(-viewList.getWidth())
+ view.animate().setDuration(200).x(translate)
.withLayer().withEndAction(new Runnable() {
@Override
public void run() {
mShowingImageStatePanel = false;
}
+ int translate = translateMainPanel(viewList);
if (!mShowingHistoryPanel) {
mShowingHistoryPanel = true;
- view.animate().setDuration(200).x(-viewList.getWidth())
+ view.animate().setDuration(200).x(translate)
.withLayer().withEndAction(new Runnable() {
@Override
public void run() {