commit f344d03c0b01d30575ba1ddd1ed340705c6f5a97
author Steve Block <steveblock@google.com> Thu Jul 30 10:50:45 2009 +0100
committer Steve Block <steveblock@google.com> Thu Jul 30 11:46:08 2009 +0100
tree 1d5cd67145e899b91d144a592b20a6c76720d36b
parent 734d07bb3ce3b65b51289143ca51013df01c1bd6

Adds browser settings menu entries for Geolocation permissions.

res/xml/browser_preferences.xml

diff --git a/res/xml/browser_preferences.xml b/res/xml/browser_preferences.xml
index dffb550..83c492e 100644
--- a/res/xml/browser_preferences.xml
+++ b/res/xml/browser_preferences.xml
@@ -134,23 +134,20 @@
                 android:dialogTitle="@string/clear" 
                 android:dialogIcon="@android:drawable/ic_dialog_alert"/>
 
-        <!-- below preferences will be shown when html5 location is implemented -->
-        <!--
-
         <CheckBoxPreference
-                android:key="request_location"
+                android:key="enable_geolocation"
                 android:defaultValue="true"
-                android:title="@string/pref_privacy_request_location"
-                android:summary="@string/pref_privacy_request_location_summary" />
+                android:title="@string/pref_privacy_enable_geolocation"
+                android:summary="@string/pref_privacy_enable_geolocation_summary" />
 
         <com.android.browser.BrowserYesNoPreference
-                android:key="privacy_clear_location_requests"
-                android:title="@string/pref_privacy_clear_location_requests"
-                android:summary="@string/pref_privacy_clear_location_requests_summary"
-                android:dialogMessage="@string/pref_privacy_clear_location_requests_dlg"
+                android:key="privacy_clear_geolocation_access"
+                android:dependency="enable_geolocation"
+                android:title="@string/pref_privacy_clear_geolocation_access"
+                android:summary="@string/pref_privacy_clear_geolocation_access_summary"
+                android:dialogMessage="@string/pref_privacy_clear_geolocation_access_dlg"
                 android:dialogTitle="@string/clear"
                 android:dialogIcon="@android:drawable/ic_dialog_alert"/>
-        -->
 
     </PreferenceCategory>