diff options
author | Bobby Georgescu <georgescu@google.com> | 2012-08-10 10:45:55 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-10 10:45:56 -0700 |
commit | 42a68a6f524bbd206b68eda650cc45d7e2a509af (patch) | |
tree | 19ceda33c6544b068494e3ac75a592ca9ec48de4 /res | |
parent | 112a8beb812397c9cfbc49e218d7864fc7c23e91 (diff) | |
parent | c90a116a7fd65d41e8258dc7b9a14218649697e6 (diff) | |
download | android_packages_apps_Gallery2-42a68a6f524bbd206b68eda650cc45d7e2a509af.tar.gz android_packages_apps_Gallery2-42a68a6f524bbd206b68eda650cc45d7e2a509af.tar.bz2 android_packages_apps_Gallery2-42a68a6f524bbd206b68eda650cc45d7e2a509af.zip |
Merge "First gallery reskin iteration." into gb-ub-photos-arches
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/gl_root_group.xml | 2 | ||||
-rw-r--r-- | res/values-xlarge/dimensions.xml | 6 | ||||
-rw-r--r-- | res/values-xlarge/styles.xml | 7 | ||||
-rw-r--r-- | res/values/dimensions.xml | 20 |
4 files changed, 13 insertions, 22 deletions
diff --git a/res/layout/gl_root_group.xml b/res/layout/gl_root_group.xml index 76ff33b73..796c9cd7b 100644 --- a/res/layout/gl_root_group.xml +++ b/res/layout/gl_root_group.xml @@ -22,5 +22,5 @@ <View android:id="@+id/gl_root_cover" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@android:color/black"/> + android:background="@android:color/white"/> </merge> diff --git a/res/values-xlarge/dimensions.xml b/res/values-xlarge/dimensions.xml index 0b2defbbc..1a4c01185 100644 --- a/res/values-xlarge/dimensions.xml +++ b/res/values-xlarge/dimensions.xml @@ -20,12 +20,10 @@ <dimen name="stack_photo_height">165dp</dimen> <!-- configuration for album set page --> - <integer name="albumset_rows_land">3</integer> - <integer name="albumset_rows_port">5</integer> - <dimen name="albumset_slot_gap">1dp</dimen> + <integer name="albumset_rows_land">2</integer> + <integer name="albumset_rows_port">4</integer> <!-- configuration for album page --> <integer name="album_rows_land">3</integer> <integer name="album_rows_port">5</integer> - <dimen name="album_slot_gap">1dp</dimen> </resources> diff --git a/res/values-xlarge/styles.xml b/res/values-xlarge/styles.xml index 7670f614d..2c6385ac6 100644 --- a/res/values-xlarge/styles.xml +++ b/res/values-xlarge/styles.xml @@ -14,13 +14,6 @@ limitations under the License. --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <style name="Theme.Gallery" parent="Theme.GalleryBase"> - <item name="android:displayOptions"></item> - <item name="android:actionBarStyle">@style/Holo.ActionBar</item> - <item name="android:windowBackground">@android:color/black</item> - <item name="android:colorBackground">@null</item> - <item name="android:colorBackgroundCacheHint">@null</item> - </style> <style name="DialogPickerTheme" parent="android:Theme.Holo.Dialog"> </style> <bool name="picker_is_dialog">true</bool> diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml index 92e671370..b950f0a90 100644 --- a/res/values/dimensions.xml +++ b/res/values/dimensions.xml @@ -20,22 +20,22 @@ <dimen name="stack_photo_height">120dp</dimen> <!-- configuration for album set page --> - <integer name="albumset_rows_land">2</integer> - <integer name="albumset_rows_port">4</integer> - <dimen name="albumset_slot_gap">1dp</dimen> - - <dimen name="albumset_label_background_height">40dp</dimen> - <dimen name="albumset_title_offset">3dp</dimen> - <dimen name="albumset_count_offset">4dp</dimen> - <dimen name="albumset_title_font_size">14sp</dimen> + <integer name="albumset_rows_land">1</integer> + <integer name="albumset_rows_port">2</integer> + <dimen name="albumset_slot_gap">12dp</dimen> + + <dimen name="albumset_label_background_height">45dp</dimen> + <dimen name="albumset_title_offset">10dp</dimen> + <dimen name="albumset_count_offset">10dp</dimen> + <dimen name="albumset_title_font_size">20sp</dimen> <dimen name="albumset_count_font_size">12sp</dimen> <dimen name="albumset_left_margin">6dp</dimen> - <dimen name="albumset_icon_size">25dp</dimen> + <dimen name="albumset_icon_size">20dp</dimen> <!-- configuration for album page --> <integer name="album_rows_land">2</integer> <integer name="album_rows_port">4</integer> - <dimen name="album_slot_gap">1dp</dimen> + <dimen name="album_slot_gap">4dp</dimen> <!-- configuration for manage page --> <dimen name="cache_pin_size">24dp</dimen> |