More resource cleanup.

journeyapps · Apr 4, 2015 · 4c242b8 · 4c242b8
1 parent ccbe025
commit 4c242b8
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 23 deletions.
diff --git a/...-android/res-orig/values/zxing_colors.xml → zxing-android/res/values/zxing_colors.xml b/...-android/res-orig/values/zxing_colors.xml → zxing-android/res/values/zxing_colors.xml
@@ -15,11 +15,7 @@
  limitations under the License.
  -->
 <resources>
-  <color name="zxing_contents_text">#ff000000</color>
   <color name="zxing_possible_result_points">#c0ffbd21</color> <!-- Android standard ICS color -->
-  <color name="zxing_result_minor_text">#ffc0c0c0</color>
-  <color name="zxing_result_points">#c099cc00</color> <!-- Android standard ICS color -->
-  <color name="zxing_result_text">#ffffffff</color>
   <color name="zxing_result_view">#b0000000</color>
   <color name="zxing_status_text">#ffffffff</color>
   <color name="zxing_transparent">#00000000</color>

diff --git a/zxing-android/res/values/zxing_ids.xml b/zxing-android/res/values/zxing_ids.xml
@@ -21,4 +21,5 @@
   <item type="id" name="zxing_possible_result_points"/>
   <item type="id" name="zxing_back_button"/>
   <item type="id" name="zxing_prewiew_size_ready"/>
+  <item type="id" name="zxing_camera_error"/>
 </resources>
diff --git a/zxing-android/update.rb b/zxing-android/update.rb
@@ -1,8 +1,6 @@
 require 'fileutils'
 
 `rm -rf src-orig/* res-orig/*`
-`cp -r ../zxing-android-complete/android-core-src/* src-orig/`
-`cp -r ../zxing-android-complete/src/* src-orig/`
 `cp -r ../zxing-android-complete/res/* res-orig/`
 
 def remove_all prefix, globs
@@ -25,23 +23,6 @@ def process(files)
   end
 end
 
-# Remove unsused source files
-orig_prefix = 'src-orig/com/google/zxing/client/android/'
-
-# We have custom versions of each of these files - remove the original ones and log the diff
-FileUtils.rm_f 'source.patch'
-Dir['src/com/google/zxing/client/android/**/*.java'].each do |our_file|
-  orig_file = our_file.gsub(/src/, 'src-orig')
-  if File.exists? orig_file
-    `git diff --no-index #{orig_file} #{our_file} >> source.patch`
-    FileUtils.rm orig_file
-  end
-end
-
-
-remove_all orig_prefix, %w(HttpHelper.java HelpActivity.java ScanFromWebPageManager.java Contents.java IntentSource.java LocaleManager.java PreferencesFragment.java book history result share wifi clipboard encode)
-
-
 
 # Remove strings we don't use