diff options
| -rw-r--r-- | res/drawable-hdpi/ic_confirm_disabled.png | bin | 791 -> 1288 bytes | |||
| -rw-r--r-- | res/drawable-hdpi/ic_confirm_normal.png | bin | 789 -> 1971 bytes | |||
| -rw-r--r-- | res/drawable-mdpi/ic_confirm_disabled.png | bin | 656 -> 1047 bytes | |||
| -rw-r--r-- | res/drawable-mdpi/ic_confirm_normal.png | bin | 667 -> 1438 bytes | |||
| -rw-r--r-- | res/drawable-xhdpi/ic_confirm_disabled.png | bin | 1118 -> 1833 bytes | |||
| -rw-r--r-- | res/drawable-xhdpi/ic_confirm_normal.png | bin | 1067 -> 2728 bytes | |||
| -rw-r--r-- | res/drawable-xxhdpi/ic_confirm_disabled.png | bin | 1740 -> 1924 bytes | |||
| -rw-r--r-- | res/drawable-xxhdpi/ic_confirm_normal.png | bin | 1628 -> 2522 bytes | |||
| -rw-r--r-- | res/drawable/ic_back.xml | 24 | ||||
| -rw-r--r-- | res/drawable/ic_cancel.xml | 24 | ||||
| -rw-r--r-- | res/drawable/ic_confirm.xml | 24 | ||||
| -rw-r--r-- | res/layout/bottom_bar_contents.xml | 7 | ||||
| -rw-r--r-- | src/com/android/camera/ui/TopRightWeightedLayout.java | 59 |
13 files changed, 63 insertions, 75 deletions
diff --git a/res/drawable-hdpi/ic_confirm_disabled.png b/res/drawable-hdpi/ic_confirm_disabled.png Binary files differindex 5bbdcc44c..0aae805f4 100644 --- a/res/drawable-hdpi/ic_confirm_disabled.png +++ b/res/drawable-hdpi/ic_confirm_disabled.png diff --git a/res/drawable-hdpi/ic_confirm_normal.png b/res/drawable-hdpi/ic_confirm_normal.png Binary files differindex d920d6f4a..c2f6eb4d1 100644 --- a/res/drawable-hdpi/ic_confirm_normal.png +++ b/res/drawable-hdpi/ic_confirm_normal.png diff --git a/res/drawable-mdpi/ic_confirm_disabled.png b/res/drawable-mdpi/ic_confirm_disabled.png Binary files differindex cc18158c8..7519d5eb8 100644 --- a/res/drawable-mdpi/ic_confirm_disabled.png +++ b/res/drawable-mdpi/ic_confirm_disabled.png diff --git a/res/drawable-mdpi/ic_confirm_normal.png b/res/drawable-mdpi/ic_confirm_normal.png Binary files differindex 44d7ef3cd..d2c98b850 100644 --- a/res/drawable-mdpi/ic_confirm_normal.png +++ b/res/drawable-mdpi/ic_confirm_normal.png diff --git a/res/drawable-xhdpi/ic_confirm_disabled.png b/res/drawable-xhdpi/ic_confirm_disabled.png Binary files differindex 4bcfe9c52..d36e66367 100644 --- a/res/drawable-xhdpi/ic_confirm_disabled.png +++ b/res/drawable-xhdpi/ic_confirm_disabled.png diff --git a/res/drawable-xhdpi/ic_confirm_normal.png b/res/drawable-xhdpi/ic_confirm_normal.png Binary files differindex 230f01c03..8214d6ce8 100644 --- a/res/drawable-xhdpi/ic_confirm_normal.png +++ b/res/drawable-xhdpi/ic_confirm_normal.png diff --git a/res/drawable-xxhdpi/ic_confirm_disabled.png b/res/drawable-xxhdpi/ic_confirm_disabled.png Binary files differindex e6cae84a8..dcfb840a8 100644 --- a/res/drawable-xxhdpi/ic_confirm_disabled.png +++ b/res/drawable-xxhdpi/ic_confirm_disabled.png diff --git a/res/drawable-xxhdpi/ic_confirm_normal.png b/res/drawable-xxhdpi/ic_confirm_normal.png Binary files differindex d0b3615e9..c67843951 100644 --- a/res/drawable-xxhdpi/ic_confirm_normal.png +++ b/res/drawable-xxhdpi/ic_confirm_normal.png diff --git a/res/drawable/ic_back.xml b/res/drawable/ic_back.xml index f02fd8f75..e6f9052c7 100644 --- a/res/drawable/ic_back.xml +++ b/res/drawable/ic_back.xml @@ -21,30 +21,6 @@ android:gravity="center" android:src="@drawable/ic_back_disabled" /> </item> - <item android:state_pressed="true"> - <level-list> - <item android:maxLevel="0"> - <layer-list> - <item android:drawable="@drawable/button_background_pressed_light" /> - <item> - <bitmap - android:gravity="center" - android:src="@drawable/ic_back_normal" /> - </item> - </layer-list> - </item> - <item android:maxLevel="1"> - <layer-list> - <item android:drawable="@drawable/button_background_pressed_dark" /> - <item> - <bitmap - android:gravity="center" - android:src="@drawable/ic_back_normal" /> - </item> - </layer-list> - </item> - </level-list> - </item> <item> <bitmap android:gravity="center" diff --git a/res/drawable/ic_cancel.xml b/res/drawable/ic_cancel.xml index 0bb1c8b93..9dadbea6b 100644 --- a/res/drawable/ic_cancel.xml +++ b/res/drawable/ic_cancel.xml @@ -21,30 +21,6 @@ android:gravity="center" android:src="@drawable/ic_cancel_disabled" /> </item> - <item android:state_pressed="true"> - <level-list> - <item android:maxLevel="0"> - <layer-list> - <item android:drawable="@drawable/button_background_pressed_light" /> - <item> - <bitmap - android:gravity="center" - android:src="@drawable/ic_cancel_normal" /> - </item> - </layer-list> - </item> - <item android:maxLevel="1"> - <layer-list> - <item android:drawable="@drawable/button_background_pressed_dark" /> - <item> - <bitmap - android:gravity="center" - android:src="@drawable/ic_cancel_normal" /> - </item> - </layer-list> - </item> - </level-list> - </item> <item> <bitmap android:gravity="center" diff --git a/res/drawable/ic_confirm.xml b/res/drawable/ic_confirm.xml index da5b70787..b6a6dd663 100644 --- a/res/drawable/ic_confirm.xml +++ b/res/drawable/ic_confirm.xml @@ -21,30 +21,6 @@ android:gravity="center" android:src="@drawable/ic_confirm_disabled" /> </item> - <item android:state_pressed="true"> - <level-list> - <item android:maxLevel="0"> - <layer-list> - <item android:drawable="@drawable/button_background_pressed_light" /> - <item> - <bitmap - android:gravity="center" - android:src="@drawable/ic_confirm_normal" /> - </item> - </layer-list> - </item> - <item android:maxLevel="1"> - <layer-list> - <item android:drawable="@drawable/button_background_pressed_dark" /> - <item> - <bitmap - android:gravity="center" - android:src="@drawable/ic_confirm_normal" /> - </item> - </layer-list> - </item> - </level-list> - </item> <item> <bitmap android:gravity="center" diff --git a/res/layout/bottom_bar_contents.xml b/res/layout/bottom_bar_contents.xml index a5304a272..6ef01f9e4 100644 --- a/res/layout/bottom_bar_contents.xml +++ b/res/layout/bottom_bar_contents.xml @@ -46,14 +46,16 @@ android:id="@+id/retake_button" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="left|center_vertical" + android:padding="12dp" android:src="@drawable/ic_back" - android:layout_weight="1" android:background="@null" android:contentDescription="@string/retake_button_description" /> <ImageButton android:id="@+id/done_button" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="center" android:src="@drawable/ic_confirm" android:layout_weight="1" android:background="@null" @@ -62,8 +64,9 @@ android:id="@+id/cancel_button" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="right|center_vertical" + android:padding="12dp" android:src="@drawable/ic_cancel" - android:layout_weight="1" android:background="@null" android:contentDescription="@string/cancel_button_description" /> </com.android.camera.ui.TopRightWeightedLayout> diff --git a/src/com/android/camera/ui/TopRightWeightedLayout.java b/src/com/android/camera/ui/TopRightWeightedLayout.java index 29e601341..97b593463 100644 --- a/src/com/android/camera/ui/TopRightWeightedLayout.java +++ b/src/com/android/camera/ui/TopRightWeightedLayout.java @@ -33,7 +33,6 @@ import java.util.List; * on an orientation change. */ public class TopRightWeightedLayout extends LinearLayout { - public TopRightWeightedLayout(Context context, AttributeSet attrs) { super(context, attrs); } @@ -60,12 +59,14 @@ public class TopRightWeightedLayout extends LinearLayout { if (isPortrait && !isHorizontal) { // Portrait orientation is out of sync, setting to horizontal // and reversing children + fixGravity(LinearLayout.HORIZONTAL); setOrientation(LinearLayout.HORIZONTAL); reverseChildren(); requestLayout(); } else if (!isPortrait && isHorizontal) { // Landscape orientation is out of sync, setting to vertical // and reversing children + fixGravity(LinearLayout.VERTICAL); setOrientation(LinearLayout.VERTICAL); reverseChildren(); requestLayout(); @@ -85,4 +86,60 @@ public class TopRightWeightedLayout extends LinearLayout { bringChildToFront(v); } } + + /** + * Swap gravity: + * left for bottom + * right for top + * center horizontal for center vertical + * etc + */ + private void fixGravity(int direction) { + for (int i = 0; i < getChildCount(); i++) { + View v = getChildAt(i); + LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams) v.getLayoutParams(); + int gravity = layoutParams.gravity; + + if (direction == LinearLayout.VERTICAL) { + if ((gravity & Gravity.LEFT) != 0) { // if gravity left is set . . . + gravity &= ~Gravity.LEFT; // unset left + gravity |= Gravity.BOTTOM; // and set bottom + } + } else { + if ((gravity & Gravity.BOTTOM) != 0) { // etc + gravity &= ~Gravity.BOTTOM; + gravity |= Gravity.LEFT; + } + } + + if (direction == LinearLayout.VERTICAL) { + if ((gravity & Gravity.RIGHT) != 0) { + gravity &= ~Gravity.RIGHT; + gravity |= Gravity.TOP; + } + } else { + if ((gravity & Gravity.TOP) != 0) { + gravity &= ~Gravity.TOP; + gravity |= Gravity.RIGHT; + } + } + + // don't mess with children that are centered in both directions + if ((gravity & Gravity.CENTER) != Gravity.CENTER) { + if (direction == LinearLayout.VERTICAL) { + if ((gravity & Gravity.CENTER_VERTICAL) != 0) { + gravity &= ~ Gravity.CENTER_VERTICAL; + gravity |= Gravity.CENTER_HORIZONTAL; + } + } else { + if ((gravity & Gravity.CENTER_HORIZONTAL) != 0) { + gravity &= ~ Gravity.CENTER_HORIZONTAL; + gravity |= Gravity.CENTER_VERTICAL; + } + } + } + + layoutParams.gravity = gravity; + } + } }
\ No newline at end of file |
