Cleaning up ImageShow.

Bug: 9170644
Change-Id: Iab44ec425462e9afe8c104c52e4a28c4145d4690

2 files changed, 49 insertions, 59 deletions

diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 06cd5c7d5..692a87fbf 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2009, The Android Open Source Project
+<!-- Copyright (c) 2013, The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -103,4 +103,52 @@
     <dimen name="capture_margin_top">16dip</dimen>
     <dimen name="camera_controls_size">0dip</dimen>
     <dimen name="camera_film_strip_gap">32dip</dimen>
+
+    <dimen name="appwidget_width">180dp</dimen>
+    <dimen name="appwidget_height">180dp</dimen>
+    <dimen name="stack_photo_width">160dp</dimen>
+    <dimen name="stack_photo_height">120dp</dimen>
+
+    <!-- configuration for legacy album set page -->
+    <integer name="albumset_rows_land">2</integer>
+    <integer name="albumset_rows_port">3</integer>
+    <dimen name="albumset_padding_top">7dp</dimen>
+    <dimen name="albumset_padding_bottom">7dp</dimen>
+    <dimen name="albumset_slot_gap">7dp</dimen>
+
+    <dimen name="albumset_label_background_height">30dp</dimen>
+    <dimen name="albumset_title_offset">10dp</dimen>
+    <dimen name="albumset_count_offset">10dp</dimen>
+    <dimen name="albumset_title_font_size">12sp</dimen>
+    <dimen name="albumset_count_font_size">9sp</dimen>
+    <dimen name="albumset_left_margin">2dp</dimen>
+    <dimen name="albumset_title_right_margin">20dp</dimen>
+    <dimen name="albumset_icon_size">25dp</dimen>
+
+    <!-- configuration for album page -->
+    <integer name="album_rows_land">2</integer>
+    <integer name="album_rows_port">4</integer>
+    <dimen name="album_slot_gap">5dp</dimen>
+
+    <!-- configuration for manage page -->
+    <dimen name="cache_pin_size">24dp</dimen>
+    <dimen name="cache_pin_margin">8dp</dimen>
+
+    <!-- for manage cache bar -->
+    <dimen name="manage_cache_bottom_height">48dp</dimen>
+
+    <!--  configuration for filtershow UI -->
+    <dimen name="thumbnail_size">96dip</dimen>
+    <dimen name="thumbnail_margin">3dip</dimen>
+    <dimen name="action_item_height">175dip</dimen>
+
+    <!-- configuration for album set page -->
+    <dimen name="album_set_item_image_height">120dp</dimen>
+    <dimen name="album_set_item_width">140dp</dimen>
+
+    <!-- configuration for preview in editor -->
+    <dimen name="photoeditor_text_size">12dp</dimen>
+    <dimen name="photoeditor_text_padding">10dp</dimen>
+    <dimen name="photoeditor_original_text_size">18dp</dimen>
+    <dimen name="photoeditor_original_text_margin">4dp</dimen>
 </resources>
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
deleted file mode 100644
index 94697d1f4..000000000
--- a/res/values/dimensions.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources>
-    <dimen name="appwidget_width">180dp</dimen>
-    <dimen name="appwidget_height">180dp</dimen>
-    <dimen name="stack_photo_width">160dp</dimen>
-    <dimen name="stack_photo_height">120dp</dimen>
-
-    <!-- configuration for legacy album set page -->
-    <integer name="albumset_rows_land">2</integer>
-    <integer name="albumset_rows_port">3</integer>
-    <dimen name="albumset_padding_top">7dp</dimen>
-    <dimen name="albumset_padding_bottom">7dp</dimen>
-    <dimen name="albumset_slot_gap">7dp</dimen>
-
-    <dimen name="albumset_label_background_height">30dp</dimen>
-    <dimen name="albumset_title_offset">10dp</dimen>
-    <dimen name="albumset_count_offset">10dp</dimen>
-    <dimen name="albumset_title_font_size">12sp</dimen>
-    <dimen name="albumset_count_font_size">9sp</dimen>
-    <dimen name="albumset_left_margin">2dp</dimen>
-    <dimen name="albumset_title_right_margin">20dp</dimen>
-    <dimen name="albumset_icon_size">25dp</dimen>
-
-    <!-- configuration for album page -->
-    <integer name="album_rows_land">2</integer>
-    <integer name="album_rows_port">4</integer>
-    <dimen name="album_slot_gap">5dp</dimen>
-
-    <!-- configuration for manage page -->
-    <dimen name="cache_pin_size">24dp</dimen>
-    <dimen name="cache_pin_margin">8dp</dimen>
-
-    <!-- for manage cache bar -->
-    <dimen name="manage_cache_bottom_height">48dp</dimen>
-
-    <!--  configuration for filtershow UI -->
-    <dimen name="thumbnail_size">96dip</dimen>
-    <dimen name="thumbnail_margin">3dip</dimen>
-    <dimen name="action_item_height">175dip</dimen>
-
-    <!-- configuration for album set page -->
-    <dimen name="album_set_item_image_height">120dp</dimen>
-    <dimen name="album_set_item_width">140dp</dimen>
-</resources>