From 18bdb14e56c95bef4cdcb7fbd2187ed204b90399 Mon Sep 17 00:00:00 2001
From: Doug Zongker <dougz@android.com>
Date: Fri, 26 Feb 2010 12:51:21 -0800
Subject: [PATCH] remove unused GoogleWebContentHelper resources

GoogleWebContentHelper now builds against the SDK, so remove these
resources (which it can't use any more).

b/2408470 - google-common needs to build against the SDK

Change-Id: I48556937ebcb5682d02ad48050299ffd6deed9ae
---
 .../google_web_content_helper_layout.xml      | 60 -------------------
 core/res/res/values/strings.xml               |  5 +-
 2 files changed, 1 insertion(+), 64 deletions(-)
 delete mode 100644 core/res/res/layout/google_web_content_helper_layout.xml

diff --git a/core/res/res/layout/google_web_content_helper_layout.xml b/core/res/res/layout/google_web_content_helper_layout.xml
deleted file mode 100644
index f16ffc9e88630..0000000000000
--- a/core/res/res/layout/google_web_content_helper_layout.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 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.
--->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:foregroundGravity="center"
-        android:measureAllChildren="false">
-        
-    <LinearLayout android:id="@+id/progressContainer"
-                  android:orientation="horizontal"
-                  android:layout_gravity="center"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:baselineAligned="false"
-                  android:paddingLeft="8dip"
-                  android:paddingTop="10dip"
-                  android:paddingRight="8dip"
-                  android:paddingBottom="10dip">
-
-        <ProgressBar android:id="@android:id/progress"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:max="10000"
-            android:layout_marginRight="12dip" />
-
-        <TextView android:id="@+id/message"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical" />
-    </LinearLayout>
-            
-    <WebView
-            android:id="@+id/web"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:visibility="invisible"
-            />
-    
-    <TextView
-            android:id="@+id/text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:visibility="gone"
-            android:padding="10dip"
-            />
-    
-</FrameLayout> 
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index b5c59c5a975d3..1c15f12bdb3c5 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -790,7 +790,7 @@
     <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
     <string name="permdesc_writeCalendar">Allows an application to add or change the 
         events on your calendar, which may send email to guests. Malicious applications can use this 
-	to erase or modify your calendar events or to send email to guests.</string>
+        to erase or modify your calendar events or to send email to guests.</string>
 
     <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
     <string name="permlab_accessMockLocation">mock location sources for testing</string>
@@ -2047,9 +2047,6 @@
     <!-- When installing an application, the less-dangerous permissions are hidden.  This is the text to show those. -->
     <string name="perms_show_all"><b>Show all</b></string>
 
-    <!-- Shown when there is content loading from the internet into a dialog. -->
-    <string name="googlewebcontenthelper_loading">Loading\u2026</string>
-
     <!-- USB storage dialog strings -->
     <!-- This is the title for the activity's window. -->
     <string name="usb_storage_activity_title">USB Mass Storage</string>