This removes all non-Camera stuff from Camera2.

Note: Camera2 is a clone of Gallery2 right now.
Note 2: I will bring .mk files back later.

Change-Id: Ida958654296f5ebaacb6bb0ff59d52a7c37ce6fc

9 files changed, 4 insertions, 546 deletions

diff --git a/res/values/filtershow_color.xml b/res/values/filtershow_color.xml
deleted file mode 100644
index d7cf79d70..000000000
--- a/res/values/filtershow_color.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
-     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>
-    <color name="yellow">#FFFF00</color>
-    <color name="green">#00FF00</color>
-    <color name="red">#FF0000</color>
-    <color name="blue">#0000FF</color>
-    <color name="text_toolbar">#FFFFFF</color>
-    <color name="background_screen">#101010</color>
-    <color name="background_toolbar">#363949</color>
-    <color name="background_main_toolbar">#232323</color>
-    <color name="toolbar_separation_line">#333333</color>
-    <color name="slider_dot_color">#6464FF</color>
-    <color name="slider_line_color">#33B5E5</color>
-    <color name="state_panel_separation_line">#232323</color>
-    <color name="filtershow_background">#333333</color>
-    <color name="filtershow_graphic">#717171</color>
-    <color name="filtershow_stateview_end_background">#232323</color>
-    <color name="filtershow_stateview_end_text">#a7a7a7</color>
-    <color name="filtershow_stateview_background">#464646</color>
-    <color name="filtershow_stateview_text">#FFFFFF</color>
-    <color name="filtershow_stateview_selected_background">#c8c8c8</color>
-    <color name="filtershow_stateview_selected_text">#000000</color>
-    <color name="filtershow_categoryview_background">#1a1a1a</color>
-    <color name="filtershow_categoryview_text">#a7a7a7</color>
-    <color name="filtershow_category_selection">#ffffffff</color>
-    <color name="gradcontrol_point_center">#ffffffff</color>
-    <color name="gradcontrol_point_edge">#ffffffff</color>
-    <color name="gradcontrol_graypoint_center">#888888</color>
-    <color name="gradcontrol_graypoint_edge">#BBBBBB</color>
-    <color name="gradcontrol_point_shadow_start">#66000000</color>
-    <color name="gradcontrol_point_shadow_end">#00000000</color>
-    <color name="gradcontrol_line_color">#FFFFFF</color>
-    <color name="gradcontrol_line_shadow">#000000</color>
-
-
-</resources>
\ No newline at end of file
diff --git a/res/values/filtershow_ids.xml b/res/values/filtershow_ids.xml
deleted file mode 100644
index b315d12d9..000000000
--- a/res/values/filtershow_ids.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-* 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.
-* 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>
-    <!-- Buttons ids for the filters -->
-    <item type="id" name="tinyplanetButton" />
-    <item type="id" name="vignetteButton" />
-    <item type="id" name="vibranceButton" />
-    <item type="id" name="contrastButton" />
-    <item type="id" name="saturationButton" />
-    <item type="id" name="bwfilterButton" />
-    <item type="id" name="wbalanceButton" />
-    <item type="id" name="hueButton" />
-    <item type="id" name="exposureButton" />
-    <item type="id" name="shadowRecoveryButton" />
-    <item type="id" name="highlightRecoveryButton" />
-    <item type="id" name="sharpenButton" />
-    <item type="id" name="curvesButtonRGB" />
-    <item type="id" name="negativeButton" />
-    <item type="id" name="edgeButton" />
-    <item type="id" name="kmeansButton" />
-    <item type="id" name="downsampleButton" />
-    <item type="id" name="drawOnImageButton" />
-    <item type="id" name="imageCurves" />
-    <item type="id" name="imageZoom" />
-    <item type="id" name="editorDraw" />
-    <item type="id" name="editorRedEye" />
-    <item type="id" name="imageOnlyEditor" />
-    <item type="id" name="vignetteEditor" />
-    <item type="id" name="editorCrop" />
-    <item type="id" name="editorFlip" />
-    <item type="id" name="editorRotate" />
-    <item type="id" name="editorStraighten" />
-    <item type="id" name="editorParametric" />
-    <item type="id" name="editorGrad" />
-    <item type="id" name="editorChanSat" />
-</resources>
diff --git a/res/values/filtershow_strings.xml b/res/values/filtershow_strings.xml
deleted file mode 100644
index c4546c89e..000000000
--- a/res/values/filtershow_strings.xml
+++ /dev/null
@@ -1,248 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 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>
-    <!--  Title for the image editor activity [CHAR LIMIT=NONE]-->
-    <string name="title_activity_filter_show">Photo Editor</string>
-
-    <!--  String shown when we cannot load the image when starting the activity [CHAR LIMIT=NONE] -->
-    <string name="cannot_load_image">Cannot load the image!</string>
-    <!--  String displayed when showing the original image [CHAR LIMIT=NONE] -->
-    <string name="original_picture_text">@string/original</string>
-    <!--  String displayed when setting the homepage wallpaper in the background [CHAR LIMIT=NONE] -->
-    <string name="setting_wallpaper">Setting wallpaper</string>
-
-    <!--  generic strings -->
-
-
-    <!--  Text for to display on a download failure [CHAR LIMIT=NONE] -->
-    <string name="download_failure">Could not download photo. Network unavailable.</string>
-    <!--  Text for original image [CHAR LIMIT=20] -->
-    <string name="original">Original</string>
-    <!--  Text for original image [CHAR LIMIT=20] -->
-    <string name="saved">Saved</string>
-    <!--  Text for filters that apply a border to a picture [CHAR LIMIT=20] -->
-    <string name="borders" msgid="4461692156695893616">Borders</string>
-
-    <!--  actionbar menu -->
-
-    <!--  Text for the undo menu item [CHAR LIMIT=20] -->
-    <string name="filtershow_undo">Undo</string>
-    <!--  Text for redo menu item [CHAR LIMIT=20] -->
-    <string name="filtershow_redo">Redo</string>
-    <!--  Text for the image menu item showing the filters that have been applied [CHAR LIMIT=30] -->
-    <string name="show_imagestate_panel">Show Applied Effects</string>
-    <!--  Text for the image state panel menu item [CHAR LIMIT=30] -->
-    <string name="hide_imagestate_panel">Hide Applied Effects</string>
-    <!--  Text for the menu item to export a flattened photo[CHAR LIMIT=30] -->
-    <string name="export_flattened">Export Flattened Image</string>
-    <!--  Text for selecting export image quality [CHAR LIMIT=100] -->
-    <string name="select_compression">Select output quality.</string>
-    <!--  Text for quality value tag [CHAR LIMIT=30] -->
-    <string name="quality">Quality</string>
-
-    <!--  Name for the overflow menu item for settings [CHAR LIMIT=20] -->
-    <string name="menu_settings">Settings</string>
-
-    <!--  Exit Dialog -->
-
-    <!--  String displayed when exiting with unsaved changes [CHAR LIMIT=NONE] -->
-    <string name="unsaved">There are unsaved changes to this image.</string>
-    <!--  String displayed when exiting with unsaved changes [CHAR LIMIT=NONE] -->
-    <string name="save_before_exit">Do you want to save before exiting?</string>
-    <!--  String displayed when saving and exiting editor [CHAR LIMIT=NONE] -->
-    <string name="save_and_exit">Save and Exit</string>
-    <!--  String displayed when exiting editor[CHAR LIMIT=NONE] -->
-    <string name="exit">Exit</string>
-
-    <!--  History Panel -->
-
-    <!--  Text for the history panel title [CHAR LIMIT=50] -->
-    <string name="history">History</string>
-    <!--  Text for the history panel reset button [CHAR LIMIT=20]-->
-    <string name="reset">Reset</string>
-    <!--  Text for the original image[CHAR LIMIT=20]-->
-    <string name="history_original">@string/original</string>
-
-    <!--  Image state panel -->
-
-    <!--  Text for the image state panel title [CHAR LIMIT=50] -->
-    <string name="imageState">Applied Effects</string>
-
-    <!--  Additional filters buttons  -->
-
-    <!--  Label for the compare original image filter button [CHAR LIMIT=15] -->
-    <string name="compare_original">Compare</string>
-    <!--  Label for the apply effect button [CHAR LIMIT=15] -->
-    <string name="apply_effect">Apply</string>
-    <!--  Label for the reset effect button [CHAR LIMIT=15] -->
-    <string name="reset_effect">Reset</string>
-    <!--  Label for aspect [CHAR LIMIT=15] -->
-    <string name="aspect">Aspect</string>
-    <!--  Label for the aspect 1:1 effect [CHAR LIMIT=15] -->
-    <string name="aspect1to1_effect">1:1</string>
-    <!--  Label for the aspect 4:3 effect [CHAR LIMIT=15] -->
-    <string name="aspect4to3_effect">4:3</string>
-    <!--  Label for the aspect 3:4 effect [CHAR LIMIT=15] -->
-    <string name="aspect3to4_effect">3:4</string>
-    <!--  Label for the aspect 4:7 effect [CHAR LIMIT=15] -->
-    <string name="aspect4to6_effect">4:6</string>
-    <!--  Label for the aspect 5:7 effect [CHAR LIMIT=15] -->
-    <string name="aspect5to7_effect">5:7</string>
-    <!--  Label for the aspect 7:5 effect [CHAR LIMIT=15] -->
-    <string name="aspect7to5_effect">7:5</string>
-    <!--  Label for the aspect 1:1 effect [CHAR LIMIT=15] -->
-    <string name="aspect9to16_effect">16:9</string>
-    <!--  Label for the aspect None effect [CHAR LIMIT=15] -->
-    <string name="aspectNone_effect">None</string>
-    <!--  Label for the aspect None effect [CHAR LIMIT=15] -->
-    <string name="aspectOriginal_effect">@string/original</string>
-    <!-- Label for when the aspect ratio is fixed to a value [CHAR LIMIT=15] -->
-    <string name="Fixed">Fixed</string>
-    <!--  Label for the tuny planet effect [CHAR LIMIT=10] -->
-    <string name="tinyplanet">Tiny Planet</string>
-
-    <!--  Filters buttons -->
-
-    <!--  Label for the image exposure (brightness) filter button [CHAR LIMIT=10] -->
-    <string name="exposure" msgid="1229093066434614811">Exposure</string>
-    <!--  Label for the image sharpness (clarity, distinctness) filter button [CHAR LIMIT=10] -->
-    <string name="sharpness">Sharpness</string>
-    <!--  Label for the image contrast (color difference) filter button [CHAR LIMIT=10] -->
-    <string name="contrast">Contrast</string>
-    <!--  Label for the image vibrance (strengthens colors) filter button [CHAR LIMIT=10] -->
-    <string name="vibrance">Vibrance</string>
-    <!--  Label for the image saturation (brightens colors) filter button [CHAR LIMIT=10] -->
-    <string name="saturation">Saturation</string>
-    <!--  Label for the image BW filter (makes black & white) button [CHAR LIMIT=10] -->
-    <string name="bwfilter">BW Filter</string>
-    <!--  Label for the image Autocolor filter (makes off-white colors whiter) button [CHAR LIMIT=10] -->
-    <string name="wbalance">Autocolor</string>
-    <!--  Label for the image Hue filter (color, shade, tinge, tone) button [CHAR LIMIT=10] -->
-    <string name="hue">Hue</string>
-    <!--  Label for the image shadow recovery (lightens/darkens shadows) filter button [CHAR LIMIT=10] -->
-    <string name="shadow_recovery">Shadows</string>
-    <!--  Label for the image highlights recovery (lightens/darkens bright regions) filter button [CHAR LIMIT=15] -->
-    <string name="highlight_recovery">Highlights</string>
-    <!--  Label for the image curves filter button [CHAR LIMIT=10] -->
-    <string name="curvesRGB">Curves</string>
-    <!--  Label for the image vignette filter (darkens photo around edges) button [CHAR LIMIT=10] -->
-    <string name="vignette">Vignette</string>
-    <!--  Label for the image effect that removes redeye. [CHAR LIMIT=10] -->
-    <string name="redeye">Red Eye</string>
-    <!--  Label for the that allows drawing on Image [CHAR LIMIT=10] -->
-    <string name="imageDraw">Draw</string>
-    <!--  Label for the image straighten effect [CHAR LIMIT=15] -->
-    <string name="straighten" msgid="5217801513491493491">Straighten</string>
-    <!--  Label for the image crop effect [CHAR LIMIT=15] -->
-    <string name="crop" msgid="5584000454518174632">Crop</string>
-    <!--  Label for the image rotate effect [CHAR LIMIT=15] -->
-    <string name="rotate" msgid="460017689320955494">Rotate</string>
-    <!--  Label for the image flip effect [CHAR LIMIT=15] -->
-    <string name="mirror">Mirror</string>
-    <!-- Name for the photo effect that inverts photo to negative images. [CHAR LIMIT=10] -->
-    <string name="negative">Negative</string>
-    <!--  Label for having no filters applied to the image [CHAR LIMIT=10] -->
-    <string name="none" msgid="3601545724573307541">None</string>
-    <!--  Label for the image edges effect (highlights edges in image) [CHAR LIMIT=10] -->
-    <string name="edge">Edges</string>
-    <!--  Label for an image effect that replicates the "pop art" style of segmenting
-          images into solid colors, as popularized by Andy Warhol [CHAR LIMIT=10] -->
-    <string name="kmeans">Warhol</string>
-    <!--  Label for the image downsampling effect (makes image smaller) [CHAR LIMIT=15] -->
-    <string name="downsample">Downsample</string>
-    <!--  Label for the image graduated filter effect  [CHAR LIMIT=15] -->
-    <string name="grad">Graduated</string>
-    <!--  Label for the Brightness effect  [CHAR LIMIT=20] -->
-    <string name="editor_grad_brightness">Brightness</string>
-    <!--  Label for the Contrast filter effect  [CHAR LIMIT=20] -->
-    <string name="editor_grad_contrast">Contrast</string>
-    <!--  Label for the saturation effect  [CHAR LIMIT=20] -->
-    <string name="editor_grad_saturation">Saturation</string>
-    <!--  Label for the Main or Master control for per channel saturation effect [CHAR LIMIT=20] -->
-    <string name="editor_chan_sat_main">Main</string>
-    <!--  Label for the red control for per channel saturation effect [CHAR LIMIT=20] -->
-    <string name="editor_chan_sat_red">Red</string>
-    <!--  Label for the yellow control for per channel saturation effect [CHAR LIMIT=20] -->
-    <string name="editor_chan_sat_yellow">Yellow</string>
-    <!--  Label for the green control for per channel saturation effect [CHAR LIMIT=20] -->
-    <string name="editor_chan_sat_green">Green</string>
-    <!--  Label for the cyan control for per channel saturation effect [CHAR LIMIT=20] -->
-    <string name="editor_chan_sat_cyan">Cyan</string>
-    <!--  Label for the blue control for per channel saturation effect [CHAR LIMIT=20] -->
-    <string name="editor_chan_sat_blue">Blue</string>
-    <!--  Label for the Magenta control for per channel saturation effect [CHAR LIMIT=20] -->
-    <string name="editor_chan_sat_magenta">Magenta</string>
-    <!--  Label for the image graduated filter effect  [CHAR LIMIT=20] -->
-    <string name="editor_grad_style">Style</string>
-    <!--  Label for the image new grad layer  [CHAR LIMIT=20] -->
-    <string name="editor_grad_new">new</string>
-
-
-    <!--  Labels for the curves tool -->
-
-    <!--  Label for the curves tool, all channels (RGB) [CHAR LIMIT=3] -->
-    <string name="curves_channel_rgb">RGB</string>
-    <!--  Label for the curves tool, Red color channel [CHAR LIMIT=14] -->
-    <string name="curves_channel_red">Red</string>
-    <!--  Label for the curves tool, Green color channel [CHAR LIMIT=14] -->
-    <string name="curves_channel_green">Green</string>
-    <!--  Label for the curves tool, Blue color channel [CHAR LIMIT=14] -->
-    <string name="curves_channel_blue">Blue</string>
-
-    <!--  Label for the The style to draw in [CHAR LIMIT=14] -->
-    <string name="draw_style">Style</string>
-    <!--  Label for the size to draw in in [CHAR LIMIT=14] -->
-    <string name="draw_size">Size</string>
-    <!--  Label for the color to draw in [CHAR LIMIT=14] -->
-    <string name="draw_color">Color</string>
-    <!--  Label for the line style of drawing in [CHAR LIMIT=14] -->
-    <string name="draw_style_line">Lines</string>
-    <!--  Label for the Marker brush style of drawing in [CHAR LIMIT=14] -->
-    <string name="draw_style_brush_spatter">Marker</string>
-    <!--  Label for the Spatter brush style of drawing in [CHAR LIMIT=14] -->
-    <string name="draw_style_brush_marker">Spatter</string>
-    <!--  Label for the removing drawing from screen [CHAR LIMIT=14] -->
-    <string name="draw_clear">Clear</string>
-
-    <!--  Label for the select the color [CHAR LIMIT=35] -->
-    <string name="color_pick_select">Choose custom color</string>
-    <!--  The title for the color pick dialog [CHAR LIMIT=20] -->
-    <string name="color_pick_title">Select Color</string>
-    <!--  The title for draw size [CHAR LIMIT=50] -->
-    <string name="draw_size_title">Select Size</string>
-    <!--  The accept the draw size [CHAR LIMIT=20] -->
-    <string name="draw_size_accept">OK</string>
-
-    <!--  Name used to indicate the original image in the state panel [CHAR LIMIT=20] -->
-    <string name="state_panel_original">Original</string>
-
-    <!--  Name used to indicate the final image in the state panel [CHAR LIMIT=20] -->
-    <string name="state_panel_result">Result</string>
-
-    <!-- Label for the notification [CHAR LIMIT=50] -->
-    <string name="filtershow_notification_label">Saving Image</string>
-    <!-- Label for the notification message [CHAR LIMIT=50] -->
-    <string name="filtershow_notification_message">Processing...</string>
-
-    <!-- Label for the save preset menu [CHAR LIMIT=30] -->
-    <string name="filtershow_save_preset">Save current preset</string>
-    <!-- Label for the manage preset menu [CHAR LIMIT=30] -->
-    <string name="filtershow_manage_preset">Manage user presets</string>
-    <!-- Label for newly created user preset [CHAR LIMIT=30] -->
-    <string name="filtershow_new_preset">New Preset</string>
-
-</resources>
diff --git a/res/values/filtershow_styles.xml b/res/values/filtershow_styles.xml
deleted file mode 100644
index 4162ccde9..000000000
--- a/res/values/filtershow_styles.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2012 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>
-
-    <style name="FilterShowHistoryButton">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">48dip</item>
-        <item name="android:layout_weight">1</item>
-        <item name="android:background">@drawable/filtershow_button_background</item>
-        <item name="android:gravity">center</item>
-        <item name="android:padding">2dip</item>
-        <item name="android:textColor">@android:color/white</item>
-        <item name="android:textSize">18dip</item>
-        <item name="android:textStyle">bold</item>
-    </style>
-
-    <style name="FilterShowTopButton">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">match_parent</item>
-        <item name="android:background">@drawable/filtershow_button_background</item>
-        <item name="android:gravity">center</item>
-        <item name="android:padding">8dip</item>
-        <item name="android:textColor">@android:color/white</item>
-        <item name="android:textSize">18dip</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:scaleType">centerInside</item>
-    </style>
-
-    <style name="FilterShowBottomButton">
-        <item name="android:layout_width">96dip</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:background">@drawable/filtershow_button_background</item>
-        <item name="android:gravity">center</item>
-        <item name="android:paddingBottom">16dip</item>
-        <item name="android:textColor">@android:color/white</item>
-        <item name="android:textSize">18dip</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:scaleType">centerInside</item>
-    </style>
-
-    <style name="FilterShowSlider">
-        <item name="android:indeterminateOnly">false</item>
-        <item name="android:progressDrawable">@drawable/filtershow_slider</item>
-        <item name="android:indeterminateDrawable">@drawable/filtershow_slider</item>
-        <item name="android:minHeight">13dip</item>
-        <item name="android:maxHeight">13dip</item>
-        <item name="android:thumb">@drawable/filtershow_scrubber</item>
-        <item name="android:thumbOffset">16dip</item>
-        <item name="android:focusable">true</item>
-        <item name="android:paddingStart">16dip</item>
-        <item name="android:paddingEnd">16dip</item>
-    </style>
-
-</resources>
\ No newline at end of file
diff --git a/res/values/filtershow_values.xml b/res/values/filtershow_values.xml
deleted file mode 100644
index 0bb59c06a..000000000
--- a/res/values/filtershow_values.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
-     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>
-    <!-- Specify the screen orientation -->
-    <bool name="only_use_portrait">true</bool>
-
-    <!-- Text size for the state panel -->
-    <dimen name="state_panel_text_size">16dip</dimen>
-
-    <!-- Category Panel Height -->
-    <dimen name="category_panel_height">86dip</dimen>
-
-    <!-- Category Panel Icon Size -->
-    <dimen name="category_panel_icon_size">64dip</dimen>
-
-    <!-- Category Panel Text Size -->
-    <dimen name="category_panel_text_size">13dip</dimen>
-
-    <!-- Category Panel Text Size -->
-    <dimen name="category_panel_margin">4dip</dimen>
-
-    <!-- Grad filter dot size -->
-    <dimen name="gradcontrol_dot_size">20dip</dimen>
-
-    <!-- Grad filter minimum touch distance -->
-    <dimen name="gradcontrol_min_touch_dist">80dip</dimen>
-
-
-</resources>
\ No newline at end of file
diff --git a/res/values/filtershow_values_attrs.xml b/res/values/filtershow_values_attrs.xml
deleted file mode 100644
index 32a3a871b..000000000
--- a/res/values/filtershow_values_attrs.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 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>
-    <declare-styleable name="ImageButtonTitle">
-        <attr name="android:text"/>
-        <attr name="android:textColor"/>
-    </declare-styleable>
-    <declare-styleable name="CenteredLinearLayout">
-        <attr name="max_width" format="dimension" />
-    </declare-styleable>
-    <declare-styleable name="StatePanelTrack">
-        <attr name="elemSize" format="dimension" />
-        <attr name="elemEndSize" format="dimension" />
-    </declare-styleable>
-    <declare-styleable name="CategoryTrack">
-        <attr name="iconSize" format="dimension" />
-    </declare-styleable>
-</resources>
\ No newline at end of file
diff --git a/res/values/iconbutton_styles.xml b/res/values/iconbutton_styles.xml
deleted file mode 100644
index e33460af2..000000000
--- a/res/values/iconbutton_styles.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2012 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>
-    <style name="IconButton">
-        <item name="android:layout_width">96dp</item>
-        <item name="android:layout_height">match_parent</item>
-        <item name="android:background">@drawable/filtershow_button_background</item>
-        <item name="android:textColor">@android:color/white</item>
-        <item name="android:textSize">14dp</item>
-        <item name="android:scaleType">centerInside</item>
-        <item name="android:gravity">center</item>
-        <item name="android:padding">6dp</item>
-        <item name="android:drawablePadding">6dp</item>
-        <item name="android:ellipsize">marquee</item>
-        <item name="android:marqueeRepeatLimit">marquee_forever</item>
-        <item name="android:singleLine">true</item>
-    </style>
-
-    <style name="FilterIconButton">
-        <item name="android:layout_width">70dp</item>
-        <item name="android:layout_height">match_parent</item>
-        <item name="android:background">@drawable/filtershow_button_background</item>
-        <item name="android:textColor">@android:color/white</item>
-        <item name="android:textSize">13dp</item>
-        <item name="android:scaleType">centerInside</item>
-        <item name="android:gravity">center</item>
-        <item name="android:paddingLeft">3dp</item>
-        <item name="android:paddingRight">3dp</item>
-        <item name="android:paddingTop">6dp</item>
-        <item name="android:paddingBottom">6dp</item>
-        <item name="android:ellipsize">marquee</item>
-        <item name="android:marqueeRepeatLimit">marquee_forever</item>
-        <item name="android:singleLine">true</item>
-    </style>
-</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f2d69c8c3..cd0df0548 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -15,7 +15,8 @@
 -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name">Gallery</string>
+    <string name="app_name">Camera++</string>
+    <string name="camera_2">Camera++</string>
     <!-- Title for picture frame gadget to show in list of all available gadgets -->
     <string name="gadget_title">Picture frame</string>
 
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 67c53f819..655c65932 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -15,7 +15,7 @@
 -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <style name="Theme.GalleryBase" parent="android:Theme.Holo">
+<!--     <style name="Theme.GalleryBase" parent="android:Theme.Holo">
         <item name="listPreferredItemHeightSmall">48dp</item>
         <item name="switchStyle">@android:style/Widget.CompoundButton</item>
     </style>
@@ -50,7 +50,7 @@
     <style name="ActionBarTwoLineSecondary" parent="@android:style/TextAppearance.Holo.Widget.ActionBar.Subtitle"></style>
     <style name="ActionBarTwoLineItem">
         <item name="android:background">@drawable/action_bar_two_line_background</item>
-    </style>
+    </style> -->
 
     <!-- Camera resources below -->