diff options
author | John Hoford <hoford@google.com> | 2013-04-24 20:19:27 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-24 20:19:28 +0000 |
commit | 678dbdec82968816a40df237965b5c9e9b44fa82 (patch) | |
tree | 35617d881c78c2802e839d76cfc866cf75ec1789 /res | |
parent | 4101acb821bc454bf3a875515d69abf146c1be91 (diff) | |
parent | 7d520712bab06a526c9ec1462651486f62e64345 (diff) | |
download | android_packages_apps_Snap-678dbdec82968816a40df237965b5c9e9b44fa82.tar.gz android_packages_apps_Snap-678dbdec82968816a40df237965b5c9e9b44fa82.tar.bz2 android_packages_apps_Snap-678dbdec82968816a40df237965b5c9e9b44fa82.zip |
Merge "Fix local adjust" into gb-ub-photos-bryce
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable-hdpi/ic_localadjust_add.png | bin | 0 -> 3821 bytes | |||
-rw-r--r-- | res/drawable-hdpi/ic_localadjust_delete.png | bin | 0 -> 2508 bytes | |||
-rw-r--r-- | res/drawable-hdpi/localadjust_defocused.png | bin | 0 -> 1676 bytes | |||
-rw-r--r-- | res/drawable-hdpi/localadjust_focused.png | bin | 0 -> 1806 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_localadjust_add.png | bin | 0 -> 2535 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_localadjust_delete.png | bin | 0 -> 1752 bytes | |||
-rw-r--r-- | res/drawable-mdpi/localadjust_defocused.png | bin | 0 -> 1158 bytes | |||
-rw-r--r-- | res/drawable-mdpi/localadjust_focused.png | bin | 0 -> 1097 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_localadjust_add.png | bin | 0 -> 5964 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_localadjust_delete.png | bin | 0 -> 3313 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/localadjust_defocused.png | bin | 0 -> 2479 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/localadjust_focused.png | bin | 0 -> 2691 bytes | |||
-rw-r--r-- | res/drawable/filtershow_addpoint.png | bin | 5069 -> 5073 bytes | |||
-rw-r--r-- | res/layout/filtershow_control_action_slider.xml | 14 |
14 files changed, 13 insertions, 1 deletions
diff --git a/res/drawable-hdpi/ic_localadjust_add.png b/res/drawable-hdpi/ic_localadjust_add.png Binary files differnew file mode 100644 index 000000000..4e0dc2b7b --- /dev/null +++ b/res/drawable-hdpi/ic_localadjust_add.png diff --git a/res/drawable-hdpi/ic_localadjust_delete.png b/res/drawable-hdpi/ic_localadjust_delete.png Binary files differnew file mode 100644 index 000000000..521541f49 --- /dev/null +++ b/res/drawable-hdpi/ic_localadjust_delete.png diff --git a/res/drawable-hdpi/localadjust_defocused.png b/res/drawable-hdpi/localadjust_defocused.png Binary files differnew file mode 100644 index 000000000..20677a034 --- /dev/null +++ b/res/drawable-hdpi/localadjust_defocused.png diff --git a/res/drawable-hdpi/localadjust_focused.png b/res/drawable-hdpi/localadjust_focused.png Binary files differnew file mode 100644 index 000000000..5f6b856c5 --- /dev/null +++ b/res/drawable-hdpi/localadjust_focused.png diff --git a/res/drawable-mdpi/ic_localadjust_add.png b/res/drawable-mdpi/ic_localadjust_add.png Binary files differnew file mode 100644 index 000000000..94657346e --- /dev/null +++ b/res/drawable-mdpi/ic_localadjust_add.png diff --git a/res/drawable-mdpi/ic_localadjust_delete.png b/res/drawable-mdpi/ic_localadjust_delete.png Binary files differnew file mode 100644 index 000000000..b6221e608 --- /dev/null +++ b/res/drawable-mdpi/ic_localadjust_delete.png diff --git a/res/drawable-mdpi/localadjust_defocused.png b/res/drawable-mdpi/localadjust_defocused.png Binary files differnew file mode 100644 index 000000000..7abcbba06 --- /dev/null +++ b/res/drawable-mdpi/localadjust_defocused.png diff --git a/res/drawable-mdpi/localadjust_focused.png b/res/drawable-mdpi/localadjust_focused.png Binary files differnew file mode 100644 index 000000000..d2a992542 --- /dev/null +++ b/res/drawable-mdpi/localadjust_focused.png diff --git a/res/drawable-xhdpi/ic_localadjust_add.png b/res/drawable-xhdpi/ic_localadjust_add.png Binary files differnew file mode 100644 index 000000000..ca7b654b3 --- /dev/null +++ b/res/drawable-xhdpi/ic_localadjust_add.png diff --git a/res/drawable-xhdpi/ic_localadjust_delete.png b/res/drawable-xhdpi/ic_localadjust_delete.png Binary files differnew file mode 100644 index 000000000..9dfb392c8 --- /dev/null +++ b/res/drawable-xhdpi/ic_localadjust_delete.png diff --git a/res/drawable-xhdpi/localadjust_defocused.png b/res/drawable-xhdpi/localadjust_defocused.png Binary files differnew file mode 100644 index 000000000..8ece12294 --- /dev/null +++ b/res/drawable-xhdpi/localadjust_defocused.png diff --git a/res/drawable-xhdpi/localadjust_focused.png b/res/drawable-xhdpi/localadjust_focused.png Binary files differnew file mode 100644 index 000000000..76aef60bb --- /dev/null +++ b/res/drawable-xhdpi/localadjust_focused.png diff --git a/res/drawable/filtershow_addpoint.png b/res/drawable/filtershow_addpoint.png Binary files differindex 483d8eebe..5abfc7464 100644 --- a/res/drawable/filtershow_addpoint.png +++ b/res/drawable/filtershow_addpoint.png diff --git a/res/layout/filtershow_control_action_slider.xml b/res/layout/filtershow_control_action_slider.xml index 734d7500b..a3ef3ed5d 100644 --- a/res/layout/filtershow_control_action_slider.xml +++ b/res/layout/filtershow_control_action_slider.xml @@ -22,7 +22,7 @@ android:orientation="horizontal" > <ImageButton - android:id="@+id/actionButton" + android:id="@+id/leftActionButton" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="left|center_vertical" @@ -39,5 +39,17 @@ android:layout_gravity="center_vertical" android:layout_weight="1" style="@style/FilterShowSlider" /> + + <ImageButton + android:id="@+id/rightActionButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="left|center_vertical" + android:scaleType="centerInside" + android:layout_weight="0" + android:background="@drawable/filtershow_button_background" + android:src="@drawable/ic_menu_trash_holo_light" + android:paddingBottom="8dp" /> + </LinearLayout> |