diff options
author | Romain Guy <romainguy@android.com> | 2009-07-17 02:08:50 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-07-17 02:08:50 -0700 |
commit | 808e09d24d74a7650ba7b7f1f03444bf8a8538d6 (patch) | |
tree | 63d8f7a8ceb0bb2f8800474045d5de3b080b24eb /res | |
parent | aba68a3dbf190698bee81df4e8b28907aa93d517 (diff) | |
parent | 6b3f51d373f19711a7fac44f2f6df9dc89110eb1 (diff) | |
download | android_packages_apps_Trebuchet-808e09d24d74a7650ba7b7f1f03444bf8a8538d6.tar.gz android_packages_apps_Trebuchet-808e09d24d74a7650ba7b7f1f03444bf8a8538d6.tar.bz2 android_packages_apps_Trebuchet-808e09d24d74a7650ba7b7f1f03444bf8a8538d6.zip |
am 6b3f51d3: More new gestures UI. Adds a back button at the bottom of the settings activity.
Merge commit '6b3f51d373f19711a7fac44f2f6df9dc89110eb1'
* commit '6b3f51d373f19711a7fac44f2f6df9dc89110eb1':
More new gestures UI. Adds a back button at the bottom of the settings activity.
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable/g_background.9.png | bin | 0 -> 392 bytes | |||
-rw-r--r-- | res/drawable/g_bar_background.xml | 19 | ||||
-rw-r--r-- | res/drawable/gestures_frame.9.png | bin | 6582 -> 3882 bytes | |||
-rw-r--r-- | res/drawable/mirrored_shadow.9.png | bin | 0 -> 165 bytes | |||
-rw-r--r-- | res/layout/gestures_settings.xml | 44 |
5 files changed, 53 insertions, 10 deletions
diff --git a/res/drawable/g_background.9.png b/res/drawable/g_background.9.png Binary files differnew file mode 100644 index 000000000..a4bf81764 --- /dev/null +++ b/res/drawable/g_background.9.png diff --git a/res/drawable/g_bar_background.xml b/res/drawable/g_bar_background.xml new file mode 100644 index 000000000..b9f669494 --- /dev/null +++ b/res/drawable/g_bar_background.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2009 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. +--> + +<nine-patch xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/g_background" + android:dither="true" /> diff --git a/res/drawable/gestures_frame.9.png b/res/drawable/gestures_frame.9.png Binary files differindex c5f564063..3119a815b 100644 --- a/res/drawable/gestures_frame.9.png +++ b/res/drawable/gestures_frame.9.png diff --git a/res/drawable/mirrored_shadow.9.png b/res/drawable/mirrored_shadow.9.png Binary files differnew file mode 100644 index 000000000..84516dddb --- /dev/null +++ b/res/drawable/mirrored_shadow.9.png diff --git a/res/layout/gestures_settings.xml b/res/layout/gestures_settings.xml index d32b3ec84..712cb22d2 100644 --- a/res/layout/gestures_settings.xml +++ b/res/layout/gestures_settings.xml @@ -14,22 +14,46 @@ limitations under the License. --> -<merge xmlns:android="http://schemas.android.com/apk/res/android"> +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="fill_parent" + android:layout_height="fill_parent"> <ListView android:id="@android:id/list" + + android:layout_width="fill_parent" + android:layout_height="0dip" + android:layout_alignParentTop="true" + android:layout_above="@+id/bottom_bar" /> + + <View android:layout_width="fill_parent" - android:layout_height="fill_parent" /> + android:layout_height="6dip" + android:layout_alignParentTop="false" + android:layout_above="@+id/bottom_bar" + + android:background="@drawable/mirrored_shadow" /> + + <RelativeLayout + android:id="@id/bottom_bar" - <TextView - android:id="@android:id/empty" android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" + android:layout_height="60dip" + android:layout_alignParentBottom="true" + + android:background="@drawable/g_bar_background"> + + <ImageButton + android:onClick="back" + + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginRight="13dip" + android:layout_alignParentRight="true" + android:layout_centerVertical="true" - android:gravity="center_horizontal" + android:background="@drawable/btn_g" /> - android:text="@string/gestures_loading" - android:textAppearance="?android:attr/textAppearanceMedium" /> + </RelativeLayout> -</merge> +</RelativeLayout> |