diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2015-08-31 17:01:06 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-31 17:01:06 +0000 |
commit | 03412672d141629593561031e331739c28bc7476 (patch) | |
tree | 6b163d6744129faae3ff6b1a58ca4adfeb2bc969 /res/layout | |
parent | 3afcff56c44c593fc0b2e04bcfbfaac759ec56ff (diff) | |
parent | 6670d16341f2311925765511c54afab196a0d2bd (diff) | |
download | android_packages_wallpapers_LivePicker-03412672d141629593561031e331739c28bc7476.tar.gz android_packages_wallpapers_LivePicker-03412672d141629593561031e331739c28bc7476.tar.bz2 android_packages_wallpapers_LivePicker-03412672d141629593561031e331739c28bc7476.zip |
Merge "Moving the set wallpaper button to the top to match the default launcher style"
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/live_wallpaper_preview.xml | 43 |
1 files changed, 10 insertions, 33 deletions
diff --git a/res/layout/live_wallpaper_preview.xml b/res/layout/live_wallpaper_preview.xml index 1fa7ec8..6dcb644 100644 --- a/res/layout/live_wallpaper_preview.xml +++ b/res/layout/live_wallpaper_preview.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2009 The Android Open Source Project +<!-- + 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. @@ -13,36 +14,12 @@ See the License for the specific language governing permissions and limitations under the License. --> - -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<Button xmlns:android="http://schemas.android.com/apk/res/android" + style="@style/ActionBarSetWallpaperStyle" android:layout_width="match_parent" - android:layout_height="wrap_content" - - android:layout_gravity="center_horizontal|bottom" - android:background="#88000000" - style="?android:attr/buttonBarStyle"> - - <Button - android:id="@+id/configure" - - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_gravity="center_vertical" - - android:text="@string/configure_wallpaper" - - android:onClick="configureLiveWallpaper" - style="?android:attr/buttonBarButtonStyle" /> - - <Button - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_gravity="center_vertical" - - android:text="@string/wallpaper_instructions" - - android:onClick="setLiveWallpaper" - style="?android:attr/buttonBarButtonStyle" /> -</LinearLayout> + android:layout_height="match_parent" + android:drawablePadding="8dp" + android:drawableStart="@drawable/ic_tick" + android:gravity="start|center_vertical" + android:onClick="setLiveWallpaper" + android:text="@string/wallpaper_instructions" /> |