Implement 24 hour Geolocation infobar

Remove GeolocationPermissionPromt code as now its handled by infobar.
Remove LocationButton from navigation bar.

Change-Id: Id1c78da371556d1366afe22012f3b2efff803a39

4 files changed, 0 insertions, 112 deletions

diff --git a/res/layout-sw600dp/title_bar_nav.xml b/res/layout-sw600dp/title_bar_nav.xml
index 35952394..31b375ce 100644
--- a/res/layout-sw600dp/title_bar_nav.xml
+++ b/res/layout-sw600dp/title_bar_nav.xml
@@ -56,12 +56,6 @@
         android:layout_weight="1.0"
         android:orientation="horizontal">
 
-        <com.android.browser.LocationButton
-            android:id="@+id/location_button"
-            style="@style/NavButton"
-            android:layout_width="48dp"
-            android:visibility="gone" />
-
         <ImageView
             android:id="@+id/url_icon"
             android:layout_width="32dip"
diff --git a/res/layout/geolocation_permissions_prompt.xml b/res/layout/geolocation_permissions_prompt.xml
deleted file mode 100755
index 9a345d63..00000000
--- a/res/layout/geolocation_permissions_prompt.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 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.
-
-     This is the layout for the Geolocation permissions prompt.
--->
-
-<com.android.browser.GeolocationPermissionsPrompt
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="@color/TabPassiveMessageBackground"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <!-- Cosmetic separator -->
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="@color/TabPassiveMessageLine" />
-
-    <!-- 'google.com wants to know your location' -->
-    <TextView android:id="@+id/message"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingBottom="4dp"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
-        android:paddingTop="16dp"
-        android:textAppearance="?android:attr/textAppearanceSmall" />
-
-    <CheckBox
-        android:id="@+id/remember"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="8dp"
-        android:text="@string/geolocation_permissions_prompt_remember"
-        android:textAppearance="?android:attr/textAppearanceSmall" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:divider="?android:attr/dividerHorizontal"
-        android:showDividers="beginning"
-        android:layout_marginTop="8dp"
-        android:dividerPadding="16dip" >
-        <LinearLayout
-            style="?android:attr/buttonBarStyle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:paddingStart="2dip"
-            android:paddingEnd="2dip"
-            android:measureWithLargestChild="true"
-            android:background="@null">
-            <Button
-                android:id="@+id/dont_share_button"
-                style="?android:attr/buttonBarButtonStyle"
-                android:layout_weight="1"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/geolocation_permissions_prompt_dont_share" />
-            <Button
-                android:id="@+id/share_for_limited_time_button"
-                style="?android:attr/buttonBarButtonStyle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/geolocation_permissions_prompt_share_for_limited_time"/>
-            <Button
-                android:id="@+id/share_button"
-                style="?android:attr/buttonBarButtonStyle"
-                android:layout_weight="1"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/geolocation_permissions_prompt_share" />
-        </LinearLayout>
-    </LinearLayout>
-
-</com.android.browser.GeolocationPermissionsPrompt>
diff --git a/res/layout/tab.xml b/res/layout/tab.xml
index 0c259010..a72cbe48 100755
--- a/res/layout/tab.xml
+++ b/res/layout/tab.xml
@@ -135,11 +135,4 @@
 
     </LinearLayout>
 
-    <!-- Geolocation permissions prompt -->
-    <ViewStub android:id="@+id/geolocation_permissions_prompt"
-        android:layout="@layout/geolocation_permissions_prompt"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-
-
 </com.android.browser.DraggableFrameLayout>
diff --git a/res/layout/title_bar_nav.xml b/res/layout/title_bar_nav.xml
index 83ef6bd1..d7ab2b11 100644
--- a/res/layout/title_bar_nav.xml
+++ b/res/layout/title_bar_nav.xml
@@ -36,13 +36,6 @@
             android:src="@drawable/ic_deco_incognito_normal"
             android:visibility="gone" />
 
-        <com.android.browser.LocationButton
-            android:id="@+id/location_button"
-            style="@style/NavButton"
-            android:layout_width="wrap_content"
-            android:paddingEnd="2dp"
-            android:visibility="gone" />
-
         <ImageView
             android:id="@+id/magnify"
             android:layout_width="44dp"