Merge "fix draw issues on tablet" into gb-ub-photos-carlsbad (708569b4) · Commits · e / os / android_packages_apps_Gallery2

res/layout-land/filtershow_draw_ui.xml

0 → 100644

+202 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2013 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->

		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/top"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical"
		android:visibility="visible">

		<FrameLayout
		android:id="@+id/editorContainer"
		android:layout_width="match_parent"
		android:layout_height="0dp"
		android:layout_weight="6"
		android:layout_gravity="bottom">

		<LinearLayout
		android:id="@+id/controls"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_gravity="bottom"
		android:orientation="vertical"
		android:visibility="visible">

		<Button
		android:id="@+id/clearButton"
		android:layout_width="match_parent"
		android:layout_height="0dp"
		android:layout_weight="1"
		android:text="@string/draw_clear"/>

		<GridLayout
		android:layout_width="match_parent"
		android:layout_height="0dp"
		android:layout_weight="1"
		android:columnCount="2"
		android:orientation="horizontal">

		<TextView
		android:id="@+id/controlName1"
		android:layout_gravity="left"
		android:layout_marginLeft="8dip"
		android:text="@string/draw_size"/>

		<TextView
		android:id="@+id/drawSizeValue"
		android:layout_gravity="right"
		android:layout_marginRight="8dip"
		android:textStyle="bold"/>

		<SeekBar
		android:id="@+id/drawSizeSeekBar"
		android:layout_width="match_parent"
		android:layout_column="0"
		android:layout_columnSpan="2"
		android:layout_gravity="fill_horizontal"
		style="@style/FilterShowSlider"/>
		</GridLayout>

		<HorizontalScrollView
		android:id="@+id/scrollList"
		android:layout_width="match_parent"
		android:layout_height="0dp"
		android:layout_weight="1"
		android:scrollbars="none">

		<LinearLayout
		android:id="@+id/listStyles"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:orientation="horizontal">

		</LinearLayout>
		</HorizontalScrollView>

		</LinearLayout>

		<LinearLayout
		android:id="@+id/colorPicker"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical"
		android:visibility="gone">

		<TextView
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:text="@string/draw_color"
		android:layout_marginLeft="8dip"
		android:id="@+id/textView"/>

		<com.android.gallery3d.filtershow.colorpicker.ColorOpacityView
		android:id="@+id/colorOpacityView"
		android:layout_width="match_parent"
		android:layout_height="0dp"
		android:layout_weight="1"/>

		<com.android.gallery3d.filtershow.colorpicker.ColorSVRectView
		android:id="@+id/colorRectView"
		android:layout_width="match_parent"
		android:layout_height="0dp"
		android:layout_weight="4"
		android:layout_marginRight="1dp"/>

		<com.android.gallery3d.filtershow.colorpicker.ColorHueView
		android:id="@+id/ColorHueView"
		android:layout_width="match_parent"
		android:layout_height="0dp"
		android:layout_weight="1"/>

		</LinearLayout>
		</FrameLayout>

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		android:layout_marginBottom="10dp"
		android:layout_marginTop="10dp"
		android:layout_marginLeft="1dp"
		android:layout_marginRight="1dp">

		<HorizontalScrollView
		android:id="@+id/scrollList"
		android:layout_width="0dp"
		android:layout_weight="5"
		android:layout_height="match_parent"
		android:scrollbars="none">

		<LinearLayout
		android:id="@+id/listColors"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:orientation="horizontal">

		<Button
		android:id="@+id/draw_color_button01"
		android:layout_width="0dip"
		android:layout_height="wrap_content"
		android:layout_weight="1"
		android:background="@drawable/filtershow_color_picker_circle"
		android:layout_margin="2dp"/>

		<Button
		android:id="@+id/draw_color_button02"
		android:layout_width="0dip"
		android:layout_height="wrap_content"
		android:layout_weight="1"
		android:background="@drawable/filtershow_color_picker_circle"
		android:layout_margin="2dp"/>

		<Button
		android:id="@+id/draw_color_button03"
		android:layout_width="0dip"
		android:layout_height="wrap_content"
		android:layout_weight="1"
		android:background="@drawable/filtershow_color_picker_circle"
		android:layout_margin="2dp"/>

		<Button
		android:id="@+id/draw_color_button04"
		android:layout_width="0dip"
		android:layout_height="wrap_content"
		android:layout_weight="1"
		android:background="@drawable/filtershow_color_picker_circle"
		android:layout_margin="2dp"/>

		<Button
		android:id="@+id/draw_color_button05"
		android:layout_width="0dip"
		android:layout_height="wrap_content"
		android:layout_weight="1"
		android:background="@drawable/filtershow_color_picker_circle"
		android:layout_margin="2dp"/>

		</LinearLayout>
		</HorizontalScrollView>

		<Button
		android:id="@+id/draw_color_popupbutton"
		android:layout_width="0dp"
		android:layout_height="match_parent"
		android:layout_weight="1"
		android:background="@android:drawable/ic_menu_more"
		android:layout_margin="1dp"/>
		</LinearLayout>
		</LinearLayout>

res/values/filtershow_values.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -51,4 +51,7 @@
		<!-- Grad filter minimum touch distance -->
		<dimen name="draw_rect_round">10dip</dimen>

		<!-- Grad filter minimum touch distance -->
		<dimen name="draw_style_icon_dim">64dip</dimen>

		</resources>
		No newline at end of file

src/com/android/gallery3d/filtershow/colorpicker/ColorHueView.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -178,8 +178,8 @@ public class ColorHueView extends View implements ColorListener {

		mRect.left = mBorder;
		mRect.right = mWidth - mBorder;
		mRect.top = mBorder;
		mRect.bottom = mHeight - mBorder;
		mRect.top = 0;
		mRect.bottom = mHeight;
		canvas.drawRect(mRect,mCheckPaint);
		canvas.drawBitmap(mBitmap, null, mRect, mPaint);

src/com/android/gallery3d/filtershow/colorpicker/ColorOpacityView.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -163,8 +163,8 @@ public class ColorOpacityView extends View implements ColorListener {
		protected void onDraw(Canvas canvas) {
		super.onDraw(canvas);
		canvas.drawColor(mBgcolor);
		canvas.drawRect(mBorder, mBorder, mWidth - mBorder, mHeight - mBorder, mCheckPaint);
		canvas.drawRect(mBorder, mBorder, mWidth - mBorder, mHeight - mBorder, mBarPaint1);
		canvas.drawRect(mBorder, 0, mWidth - mBorder, mHeight, mCheckPaint);
		canvas.drawRect(mBorder, 0, mWidth - mBorder, mHeight, mBarPaint1);
		canvas.drawLine(mDotX, mDotY, mWidth - mBorder, mDotY, mLinePaint1);
		canvas.drawLine(mBorder, mDotY, mDotX, mDotY, mLinePaint2);
		if (mDotX != Float.NaN) {

src/com/android/gallery3d/filtershow/controller/StyleChooser.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -2,6 +2,7 @@ package com.android.gallery3d.filtershow.controller;

		import android.app.ActionBar.LayoutParams;
		import android.content.Context;
		import android.content.res.Resources;
		import android.graphics.Bitmap;
		import android.view.LayoutInflater;
		import android.view.View;
		@@ -39,7 +40,9 @@ public class StyleChooser implements Control {
		mTopView.setVisibility(View.VISIBLE);
		int n = mParameter.getNumberOfStyles();
		mIconButton.clear();
		LayoutParams lp = new LayoutParams(120, 120);
		Resources res = context.getResources();
		int dim = res.getDimensionPixelSize(R.dimen.draw_style_icon_dim);
		LayoutParams lp = new LayoutParams(dim, dim);
		for (int i = 0; i < n; i++) {
		final ImageButton button = new ImageButton(context);
		button.setScaleType(ScaleType.CENTER_CROP);