diff options
| author | Bobby Georgescu <georgescu@google.com> | 2012-09-30 13:26:01 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-30 13:26:01 -0700 |
| commit | fa99a3ef9c2f0d8d30c8fd5014238ecff9281aeb (patch) | |
| tree | 4fde4edcfc3aea67a3b51a398ae738c3e70c58c3 | |
| parent | 3459318ed7c7f20f56cab591493e625a98692b1f (diff) | |
| parent | 09ff3c66f7760febc2c1ba02e9d6171b3f68d97e (diff) | |
| download | android_packages_apps_Snap-fa99a3ef9c2f0d8d30c8fd5014238ecff9281aeb.tar.gz android_packages_apps_Snap-fa99a3ef9c2f0d8d30c8fd5014238ecff9281aeb.tar.bz2 android_packages_apps_Snap-fa99a3ef9c2f0d8d30c8fd5014238ecff9281aeb.zip | |
am 0aaf8fb8: Update FX/pano button appearance, placement, animation
* commit '0aaf8fb8b86cbf6353937c12f377ad524661c553':
Update FX/pano button appearance, placement, animation
| -rw-r--r-- | res/drawable/photopage_bottom_button_background.xml | 5 | ||||
| -rw-r--r-- | res/layout/photopage_bottom_controls.xml | 21 | ||||
| -rw-r--r-- | res/values/colors.xml | 2 |
3 files changed, 24 insertions, 4 deletions
diff --git a/res/drawable/photopage_bottom_button_background.xml b/res/drawable/photopage_bottom_button_background.xml new file mode 100644 index 000000000..0c772ad21 --- /dev/null +++ b/res/drawable/photopage_bottom_button_background.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:drawable="@android:color/holo_blue_light" android:state_pressed="true"/> + <item android:drawable="@color/button_dark_transparent_background" android:state_selected="false"/> +</selector> diff --git a/res/layout/photopage_bottom_controls.xml b/res/layout/photopage_bottom_controls.xml index a8fca2d72..5b80cf2da 100644 --- a/res/layout/photopage_bottom_controls.xml +++ b/res/layout/photopage_bottom_controls.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/photopage_bottom_controls" + android:padding="10dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true" @@ -9,14 +10,26 @@ android:visibility="gone"> <ImageButton android:id="@+id/photopage_bottom_control_edit" - android:src="@drawable/photoeditor_artistic" + android:src="@drawable/ic_photoeditor_effects" + android:background="@drawable/photopage_bottom_button_background" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:paddingTop="5dp" + android:paddingBottom="5dp" + android:paddingLeft="15dp" + android:paddingRight="15dp" android:visibility="gone"/> <ImageButton android:id="@+id/photopage_bottom_control_panorama" - android:src="@android:drawable/ic_dialog_map" + android:src="@drawable/ic_menu_photosphere" + android:background="@drawable/photopage_bottom_button_background" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:paddingTop="5dp" + android:paddingBottom="5dp" + android:paddingLeft="15dp" + android:paddingRight="15dp" android:visibility="gone"/> -</LinearLayout> +</RelativeLayout> diff --git a/res/values/colors.xml b/res/values/colors.xml index 10f5b6303..705748c2b 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -38,4 +38,6 @@ <color name="bitmap_screennail_placeholder">#333</color> <color name="slideshow_background">#1A1A1A</color> + + <color name="button_dark_transparent_background">#6000</color> </resources> |