diff options
| author | Hyunyoung Song <hyunyoungs@google.com> | 2015-07-20 15:37:27 -0700 |
|---|---|---|
| committer | Hyunyoung Song <hyunyoungs@google.com> | 2015-07-20 15:37:27 -0700 |
| commit | 13ef17a37e683b8ad5800e9f542b411180fbec2f (patch) | |
| tree | 96beaf07307486f6491f022da63ebe381765d1a8 /WallpaperPicker/res/layout/wallpaper_picker_third_party_item.xml | |
| parent | e5ec4ac409eb3d3169bb9350dfda51ae7e08291e (diff) | |
| parent | e3fe3f89ee956e8d7995c569948cb70765ec19b8 (diff) | |
| download | android_packages_apps_Trebuchet-13ef17a37e683b8ad5800e9f542b411180fbec2f.tar.gz android_packages_apps_Trebuchet-13ef17a37e683b8ad5800e9f542b411180fbec2f.tar.bz2 android_packages_apps_Trebuchet-13ef17a37e683b8ad5800e9f542b411180fbec2f.zip | |
merged ub-launcher3-burnaby, and resolved conflicts
Note1: Verified that following succeeds. $ make -j 32 dist checkbuild
Note2: Verified that the git history of burnaby is (998 commit) is pulled
into mnc-dev packages/apps/Launcher3 git project using gitk.
b/22609402
Change-Id: If20ed77328a71d05a590a7ee2e84d5472d0248ae
Diffstat (limited to 'WallpaperPicker/res/layout/wallpaper_picker_third_party_item.xml')
| -rw-r--r-- | WallpaperPicker/res/layout/wallpaper_picker_third_party_item.xml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/WallpaperPicker/res/layout/wallpaper_picker_third_party_item.xml b/WallpaperPicker/res/layout/wallpaper_picker_third_party_item.xml index 68661bc00..a7e3a0c79 100644 --- a/WallpaperPicker/res/layout/wallpaper_picker_third_party_item.xml +++ b/WallpaperPicker/res/layout/wallpaper_picker_third_party_item.xml @@ -20,7 +20,6 @@ android:layout_height="@dimen/wallpaperThumbnailHeight" android:focusable="true" android:clickable="true" - android:background="@drawable/wallpaper_tile_fg" android:foreground="@drawable/wallpaper_tile_fg"> <ImageView android:id="@+id/wallpaper_image" |