diff options
author | Hyunyoung Song <hyunyoungs@google.com> | 2015-07-23 17:08:47 -0700 |
---|---|---|
committer | Hyunyoung Song <hyunyoungs@google.com> | 2015-07-23 17:08:47 -0700 |
commit | 680c92febe88260b74f101838a9734b8e10a704c (patch) | |
tree | e3294c3b2b32cd3532fa9b239326b1aaaa79fc40 /WallpaperPicker/res/layout/wallpaper_cropper.xml | |
parent | 494d2237b8d7b892902604c18098127e77372509 (diff) | |
parent | 13ef17a37e683b8ad5800e9f542b411180fbec2f (diff) | |
download | android_packages_apps_Trebuchet-680c92febe88260b74f101838a9734b8e10a704c.tar.gz android_packages_apps_Trebuchet-680c92febe88260b74f101838a9734b8e10a704c.tar.bz2 android_packages_apps_Trebuchet-680c92febe88260b74f101838a9734b8e10a704c.zip |
resolved conflicts for merge of 13ef17a3 to cw-e-dev
b/22609402
Change-Id: I3753db1f922923a6b462fa75a5c0d826e0413f95
Diffstat (limited to 'WallpaperPicker/res/layout/wallpaper_cropper.xml')
-rw-r--r-- | WallpaperPicker/res/layout/wallpaper_cropper.xml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/WallpaperPicker/res/layout/wallpaper_cropper.xml b/WallpaperPicker/res/layout/wallpaper_cropper.xml index abb860898..ffe8df0fb 100644 --- a/WallpaperPicker/res/layout/wallpaper_cropper.xml +++ b/WallpaperPicker/res/layout/wallpaper_cropper.xml @@ -19,7 +19,6 @@ --> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/wallpaper_root" android:layout_width="match_parent" android:layout_height="match_parent"> <com.android.launcher3.CropView @@ -28,7 +27,7 @@ android:layout_height="match_parent" /> <ProgressBar android:id="@+id/loading" - style="@android:style/Widget.Holo.ProgressBar.Large" + style="?android:attr/progressBarStyleLarge" android:visibility="invisible" android:layout_width="wrap_content" android:layout_height="wrap_content" |