diff options
| author | Nicolas Roard <nicolasroard@google.com> | 2012-10-17 09:32:40 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-17 09:32:40 -0700 |
| commit | 34c807c8d89f9bfa9565ab52746d845acfb714fd (patch) | |
| tree | a79c2b2aea1e538c5a428390b7ac0251d3ceec37 /res | |
| parent | 178a1c115552a22526fb3a263a01c3cc66300328 (diff) | |
| parent | 0f7dc6ef6e736c0993240450b50b91721c79c43e (diff) | |
| download | android_packages_apps_Gallery2-34c807c8d89f9bfa9565ab52746d845acfb714fd.tar.gz android_packages_apps_Gallery2-34c807c8d89f9bfa9565ab52746d845acfb714fd.tar.bz2 android_packages_apps_Gallery2-34c807c8d89f9bfa9565ab52746d845acfb714fd.zip | |
Merge "Added fixed aspect ratio support for cropping." into gb-ub-photos-arches
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/filtershow_activity.xml | 9 | ||||
| -rw-r--r-- | res/values/filtershow_strings.xml | 14 |
2 files changed, 23 insertions, 0 deletions
diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml index 885521104..8a51d89ff 100644 --- a/res/layout/filtershow_activity.xml +++ b/res/layout/filtershow_activity.xml @@ -192,6 +192,15 @@ android:orientation="horizontal" android:visibility="gone" > + <com.android.gallery3d.filtershow.ui.ImageButtonTitle + android:id="@+id/aspect" + style="@style/FilterShowBottomButton" + android:layout_gravity="left" + android:layout_weight="0" + android:visibility="gone" + android:src="@drawable/filtershow_button_geometry_straighten" + android:text="@string/aspectNone_effect" /> + <ImageButton android:id="@+id/pickCurvesChannel" android:layout_width="64dip" diff --git a/res/values/filtershow_strings.xml b/res/values/filtershow_strings.xml index 51ff00ec2..b4ff85f57 100644 --- a/res/values/filtershow_strings.xml +++ b/res/values/filtershow_strings.xml @@ -63,6 +63,20 @@ <string name="apply_effect">Apply</string> <!-- Label for the reset effect button [CHAR LIMIT=15] --> <string name="reset_effect">Reset</string> + <!-- Label for the aspect 1:1 effect button [CHAR LIMIT=15] --> + <string name="aspect">Aspect</string> + <!-- Label for the aspect 1:1 effect button [CHAR LIMIT=15] --> + <string name="aspect1to1_effect">1:1</string> + <!-- Label for the aspect 4:7 effect button [CHAR LIMIT=15] --> + <string name="aspect4to6_effect">4:6</string> + <!-- Label for the aspect 1:1 effect button [CHAR LIMIT=15] --> + <string name="aspect5to7_effect">5:7</string> + <!-- Label for the aspect 1:1 effect button [CHAR LIMIT=15] --> + <string name="aspect9to16_effect">16:9</string> + <!-- Label for the aspect None effect button [CHAR LIMIT=15] --> + <string name="aspectNone_effect">None</string> + <!-- Label for the aspect None effect button [CHAR LIMIT=15] --> + <string name="aspectOriginal_effect">Original</string> <!-- Filters buttons --> |