diff options
| author | Selim Cinek <cinek@google.com> | 2014-03-04 09:48:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-04 09:48:32 +0000 |
| commit | 0c255a946788499d7f169429890d5a423426593b (patch) | |
| tree | 979a8fafd7e6cd474a458ef14ee93a703f231956 /WallpaperPicker/res/layout | |
| parent | 7da05a506cdc651a77df918ec20d6aa881ca51b2 (diff) | |
| parent | ffed65886ecd83f52dc1c052897511c95a5f371a (diff) | |
| download | android_packages_apps_Trebuchet-0c255a946788499d7f169429890d5a423426593b.tar.gz android_packages_apps_Trebuchet-0c255a946788499d7f169429890d5a423426593b.tar.bz2 android_packages_apps_Trebuchet-0c255a946788499d7f169429890d5a423426593b.zip | |
Merge "Changed behaviour of the wallpaper picker." into ub-now-lunchbox
Diffstat (limited to 'WallpaperPicker/res/layout')
| -rw-r--r-- | WallpaperPicker/res/layout/actionbar_set_wallpaper.xml | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/WallpaperPicker/res/layout/actionbar_set_wallpaper.xml b/WallpaperPicker/res/layout/actionbar_set_wallpaper.xml index 2a0188ae2..8e349b732 100644 --- a/WallpaperPicker/res/layout/actionbar_set_wallpaper.xml +++ b/WallpaperPicker/res/layout/actionbar_set_wallpaper.xml @@ -18,18 +18,15 @@ */ --> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - style="?android:actionButtonStyle" +<com.android.launcher3.AlphaDisableableButton + xmlns:android="http://schemas.android.com/apk/res/android" + style="@style/ActionBarSetWallpaperStyle" android:id="@+id/set_wallpaper_button" android:layout_width="match_parent" - android:layout_height="match_parent" > - <TextView style="?android:actionBarTabTextStyle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="start|center_vertical" - android:paddingRight="20dp" - android:drawableLeft="@drawable/ic_actionbar_accept" - android:drawablePadding="8dp" - android:gravity="center_vertical" - android:text="@string/wallpaper_instructions" /> -</FrameLayout> + android:layout_height="match_parent" + android:paddingRight="20dp" + android:drawableLeft="@drawable/ic_actionbar_accept" + android:drawablePadding="8dp" + android:gravity="start|center_vertical" + android:text="@string/wallpaper_instructions"> +</com.android.launcher3.AlphaDisableableButton> |