merge in klp-release history after reset to klp-dev
diff --git a/res/mipmap-hdpi/ic_launcher_camera.png b/res/mipmap-hdpi/ic_launcher_camera.png
index 7b9d090..8781ace 100644
--- a/res/mipmap-hdpi/ic_launcher_camera.png
+++ b/res/mipmap-hdpi/ic_launcher_camera.png
Binary files differ
diff --git a/res/mipmap-mdpi/ic_launcher_camera.png b/res/mipmap-mdpi/ic_launcher_camera.png
index 9d24f4e..963728d 100644
--- a/res/mipmap-mdpi/ic_launcher_camera.png
+++ b/res/mipmap-mdpi/ic_launcher_camera.png
Binary files differ
diff --git a/res/mipmap-xhdpi/ic_launcher_camera.png b/res/mipmap-xhdpi/ic_launcher_camera.png
index 824161a..01f550d 100644
--- a/res/mipmap-xhdpi/ic_launcher_camera.png
+++ b/res/mipmap-xhdpi/ic_launcher_camera.png
Binary files differ
diff --git a/res/mipmap-xxhdpi/ic_launcher_camera.png b/res/mipmap-xxhdpi/ic_launcher_camera.png
index 1e09a6b..4cc2e72 100644
--- a/res/mipmap-xxhdpi/ic_launcher_camera.png
+++ b/res/mipmap-xxhdpi/ic_launcher_camera.png
Binary files differ
diff --git a/res/mipmap-xxxhdpi/ic_launcher_camera.png b/res/mipmap-xxxhdpi/ic_launcher_camera.png
new file mode 100644
index 0000000..25d4c47
--- /dev/null
+++ b/res/mipmap-xxxhdpi/ic_launcher_camera.png
Binary files differ
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java
index 3359888..915fdab 100644
--- a/src/com/android/gallery3d/app/PhotoPage.java
+++ b/src/com/android/gallery3d/app/PhotoPage.java
@@ -862,6 +862,7 @@
@Override
protected void onBackPressed() {
+ showBars();
if (mShowDetails) {
hideDetails();
} else if (mAppBridge == null || !switchWithCaptureAnimation(-1)) {
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index 3807e1d..e627a61 100644
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -296,7 +296,7 @@
MainPanel panel = new MainPanel();
FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
transaction.replace(R.id.main_panel_container, panel, MainPanel.FRAGMENT_TAG);
- transaction.commit();
+ transaction.commitAllowingStateLoss();
}
public void loadEditorPanel(FilterRepresentation representation,
diff --git a/src/com/android/gallery3d/filtershow/category/MainPanel.java b/src/com/android/gallery3d/filtershow/category/MainPanel.java
index 81e52c7..eb1ce2b 100644
--- a/src/com/android/gallery3d/filtershow/category/MainPanel.java
+++ b/src/com/android/gallery3d/filtershow/category/MainPanel.java
@@ -143,7 +143,7 @@
transaction.setCustomAnimations(R.anim.slide_in_left, R.anim.slide_out_left);
}
transaction.replace(R.id.category_panel_container, category, CategoryPanel.FRAGMENT_TAG);
- transaction.commit();
+ transaction.commitAllowingStateLoss();
}
public void loadCategoryLookPanel(boolean force) {
