summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--res/layout/action_mode.xml11
-rw-r--r--res/layout/filtershow_activity.xml4
-rw-r--r--res/layout/filtershow_bottom_panel.xml2
-rw-r--r--res/layout/filtershow_main_panel.xml2
-rw-r--r--res/layout/photopage_bottom_controls.xml2
-rw-r--r--res/values-zh-rCN/filtershow_strings.xml2
-rw-r--r--res/values/colors.xml6
-rw-r--r--res/values/dimens.xml3
-rw-r--r--res/values/filtershow_color.xml2
-rw-r--r--res/values/filtershow_values.xml7
-rw-r--r--src/com/android/gallery3d/app/AlbumPage.java12
-rw-r--r--src/com/android/gallery3d/app/GalleryActionBar.java7
-rw-r--r--src/com/android/gallery3d/ui/AbstractSlotRenderer.java2
-rw-r--r--src/com/android/gallery3d/ui/PhotoView.java5
-rwxr-xr-xsrc/com/android/gallery3d/ui/TimeLineTitleMaker.java6
15 files changed, 42 insertions, 31 deletions
diff --git a/res/layout/action_mode.xml b/res/layout/action_mode.xml
index f941b6427..ec4704d92 100644
--- a/res/layout/action_mode.xml
+++ b/res/layout/action_mode.xml
@@ -35,15 +35,10 @@
android:textColor="#8A000000"
android:textSize="20sp"
android:singleLine="true"
- android:gravity="left|center_vertical"
- android:paddingEnd="25dip"
+ android:gravity="start|center_vertical"
+ android:paddingEnd="15dip"
+ android:paddingStart="0dp"
android:layout_width="wrap_content"
android:layout_height="match_parent" />
</FrameLayout>
- <ImageView android:layout_marginStart="16dip"
- android:layout_marginEnd="8dip"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:gravity="bottom"
- android:src="@drawable/cab_divider_vertical_dark" />
</LinearLayout>
diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml
index 56666ece3..87adf730b 100644
--- a/res/layout/filtershow_activity.xml
+++ b/res/layout/filtershow_activity.xml
@@ -51,8 +51,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
- android:layout_marginRight="10dp"
- android:layout_marginTop="104dp"
+ android:layout_marginRight="@dimen/compare_margin_right"
+ android:layout_marginTop="@dimen/compare_margin_top"
android:background="@android:color/transparent"
android:src="@drawable/comparison_before"
android:visibility="visible" />
diff --git a/res/layout/filtershow_bottom_panel.xml b/res/layout/filtershow_bottom_panel.xml
index abefcba39..80efe1a08 100644
--- a/res/layout/filtershow_bottom_panel.xml
+++ b/res/layout/filtershow_bottom_panel.xml
@@ -31,7 +31,7 @@
<com.android.gallery3d.filtershow.CenteredLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/bottom_panel"
android:layout_width="match_parent"
- android:layout_height="48dip"
+ android:layout_height="match_parent"
android:layout_gravity="center|bottom"
android:background="@color/bottom_panel_background_color"
android:orientation="vertical">
diff --git a/res/layout/filtershow_main_panel.xml b/res/layout/filtershow_main_panel.xml
index b9b18a036..5b0510a1c 100644
--- a/res/layout/filtershow_main_panel.xml
+++ b/res/layout/filtershow_main_panel.xml
@@ -47,7 +47,7 @@
<FrameLayout
android:id="@+id/bottom_panel_container"
android:layout_width="match_parent"
- android:layout_height="48dip"
+ android:layout_height="@dimen/bottom_panel_height"
android:visibility="visible"
android:layout_gravity="center"/>
</LinearLayout>
diff --git a/res/layout/photopage_bottom_controls.xml b/res/layout/photopage_bottom_controls.xml
index 3f19af150..f52a704a7 100644
--- a/res/layout/photopage_bottom_controls.xml
+++ b/res/layout/photopage_bottom_controls.xml
@@ -5,7 +5,7 @@
android:layout_height="56dp"
android:layout_alignParentBottom="true"
android:layout_gravity="bottom"
- android:background="#42000000"
+ android:background="@color/photo_page_bottom_panel"
android:gravity="bottom"
android:orientation="horizontal"
android:visibility="gone" >
diff --git a/res/values-zh-rCN/filtershow_strings.xml b/res/values-zh-rCN/filtershow_strings.xml
index 62001b1c7..0b624759c 100644
--- a/res/values-zh-rCN/filtershow_strings.xml
+++ b/res/values-zh-rCN/filtershow_strings.xml
@@ -38,7 +38,7 @@
<string name="size" msgid="4639404642236356037">"大小"</string>
<string name="x" msgid="6810256999024563662">"x"</string>
<string name="menu_settings" msgid="6428291655769260831">"设置"</string>
- <string name="unsaved" msgid="8704442449002374375">"是否放弃当前图片的操作？"</string>
+ <string name="unsaved" msgid="8704442449002374375">"是否放弃对当前图片的操作？"</string>
<string name="save_before_exit" msgid="2680660633675916712">"放弃更改？"</string>
<string name="save_and_exit" msgid="3628425023766687419">"保存并退出"</string>
<string name="discard">"放弃"</string>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 9fd91923f..6c4a79178 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -32,6 +32,8 @@
<!-- configuration for photo page -->
<color name="photo_background">#1A1A1A</color>
<color name="photo_placeholder">#333</color>
+ <color name="photo_page_action_bar">#8A000000</color>
+ <color name="photo_page_bottom_panel">#8A000000</color>
<!-- configuration for manage cache page -->
<color name="cache_background">#1A1A1A</color>
@@ -81,7 +83,7 @@
<color name="edit_background">#212121</color>
<color name="edit_actionbar_background">#8A000000</color>
<color name="dialog_button_color">#009688</color>
- <color name="timeline_title_text_color">#26000000</color>
- <color name="timeline_title_number_text_color">#1a000000</color>
+ <color name="timeline_title_text_color">#8A000000</color>
+ <color name="timeline_title_number_text_color">#42000000</color>
<color name="timeline_title_background_color">#fafafa</color>
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 807861102..14d619c14 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -157,6 +157,8 @@
<dimen name="album_padding_left_land">3dp</dimen>
<dimen name="album_padding_right_land">3dp</dimen>
+ <dimen name="photo_view_video_icon_size">48dp</dimen>
+
<!-- configuration for manage page -->
<dimen name="cache_pin_size">24dp</dimen>
<dimen name="cache_pin_margin">8dp</dimen>
@@ -213,6 +215,7 @@
<dimen name="timeline_port_margin">3dp</dimen>
<dimen name="timeline_title_height">48dp</dimen>
<dimen name="timeline_title_font_size">14sp</dimen>
+ <dimen name="timeline_title_margin">16dp</dimen>
<dimen name="timebar_height">60dp</dimen>
<dimen name="timebar_margin">30dp</dimen>
diff --git a/res/values/filtershow_color.xml b/res/values/filtershow_color.xml
index d6a09a9cf..70a1e7336 100644
--- a/res/values/filtershow_color.xml
+++ b/res/values/filtershow_color.xml
@@ -52,7 +52,7 @@
<color name="filtershow_image_mask">#4d000000</color>
<color name="filtershow_info_text">#DE000000</color>
- <color name="filtershow_color_none">#b5b5b5</color>
+ <color name="filtershow_color_none">#5c5c5c</color>
<color name="filtershow_color_punch">#c6bcc6</color>
<color name="filtershow_color_vintage">#bb9e61</color>
<color name="filtershow_color_bw">#000000</color>
diff --git a/res/values/filtershow_values.xml b/res/values/filtershow_values.xml
index c15df9465..046c5440a 100644
--- a/res/values/filtershow_values.xml
+++ b/res/values/filtershow_values.xml
@@ -21,6 +21,9 @@
<!-- Text size for the state panel -->
<dimen name="state_panel_text_size">16dip</dimen>
+ <!-- Bottom Panel Height -->
+ <dimen name="bottom_panel_height">60dip</dimen>
+
<!-- Category Panel Height -->
<dimen name="category_panel_height">90dip</dimen>
@@ -35,7 +38,7 @@
<!-- Category Panel Text Size -->
<dimen name="category_panel_margin">10dip</dimen>
- <!-- Category Panel height of botton rect -->
+ <!-- Category Panel height of bottom rect -->
<dimen name="category_panel_bottom_rect_height">20dip</dimen>
<!-- Grad filter dot size -->
@@ -72,7 +75,7 @@
<dimen name="edge_glow_size">50dip</dimen>
<dimen name="swap_button_width">168dp</dimen>
<dimen name="swap_button_height">32dp</dimen>
- <dimen name="compare_margin_top">104dp</dimen>
+ <dimen name="compare_margin_top">74dp</dimen>
<dimen name="compare_margin_right">10dp</dimen>
<dimen name="compare_margin_top_scaled">96dp</dimen>
<dimen name="compare_margin_right_scaled">60dp</dimen>
diff --git a/src/com/android/gallery3d/app/AlbumPage.java b/src/com/android/gallery3d/app/AlbumPage.java
index 4d2e291c1..3ceb7a09a 100644
--- a/src/com/android/gallery3d/app/AlbumPage.java
+++ b/src/com/android/gallery3d/app/AlbumPage.java
@@ -657,6 +657,7 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster
menu.findItem(R.id.action_sync_picasa_albums).setVisible(mIsVideoScreen);
MenuItem item = menu.findItem(R.id.action_view_type);
updateMenuTitle(item);
+ updateMenuTitle(menu.findItem(R.id.action_select));
}
//actionBar.setSubtitle(null);
@@ -920,10 +921,13 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster
}
}
- public void updateMenuTitle(MenuItem item) {
-
- item.setTitle(mViewType ? R.string.action_viewtype_list
- : R.string.action_viewtype_grid);
+ public void updateMenuTitle(MenuItem item) {
+ if (item.getItemId() == R.id.action_view_type) {
+ item.setTitle(mViewType ? R.string.action_viewtype_list
+ : R.string.action_viewtype_grid);
+ } else if (item.getItemId() == R.id.action_select) {
+ item.setTitle(mIsVideoScreen ? R.string.select_video : R.string.select_item);
+ }
}
private void switchView() {
diff --git a/src/com/android/gallery3d/app/GalleryActionBar.java b/src/com/android/gallery3d/app/GalleryActionBar.java
index 71bb6381a..ebec5731b 100644
--- a/src/com/android/gallery3d/app/GalleryActionBar.java
+++ b/src/com/android/gallery3d/app/GalleryActionBar.java
@@ -451,10 +451,9 @@ public class GalleryActionBar {
}
}
- public void setBackGroundTransparent()
- {
- mActionBar.setBackgroundDrawable(new ColorDrawable(Color.argb(66, 0, 0, 0)));
-
+ public void setBackGroundTransparent() {
+ mActionBar.setBackgroundDrawable(
+ new ColorDrawable(mContext.getResources().getColor(R.color.photo_page_action_bar)));
}
public void setBackGroundDefault()
diff --git a/src/com/android/gallery3d/ui/AbstractSlotRenderer.java b/src/com/android/gallery3d/ui/AbstractSlotRenderer.java
index f5a08097d..0807814a3 100644
--- a/src/com/android/gallery3d/ui/AbstractSlotRenderer.java
+++ b/src/com/android/gallery3d/ui/AbstractSlotRenderer.java
@@ -131,7 +131,7 @@ public abstract class AbstractSlotRenderer implements SlotView.SlotRenderer {
}
protected void drawSelectedFrame(GLCanvas canvas, int width, int height) {
- mSelectionIcon.draw(canvas,15,15);
+ mSelectionIcon.draw(canvas, 5, 5);
//drawFrame(canvas, mFrameSelected.getPaddings(), mFrameSelected, 0, 0, width, height);
}
diff --git a/src/com/android/gallery3d/ui/PhotoView.java b/src/com/android/gallery3d/ui/PhotoView.java
index 228229006..5c9992401 100644
--- a/src/com/android/gallery3d/ui/PhotoView.java
+++ b/src/com/android/gallery3d/ui/PhotoView.java
@@ -205,6 +205,7 @@ public class PhotoView extends GLView {
private UndoBarView mUndoBar;
private Texture mVideoPlayIcon;
private Texture mDrmIcon;
+ private int mVideoPlayIconSize = 0;
private SynchronizedHandler mHandler;
@@ -308,6 +309,8 @@ public class PhotoView extends GLView {
}
});
mVideoPlayIcon = new ResourceTexture(mContext, R.drawable.play_detail);
+ mVideoPlayIconSize = mContext.getResources().getDimensionPixelSize(
+ R.dimen.photo_view_video_icon_size);
mDrmIcon = new ResourceTexture(mContext, R.drawable.drm_image);
for (int i = -SCREEN_NAIL_MAX; i <= SCREEN_NAIL_MAX; i++) {
if (i == 0) {
@@ -942,7 +945,7 @@ public class PhotoView extends GLView {
// Draw the video play icon (in the place where the spinner was)
private void drawVideoPlayIcon(GLCanvas canvas, int side) {
- int s = side / ICON_RATIO;
+ int s = mVideoPlayIconSize;
// Draw the video play icon at the center
mVideoPlayIcon.draw(canvas, -s / 2, -s / 2, s, s);
}
diff --git a/src/com/android/gallery3d/ui/TimeLineTitleMaker.java b/src/com/android/gallery3d/ui/TimeLineTitleMaker.java
index 2b368753a..7a2c9e050 100755
--- a/src/com/android/gallery3d/ui/TimeLineTitleMaker.java
+++ b/src/com/android/gallery3d/ui/TimeLineTitleMaker.java
@@ -48,7 +48,7 @@ public class TimeLineTitleMaker {
private final Context mContext;
private final TimeLineSlotView mTimeLineSlotView;
- private final int TIMELINETITLE_START_X = 16;
+ private final int TIMELINETITLE_START_X;
public TimeLineTitleMaker(Context context, TimeLineSlotRenderer.LabelSpec spec, TimeLineSlotView slotView) {
mContext = context;
@@ -56,6 +56,8 @@ public class TimeLineTitleMaker {
mTimeLineSlotView = slotView;
mTitlePaint = getTextPaint(spec.timeLineTitleFontSize, spec.timeLineTitleTextColor , true);
mCountPaint = getTextPaint(spec.timeLineTitleFontSize, spec.timeLineNumberTextColor, true);
+ TIMELINETITLE_START_X = context.getResources().getDimensionPixelSize(
+ R.dimen.timeline_title_margin);
}
private static TextPaint getTextPaint(
@@ -164,7 +166,7 @@ public class TimeLineTitleMaker {
countString, 0, countString.length(), mediaCountBounds);
int w = mediaCountBounds.width();
y = (height - spec.timeLineTitleFontSize)/2;
- x = width - countString.length() -w;
+ x = width - TIMELINETITLE_START_X - w;
// re-calculate x for RTL
if (View.LAYOUT_DIRECTION_RTL == TextUtils
.getLayoutDirectionFromLocale(Locale.getDefault())) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 19:19:34 +0000