diff options
-rw-r--r-- | res/layout/undo_bar.xml | 31 | ||||
-rw-r--r-- | res/values/colors.xml | 1 | ||||
-rw-r--r-- | res/values/styles.xml | 35 |
3 files changed, 65 insertions, 2 deletions
diff --git a/res/layout/undo_bar.xml b/res/layout/undo_bar.xml new file mode 100644 index 000000000..33ec91d85 --- /dev/null +++ b/res/layout/undo_bar.xml @@ -0,0 +1,31 @@ +<?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. +--> +<!-- This layout is shared by phone and tablet in portrait or landscape orientation. --> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="horizontal" + style="@style/UndoBar"> + <TextView android:text="@string/deleted" + style="@style/UndoBarTextAppearance" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1" + android:gravity="left|center_vertical" /> + <View style="@style/UndoBarSeparator" /> + <TextView android:id="@+id/undo_button" + style="@style/UndoButton" + android:text="@string/undo" + android:drawableLeft="@drawable/ic_menu_revert_holo_dark"/> +</LinearLayout> diff --git a/res/values/colors.xml b/res/values/colors.xml index c1bb52b30..4fe918094 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -68,5 +68,6 @@ <color name="face_detect_start">#80ffffff</color> <color name="face_detect_success">#8050d060</color> <color name="face_detect_fail">#80d05060</color> + <color name="gray">#FFAAAAAA</color> </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index e6179e99b..67c53f819 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -253,9 +253,40 @@ <item name="android:enabled">false</item> <item name="android:scaleType">center</item> </style> - <style name="CameraControls"> + <style name="CameraControls"> <item name="android:layout_width">match_parent</item> <item name="android:layout_height">match_parent</item> </style> - + <style name="UndoBar"> + <item name="android:layout_marginLeft">4dp</item> + <item name="android:layout_marginRight">4dp</item> + <item name="android:paddingLeft">16dp</item> + <item name="android:layout_width">match_parent</item> + <item name="android:layout_height">48dp</item> + <item name="android:layout_gravity">bottom</item> + <item name="android:background">@drawable/panel_undo_holo</item> + </style> + <style name="UndoBarTextAppearance"> + <item name="android:textSize">16sp</item> + <item name="android:textColor">@android:color/white</item> + </style> + <style name="UndoBarSeparator"> + <item name="android:background">@color/gray</item> + <item name="android:layout_width">1dp</item> + <item name="android:layout_height">match_parent</item> + <item name="android:layout_marginTop">10dp</item> + <item name="android:layout_marginBottom">10dp</item> + <item name="android:paddingRight">12dp</item> + </style> + <style name="UndoButton"> + <item name="android:layout_width">wrap_content</item> + <item name="android:layout_height">match_parent</item> + <item name="android:paddingRight">16dp</item> + <item name="android:textSize">12sp</item> + <item name="android:gravity">center_vertical</item> + <item name="android:textStyle">bold</item> + <item name="android:textColor">@color/gray</item> + <item name="android:drawablePadding">8dp</item> + <item name="android:background">@drawable/bg_pressed</item> + </style> </resources> |