diff options
| author | nicolasroard <nicolasroard@google.com> | 2013-08-27 09:49:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-27 09:49:28 -0700 |
| commit | 51713de0b3710ca90bc1d3b454cbdcee482b22dc (patch) | |
| tree | 79f3a524332762d4332ad98a5c0d5878ba0984a9 /res | |
| parent | 1b982d48cb86753c9605bf60a733dcfb1fceda69 (diff) | |
| parent | 8141e2414467458c6e98b40845fc22a9cdcfffb0 (diff) | |
| download | android_packages_apps_Gallery2-51713de0b3710ca90bc1d3b454cbdcee482b22dc.tar.gz android_packages_apps_Gallery2-51713de0b3710ca90bc1d3b454cbdcee482b22dc.tar.bz2 android_packages_apps_Gallery2-51713de0b3710ca90bc1d3b454cbdcee482b22dc.zip | |
am 8141e241: Merge "Improves UI / size" into gb-ub-photos-carlsbad
* commit '8141e2414467458c6e98b40845fc22a9cdcfffb0':
Improves UI / size
Diffstat (limited to 'res')
| -rw-r--r-- | res/drawable-nodpi/geometry_shadow.9.png | bin | 4456 -> 2236 bytes | |||
| -rw-r--r-- | res/drawable-nodpi/spot_mask.png | bin | 0 -> 25505 bytes | |||
| -rw-r--r-- | res/layout-land/filtershow_activity.xml | 6 | ||||
| -rw-r--r-- | res/layout/filtershow_activity.xml | 6 | ||||
| -rw-r--r-- | res/values/styles.xml | 2 |
5 files changed, 13 insertions, 1 deletions
diff --git a/res/drawable-nodpi/geometry_shadow.9.png b/res/drawable-nodpi/geometry_shadow.9.png Binary files differindex 2f7abdc08..205e9318c 100644 --- a/res/drawable-nodpi/geometry_shadow.9.png +++ b/res/drawable-nodpi/geometry_shadow.9.png diff --git a/res/drawable-nodpi/spot_mask.png b/res/drawable-nodpi/spot_mask.png Binary files differnew file mode 100644 index 000000000..89537594e --- /dev/null +++ b/res/drawable-nodpi/spot_mask.png diff --git a/res/layout-land/filtershow_activity.xml b/res/layout-land/filtershow_activity.xml index e6599f049..72bbdeaf9 100644 --- a/res/layout-land/filtershow_activity.xml +++ b/res/layout-land/filtershow_activity.xml @@ -105,4 +105,10 @@ </LinearLayout> + <com.android.gallery3d.filtershow.category.CategorySelected + android:layout_width="@dimen/category_panel_icon_size" + android:layout_height="@dimen/category_panel_icon_size" + android:id="@+id/categorySelectedIndicator" + android:visibility="invisible"/> + </FrameLayout> diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml index c580f1936..aabdb73e7 100644 --- a/res/layout/filtershow_activity.xml +++ b/res/layout/filtershow_activity.xml @@ -92,4 +92,10 @@ </LinearLayout> + <com.android.gallery3d.filtershow.category.CategorySelected + android:layout_width="@dimen/category_panel_icon_size" + android:layout_height="@dimen/category_panel_icon_size" + android:id="@+id/categorySelectedIndicator" + android:visibility="invisible"/> + </FrameLayout> diff --git a/res/values/styles.xml b/res/values/styles.xml index 67c53f819..58c87ce98 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -29,7 +29,7 @@ <item name="android:colorBackgroundCacheHint">@null</item> </style> <style name="Theme.FilterShow" parent="Theme.Gallery"> - <item name="android:windowBackground">@color/background_screen</item> + <item name="android:windowBackground">@null</item> </style> <style name="Holo.ActionBar" parent="android:Widget.Holo.ActionBar"> <item name="android:displayOptions">useLogo|showHome</item> |
