diff options
author | nicolasroard <nicolasroard@google.com> | 2013-09-06 17:21:55 -0700 |
---|---|---|
committer | nicolasroard <nicolasroard@google.com> | 2013-09-06 17:39:46 -0700 |
commit | 32cc4dd751569721aa19218b4d947145577060d0 (patch) | |
tree | 5f2a8a96cb1bb08a94e0ca8abbf1c03bffbe242a /res | |
parent | 98b296ffc50e11b7950acf1d0df850b617913131 (diff) | |
download | android_packages_apps_Gallery2-32cc4dd751569721aa19218b4d947145577060d0.tar.gz android_packages_apps_Gallery2-32cc4dd751569721aa19218b4d947145577060d0.tar.bz2 android_packages_apps_Gallery2-32cc4dd751569721aa19218b4d947145577060d0.zip |
Fix UI performances / glitches
- load/process thumbnails fully in background
- fix reveal slider
- fix race condition when loading
- better memory usage
- fix loading spinner (wasn't shown!)
Change-Id: Id78163556d8ee1c3ad04eae16fe1bf06f4312405
Diffstat (limited to 'res')
-rw-r--r-- | res/layout-land/filtershow_activity.xml | 102 | ||||
-rw-r--r-- | res/layout/filtershow_activity.xml | 73 | ||||
-rw-r--r-- | res/layout/filtershow_export_dialog.xml | 5 | ||||
-rw-r--r-- | res/values/dimens.xml | 1 |
4 files changed, 91 insertions, 90 deletions
diff --git a/res/layout-land/filtershow_activity.xml b/res/layout-land/filtershow_activity.xml index 72bbdeaf9..f4380126e 100644 --- a/res/layout-land/filtershow_activity.xml +++ b/res/layout-land/filtershow_activity.xml @@ -27,79 +27,79 @@ android:orientation="horizontal" android:animateLayoutChanges="true"> - <LinearLayout + + <FrameLayout android:layout_width="wrap_content" android:layout_height="match_parent" - android:layout_weight="1" - android:orientation="vertical" - > + android:layout_weight="1"> + + <ProgressBar + android:id="@+id/loading" + style="@android:style/Widget.Holo.ProgressBar.Large" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:indeterminate="true" + android:indeterminateOnly="true" + android:background="@null"/> <LinearLayout - android:layout_weight="1" android:layout_width="wrap_content" - android:layout_height="0dp" - android:orientation="horizontal"> + android:layout_height="match_parent" + android:layout_weight="1" + android:orientation="vertical" + > - <FrameLayout - android:id="@+id/central_panel_container" - android:layout_gravity="center" - android:layout_width="match_parent" - android:layout_height="wrap_content" + <LinearLayout android:layout_weight="1" - android:visibility="gone"/> + android:layout_width="wrap_content" + android:layout_height="0dp" + android:orientation="horizontal"> + + <FrameLayout + android:id="@+id/central_panel_container" + android:layout_gravity="center" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:visibility="gone"/> + + <FrameLayout + android:id="@+id/editorContainer" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1"/> + + <com.android.gallery3d.filtershow.imageshow.ImageShow + android:id="@+id/imageShow" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1"/> + + </LinearLayout> <FrameLayout - android:id="@+id/editorContainer" + android:id="@+id/state_panel_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_weight="1"/> - - <com.android.gallery3d.filtershow.imageshow.ImageShow - android:id="@+id/imageShow" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_weight="1"/> + android:visibility="visible"/> </LinearLayout> - <FrameLayout android:id="@+id/state_panel_container" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:visibility="visible"/> - - </LinearLayout> - + </FrameLayout> <LinearLayout android:id="@+id/mainPanel" android:layout_width="350dip" android:layout_height="match_parent" android:orientation="vertical" - android:animateLayoutChanges="true" > - - <FrameLayout android:id="@+id/main_panel_container" - android:layout_width="350dip" - android:layout_height="0dip" - android:layout_weight="1" /> + android:animateLayoutChanges="true"> <FrameLayout - android:layout_gravity="bottom" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:visibility="gone"> - - - <ProgressBar - android:id="@+id/loading" - style="@android:style/Widget.Holo.ProgressBar.Large" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:indeterminate="true" - android:indeterminateOnly="true" - android:background="@color/background_screen"/> - - </FrameLayout> + android:id="@+id/main_panel_container" + android:layout_width="350dip" + android:layout_height="0dip" + android:layout_weight="1"/> </LinearLayout> diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml index aabdb73e7..79c315b7b 100644 --- a/res/layout/filtershow_activity.xml +++ b/res/layout/filtershow_activity.xml @@ -26,33 +26,51 @@ android:layout_height="match_parent" android:orientation="vertical"> - <LinearLayout - android:layout_weight="1" + <FrameLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="horizontal"> + android:layout_weight="1"> - <FrameLayout - android:id="@+id/central_panel_container" - android:layout_gravity="center" - android:layout_width="match_parent" + <ProgressBar + android:id="@+id/loading" + style="@android:style/Widget.Holo.ProgressBar.Large" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_weight="1" - android:visibility="gone"/> + android:layout_gravity="center" + android:indeterminate="true" + android:indeterminateOnly="true" + android:background="@null"/> - <FrameLayout - android:id="@+id/editorContainer" + <LinearLayout + android:layout_weight="1" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_weight="1"/> + android:orientation="horizontal"> - <com.android.gallery3d.filtershow.imageshow.ImageShow - android:id="@+id/imageShow" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_weight="1" /> + <FrameLayout + android:id="@+id/central_panel_container" + android:layout_gravity="center" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:visibility="gone"/> - </LinearLayout> + <FrameLayout + android:id="@+id/editorContainer" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1"/> + + <com.android.gallery3d.filtershow.imageshow.ImageShow + android:id="@+id/imageShow" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1"/> + + + </LinearLayout> + + </FrameLayout> <com.android.gallery3d.filtershow.CenteredLinearLayout xmlns:custom="http://schemas.android.com/apk/res/com.android.gallery3d" @@ -69,25 +87,6 @@ android:layout_height="0dip" android:layout_weight="1" /> - <FrameLayout - android:layout_gravity="bottom" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:visibility="gone"> - - - <ProgressBar - android:id="@+id/loading" - style="@android:style/Widget.Holo.ProgressBar.Large" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:indeterminate="true" - android:indeterminateOnly="true" - android:background="@color/background_screen"/> - - </FrameLayout> - </com.android.gallery3d.filtershow.CenteredLinearLayout> </LinearLayout> diff --git a/res/layout/filtershow_export_dialog.xml b/res/layout/filtershow_export_dialog.xml index c7ce1e7c2..bfa302d79 100644 --- a/res/layout/filtershow_export_dialog.xml +++ b/res/layout/filtershow_export_dialog.xml @@ -73,8 +73,9 @@ android:layout_gravity="center" android:max="100" android:progress="100" - android:layout_width="400dp" - android:layout_columnSpan="3"/> + android:layout_width="wrap_content" + android:layout_columnSpan="3" + android:minWidth="250dp"/> <TextView android:id="@+id/qualityTextView" diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 692a87fbf..ef742d2b5 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -141,6 +141,7 @@ <dimen name="thumbnail_size">96dip</dimen> <dimen name="thumbnail_margin">3dip</dimen> <dimen name="action_item_height">175dip</dimen> + <dimen name="touch_circle_size">8dp</dimen> <!-- configuration for album set page --> <dimen name="album_set_item_image_height">120dp</dimen> |