Security and Privacy UI
- new panel for site specific settings
- hooked up favicon to site settings
- new images for security icons
- revamped settings panels to match the new
ui layouts
Change-Id: I1e872ce353e66f78e2b0530901fcbb7de69e28b4
diff --git a/res/drawable-xxhdpi/ic_action_trash_active.png b/res/drawable-xxhdpi/ic_action_trash_active.png
new file mode 100644
index 0000000..bb949ef
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_trash_active.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_trash_disabled.png b/res/drawable-xxhdpi/ic_action_trash_disabled.png
new file mode 100644
index 0000000..08d1032
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_trash_disabled.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_trash_normal.png b/res/drawable-xxhdpi/ic_action_trash_normal.png
index a06804b..cfcc525 100644
--- a/res/drawable-xxhdpi/ic_action_trash_normal.png
+++ b/res/drawable-xxhdpi/ic_action_trash_normal.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_fav_overlay_good.png b/res/drawable-xxhdpi/ic_fav_overlay_good.png
new file mode 100644
index 0000000..e5211a9
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_fav_overlay_good.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_fav_overlay_normal.png b/res/drawable-xxhdpi/ic_fav_overlay_normal.png
new file mode 100644
index 0000000..acab304
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_fav_overlay_normal.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_fav_overlay_severe.png b/res/drawable-xxhdpi/ic_fav_overlay_severe.png
new file mode 100644
index 0000000..4be624a
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_fav_overlay_severe.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_fav_overlay_warning.png b/res/drawable-xxhdpi/ic_fav_overlay_warning.png
new file mode 100644
index 0000000..d3d5255
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_fav_overlay_warning.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_sp_camera.png b/res/drawable-xxhdpi/ic_sp_camera.png
new file mode 100644
index 0000000..4542530
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_sp_camera.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_sp_cookies.png b/res/drawable-xxhdpi/ic_sp_cookies.png
new file mode 100644
index 0000000..9ec2d0c
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_sp_cookies.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_sp_level_good.png b/res/drawable-xxhdpi/ic_sp_level_good.png
new file mode 100644
index 0000000..b604099
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_sp_level_good.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_sp_level_severe.png b/res/drawable-xxhdpi/ic_sp_level_severe.png
new file mode 100644
index 0000000..699b0f3
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_sp_level_severe.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_sp_level_warning.png b/res/drawable-xxhdpi/ic_sp_level_warning.png
new file mode 100644
index 0000000..5351e24
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_sp_level_warning.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_sp_location.png b/res/drawable-xxhdpi/ic_sp_location.png
new file mode 100644
index 0000000..5ef0b87
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_sp_location.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_sp_microphone.png b/res/drawable-xxhdpi/ic_sp_microphone.png
new file mode 100644
index 0000000..5c0ac08
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_sp_microphone.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_sp_multi_choice.png b/res/drawable-xxhdpi/ic_sp_multi_choice.png
new file mode 100644
index 0000000..3525b38
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_sp_multi_choice.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_sp_popups.png b/res/drawable-xxhdpi/ic_sp_popups.png
new file mode 100644
index 0000000..ad83503
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_sp_popups.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_sp_revert.png b/res/drawable-xxhdpi/ic_sp_revert.png
new file mode 100644
index 0000000..7e20c34
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_sp_revert.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_sp_secwarnings.png b/res/drawable-xxhdpi/ic_sp_secwarnings.png
new file mode 100644
index 0000000..6295586
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_sp_secwarnings.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_sp_storage.png b/res/drawable-xxhdpi/ic_sp_storage.png
new file mode 100644
index 0000000..e0b821b
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_sp_storage.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_sp_thirdcookies.png b/res/drawable-xxhdpi/ic_sp_thirdcookies.png
new file mode 100644
index 0000000..833c00e
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_sp_thirdcookies.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_sp_webrefiner.png b/res/drawable-xxhdpi/ic_sp_webrefiner.png
new file mode 100644
index 0000000..f9ad396
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_sp_webrefiner.png
Binary files differ
diff --git a/res/drawable-xxhdpi/img_deco_dropshadow.png b/res/drawable-xxhdpi/img_deco_dropshadow.png
new file mode 100644
index 0000000..1168599
--- /dev/null
+++ b/res/drawable-xxhdpi/img_deco_dropshadow.png
Binary files differ
diff --git a/res/drawable-xxhdpi/img_deco_intrapanel.png b/res/drawable-xxhdpi/img_deco_intrapanel.png
new file mode 100644
index 0000000..211dbf2
--- /dev/null
+++ b/res/drawable-xxhdpi/img_deco_intrapanel.png
Binary files differ
diff --git a/res/drawable/ic_action_trash.xml b/res/drawable/ic_action_trash.xml
new file mode 100644
index 0000000..061b339
--- /dev/null
+++ b/res/drawable/ic_action_trash.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (c) 2015, The Linux Foundation. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of The Linux Foundation nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:state_enabled="true" android:state_pressed="true"
+ android:drawable="@drawable/ic_action_trash_active" />
+
+ <item android:state_enabled="true" android:state_selected="true"
+ android:drawable="@drawable/ic_action_trash_active" />
+
+ <item android:state_enabled="false"
+ android:drawable="@drawable/ic_action_trash_disabled" />
+
+ <item android:drawable="@drawable/ic_action_trash_normal" />
+
+</selector>
diff --git a/res/layout-v17/swe_preference_category.xml b/res/layout-v17/swe_preference_category.xml
new file mode 100644
index 0000000..865e0a6
--- /dev/null
+++ b/res/layout-v17/swe_preference_category.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (c) 2015, The Linux Foundation. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of The Linux Foundation nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+
+ <ImageView
+ android:layout_width="fill_parent"
+ android:layout_height="8dp" />
+
+ <ImageView
+ android:background="@drawable/img_deco_intrapanel"
+ android:layout_width="fill_parent"
+ android:layout_height="8dp" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ style="@style/PreferenceCategoryWithButtonStyle"
+ android:gravity="center_vertical" >
+
+ <TextView
+ android:id="@android:id/title"
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:textAppearance="@style/PreferenceCategoryTextStyle"
+ android:textColor="@color/accent"
+ />
+ </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-v17/swe_preference_category_first.xml b/res/layout-v17/swe_preference_category_first.xml
new file mode 100644
index 0000000..fa71aff
--- /dev/null
+++ b/res/layout-v17/swe_preference_category_first.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (c) 2015, The Linux Foundation. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of The Linux Foundation nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ style="@style/PreferenceCategoryWithButtonStyle"
+ android:gravity="center_vertical" >
+
+ <TextView
+ android:id="@android:id/title"
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:textAppearance="@style/PreferenceCategoryTextStyle"
+ android:textColor="@color/accent"
+ />
+ </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-v21/swe_preference_category.xml b/res/layout-v21/swe_preference_category.xml
new file mode 100644
index 0000000..6ab34e2
--- /dev/null
+++ b/res/layout-v21/swe_preference_category.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (c) 2015, The Linux Foundation. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of The Linux Foundation nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+
+ <ImageView
+ android:layout_width="fill_parent"
+ android:layout_height="8dp" />
+
+ <ImageView
+ android:background="@drawable/img_deco_intrapanel"
+ android:layout_width="fill_parent"
+ android:layout_height="8dp" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="16dp"
+ style="@style/PreferenceCategoryWithButtonStyle"
+ android:gravity="center_vertical" >
+
+ <TextView
+ android:id="@android:id/title"
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:textAppearance="@style/PreferenceCategoryTextStyle"
+ android:textColor="@color/accent"
+ />
+ </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-v21/swe_preference_category_first.xml b/res/layout-v21/swe_preference_category_first.xml
new file mode 100644
index 0000000..39cc118
--- /dev/null
+++ b/res/layout-v21/swe_preference_category_first.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (c) 2015, The Linux Foundation. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of The Linux Foundation nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+
+ <ImageView
+ android:layout_width="fill_parent"
+ android:layout_height="8dp" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="8dp"
+ style="@style/PreferenceCategoryWithButtonStyle"
+ android:gravity="center_vertical" >
+
+ <TextView
+ android:id="@android:id/title"
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:textAppearance="@style/PreferenceCategoryTextStyle"
+ android:textColor="@color/accent"
+ />
+ </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/site_specific_security_info.xml b/res/layout/site_specific_security_info.xml
new file mode 100644
index 0000000..31560df
--- /dev/null
+++ b/res/layout/site_specific_security_info.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (c) 2015, The Linux Foundation. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of The Linux Foundation nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/site_security_info"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingStart="?android:attr/scrollbarSize"
+ android:paddingEnd="?android:attr/scrollbarSize"
+ android:minHeight="?android:attr/listPreferredItemHeightSmall"
+ android:gravity="center_vertical"
+ android:background="?android:attr/selectableItemBackground"
+ android:layout_gravity="fill_horizontal">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+ <LinearLayout
+ android:id="@+id/site_security_error"
+ android:orientation="horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:minHeight="?android:attr/listPreferredItemHeightSmall"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:gravity="center"
+ android:src="@drawable/ic_sp_level_severe"
+ android:minWidth="40dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
+
+ <TextView
+ android:id="@+id/security_view_text"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="start" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/site_security_warning"
+ android:orientation="horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:minHeight="?android:attr/listPreferredItemHeightSmall"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:gravity="center"
+ android:src="@drawable/ic_sp_level_warning"
+ android:minWidth="40dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
+
+ <TextView
+ android:id="@id/security_view_text"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="start" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/site_security_verbose"
+ android:orientation="horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:minHeight="?android:attr/listPreferredItemHeightSmall"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:src="@drawable/ic_sp_level_good"
+ android:gravity="center"
+ android:minWidth="40dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
+
+ <TextView
+ android:id="@id/security_view_text"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="start" />
+ </LinearLayout>
+ </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/swe_preference.xml b/res/layout/swe_preference.xml
new file mode 100644
index 0000000..41356ce
--- /dev/null
+++ b/res/layout/swe_preference.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (c) 2015, The Linux Foundation. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of The Linux Foundation nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingEnd="?android:attr/scrollbarSize"
+ android:minHeight="?android:attr/listPreferredItemHeightSmall"
+ android:gravity="center_vertical" >
+ <!--android:background="?android:attr/selectableItemBackgroundBorderless"-->
+
+ <!--Padding-->
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="20dip" />
+
+ <!--Icon for preference-->
+ <ImageView
+ android:id="@+android:id/icon"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center" />
+
+ <!--Preference title and summary-->
+ <RelativeLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="10dip"
+ android:layout_marginEnd="6dip"
+ android:layout_marginTop="6dip"
+ android:layout_marginBottom="6dip"
+ android:layout_weight="1">
+
+ <TextView android:id="@+android:id/title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:singleLine="true"
+ android:textAppearance="?android:attr/textAppearanceListItemSmall"
+ android:textColor="?android:attr/textColorPrimary"
+ android:ellipsize="marquee"
+ android:fadingEdge="horizontal" />
+
+ <TextView android:id="@+android:id/summary"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@android:id/title"
+ android:layout_alignStart="@android:id/title"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="?android:attr/textColorSecondary"
+ android:maxLines="4" />
+ </RelativeLayout>
+
+ <!--Widget if any-->
+ <LinearLayout android:id="@+android:id/widget_frame"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:gravity="center_vertical"
+ android:orientation="vertical" />
+
+</LinearLayout>
diff --git a/res/layout/swe_preference_button.xml b/res/layout/swe_preference_button.xml
new file mode 100644
index 0000000..41ad886
--- /dev/null
+++ b/res/layout/swe_preference_button.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (c) 2015, The Linux Foundation. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of The Linux Foundation nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+<Button xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+android:id/title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center" />
diff --git a/res/layout/swe_preference_custom_actionbar.xml b/res/layout/swe_preference_custom_actionbar.xml
new file mode 100644
index 0000000..9dca94d
--- /dev/null
+++ b/res/layout/swe_preference_custom_actionbar.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (c) 2015, The Linux Foundation. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of The Linux Foundation nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+<Button xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/reset"
+ android:drawableEnd="@drawable/ic_sp_revert"
+ android:text="@string/pref_extras_reset_default"
+ android:background="@android:color/transparent"
+ android:layout_gravity="end"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:clickable="true"
+ />
diff --git a/res/layout/swe_preference_list_widget.xml b/res/layout/swe_preference_list_widget.xml
new file mode 100644
index 0000000..b7cf7a0
--- /dev/null
+++ b/res/layout/swe_preference_list_widget.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (c) 2015, The Linux Foundation. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of The Linux Foundation nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:background="@drawable/ic_sp_multi_choice" />
\ No newline at end of file
diff --git a/res/layout/swe_preference_storage_widget.xml b/res/layout/swe_preference_storage_widget.xml
new file mode 100644
index 0000000..b00fe69
--- /dev/null
+++ b/res/layout/swe_preference_storage_widget.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (c) 2015, The Linux Foundation. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of The Linux Foundation nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:background="@drawable/ic_sp_storage" />
diff --git a/res/layout/swe_preference_trashcan_widget.xml b/res/layout/swe_preference_trashcan_widget.xml
new file mode 100644
index 0000000..77db4ff
--- /dev/null
+++ b/res/layout/swe_preference_trashcan_widget.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (c) 2015, The Linux Foundation. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of The Linux Foundation nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:background="@drawable/ic_action_trash" />
diff --git a/res/layout/swe_website_settings.xml b/res/layout/swe_website_settings.xml
index ed95148..50d593c 100644
--- a/res/layout/swe_website_settings.xml
+++ b/res/layout/swe_website_settings.xml
@@ -30,12 +30,27 @@
android:clipToPadding="false"
android:drawSelectorOnTop="false"
android:cacheColorHint="@android:color/transparent"
+ android:divider="@null"
+ android:dividerHeight="0dp"
android:scrollbarAlwaysDrawVerticalTrack="true" />
- <Button android:id="@+id/clear_all_button"
+ <LinearLayout
+ android:orientation="horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <Button android:id="@+id/add_new_site"
+ android:layout_width="150dip"
+ android:layout_height="wrap_content"
+ android:layout_margin="5dip"
+ android:text="@string/website_settings_add_origin"
+ android:visibility="gone" />
+
+ <Button android:id="@+id/clear_all_button"
android:layout_width="150dip"
android:layout_height="wrap_content"
android:layout_margin="5dip"
android:text="@string/website_settings_clear_all"
android:visibility="gone" />
+ </LinearLayout>
</LinearLayout>
diff --git a/res/layout/title_bar_nav.xml b/res/layout/title_bar_nav.xml
index d7ab2b1..d12c4ff 100644
--- a/res/layout/title_bar_nav.xml
+++ b/res/layout/title_bar_nav.xml
@@ -52,6 +52,12 @@
android:contentDescription="@string/page_info">
<ImageView
+ android:id="@+id/favicon_badge"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"/>
+
+ <ImageView
android:id="@+id/favicon"
android:layout_width="32dip"
android:layout_height="32dip"
diff --git a/res/layout/website_settings_row.xml b/res/layout/website_settings_row.xml
index 19e998e..68c38d9 100644
--- a/res/layout/website_settings_row.xml
+++ b/res/layout/website_settings_row.xml
@@ -30,35 +30,6 @@
android:background="@drawable/bookmark_list_favicon_bg"
android:padding="2dip" />
- <LinearLayout android:id="@+id/features"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentTop="true"
- android:layout_alignParentBottom="true"
- android:layout_alignParentEnd="true"
- android:gravity="center"
- android:padding="0dip"
- android:layout_marginEnd="2dip">
-
- <ImageView android:id="@+id/location_icon"
- android:layout_width="32dip"
- android:layout_height="32dip"
- android:padding="2dip" />
-
- <ImageView android:id="@+id/usage_icon"
- android:layout_width="32dip"
- android:layout_height="32dip"
- android:padding="2dip" />
-
- <ImageView android:id="@+id/feature_icon"
- android:layout_width="32dip"
- android:layout_height="32dip"
- android:padding="2dip"
- android:layout_centerVertical="true"
- android:layout_alignParentEnd="true"
- android:visibility="gone" />
- </LinearLayout>
-
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index db717a7..d00e853 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -311,6 +311,7 @@
<string name="menu_preferences">Settings</string>
<!-- Settings screen, section title -->
<string name="pref_content_title">Content settings</string>
+ <string name="pref_content_title_summary">Web content setting</string>
<!-- Settings label [CHAR LIMIT=45]-->
<string name="pref_allow_apptabs">Allow multiple tabs per app</string>
<!-- Settings label -->
@@ -319,6 +320,7 @@
<string name="pref_content_load_images_summary">Display images on web pages</string>
<!-- Settings label [CHAR LIMIT=30] -->
<string name="pref_content_block_popups">Block pop-ups</string>
+ <string name="pref_security_allow_popups">Pop ups</string>
<!-- Settings label -->
<string name="pref_content_javascript">Enable JavaScript</string>
<!-- Settings label -->
@@ -375,6 +377,9 @@
<!-- Settings screen & section title for "General settings". These include things like
configuring bookmark syncing to Google servers and form auto fill settings. [CHAR-LIMIT=32] -->
<string name="pref_general_title">General</string>
+ <string name="pref_default_site_settings_title">Default Site Settings</string>
+ <string name="pref_site_settings_title">Site Settings</string>
+ <string name="pref_site_settings_info_panel">Security Information</string>
<!-- Settings category for sync under general settings. This includes bookmark sync with Chrome [CHAR-LIMIT=50] -->
<string name="pref_general_sync_title">Sync</string>
<!-- Settings category for autofill under general. [CHAR-LIMIT=50] -->
@@ -398,6 +403,8 @@
<string name="pref_web_refiner_enabled">Web Refiner</string>
<!-- Settings summary for the WebRefiner -->
<string name="pref_web_refiner_enabled_summary">Block advertisements and tracking</string>
+ <string name="pref_web_refiner_blocked">Blocked</string>
+ <string name="pref_web_refiner_advertisements">advertisements</string>
<!-- Label for option that when clicked opens the AutoFill settings screen. Also used as the title of that AutoFill Settings screen. [CHAR-LIMIT=32] -->
<string name="pref_autofill_profile_editor">Auto-fill text</string>
<!-- Summary for the AutoFill Settings preference [CHAR-LIMIT=none] -->
@@ -452,6 +459,7 @@
<!-- Settings screen, section title [CHAR-LIMIT=50] -->
<string name="pref_privacy_security_title">Privacy & security</string>
+ <string name="pref_privacy_security_title_summary">Browser security and privacy settings</string>
<!-- Popup dialog -->
<string name="pref_select_items">Select items to be cleared</string>
<!-- Settings label -->
@@ -469,9 +477,9 @@
<!-- Cookie settings category [CHAR-LIMIT=50] -->
<string name="pref_privacy_cookies_title">Cookies</string>
<!-- Settings label -->
- <string name="pref_privacy_clear_cookies">Cookies</string>
+ <string name="pref_privacy_clear_cookies">Cookies and Site Data</string>
<!-- Settings summary -->
- <string name="pref_privacy_clear_cookies_summary">Clear all browser cookies</string>
+ <string name="pref_privacy_clear_cookies_summary">Clear all browser cookies and site data</string>
<!-- Confirmation dialog message -->
<string name="pref_privacy_clear_cookies_dlg">Delete all cookies?</string>
<!-- Settings label -->
@@ -497,7 +505,7 @@
<!-- Location settings category [CHAR-LIMIT=50] -->
<string name="pref_privacy_location_title">Location</string>
<!-- Settings label -->
- <string name="pref_privacy_enable_geolocation">Enable location</string>
+ <string name="pref_privacy_enable_geolocation">Location</string>
<!-- Settings summary -->
<string name="pref_privacy_enable_geolocation_summary">Allow sites to request access to your location</string>
<!-- Settings label -->
@@ -528,6 +536,22 @@
<string name="pref_security_accept_cookies">Accept cookies</string>
<!-- Settings summary -->
<string name="pref_security_accept_cookies_summary">Allow sites to save and read cookie data</string>
+
+ <string name="pref_security_allow_mic">Microphone</string>
+ <string name="pref_security_allow_camera">Camera</string>
+ <string name="pref_security_web_refiner">Ads and Distracting Content</string>
+ <string name="pref_security_accept_third_party_cookies">Third Party Cookies</string>
+ <string name="pref_security_ask_before_using">Ask before using</string>
+ <string name="pref_security_allowed">Allowed</string>
+ <string name="pref_security_not_allowed">Not allowed</string>
+ <string name="pref_security_remember">Remember</string>
+ <string name="pref_security_protect">Protect by default</string>
+ <string name="pref_website_title">Website</string>
+ <string name="pref_security_add">Add</string>
+ <string name="pref_security_cancel">Cancel</string>
+ <string name="pref_security_origin_name">Site Origin</string>
+ <string name="pref_security_access_is_allowed">access is allowed</string>
+
<!-- Settings text size options - displays sample font size in settings -->
<string name="pref_sample_font_size">Drag the slider to adjust the font size to set the desired comfortable reading size.</string>
<!-- Label for minimum font size [CHAR LIMIT=30] -->
@@ -573,7 +597,7 @@
<!-- Settings screen, section title [CHAR LIMIT=50] -->
<string name="pref_extras_title">Advanced</string>
<!-- Settings label -->
- <string name="pref_extras_website_settings">Website settings</string>
+ <string name="pref_extras_website_settings">Per Site Settings</string>
<!-- Settings summary -->
<string name="pref_extras_website_settings_summary">Advanced settings for individual websites</string>
<!-- Settings category label [CHAR-LIMIT=50] -->
@@ -675,6 +699,7 @@
<!-- Title for accessibility settings [CHAR LIMIT=25] -->
<string name="pref_accessibility_title">Accessibility</string>
+ <string name="pref_accessibility_title_summary">Text size and zooming</string>
<!-- Font size settings category under accessibility settings [CHAR LIMIT=50] -->
<string name="pref_font_size_category">Text size</string>
<!-- Title for lab settings [CHAR LIMIT=25] -->
@@ -863,7 +888,8 @@
<string name="webstorage_outofspace_notification_title">Browser storage full</string>
<string name="webstorage_outofspace_notification_text">Touch to free up space.</string>
<!-- Used in the Browser Settings -->
- <string name="webstorage_clear_data_title">Clear stored data</string>
+ <string name="webstorage_clear_data_title">Storage</string>
+ <string name="webstorage_private_data_title">Private Data</string>
<!-- Confirmation dialog when the user ask to clear all data for an origin -->
<string name="webstorage_clear_data_dialog_message">Delete all data stored by this website?</string>
@@ -894,11 +920,11 @@
<item>Deny forever</item>
<item>Allow for 24 hours</item>
<item>Allow forever</item>
- <item>Always ask</item>
</string-array>
<string name="geolocation_settings_page_dialog_ok_button">OK</string>
<string name="geolocation_settings_page_dialog_cancel_button">Cancel</string>
+ <string name="website_settings_add_origin">New Site</string>
<!-- Label for the menu item in the website settings activity used to clear data stored by all websites -->
<string name="website_settings_clear_all">Clear all</string>
<string name="website_settings_clear_all_dialog_message">Delete all website data and location permissions?</string>
diff --git a/res/xml/accessibility_preferences.xml b/res/xml/accessibility_preferences.xml
index 68bc484..506a9ed 100644
--- a/res/xml/accessibility_preferences.xml
+++ b/res/xml/accessibility_preferences.xml
@@ -17,7 +17,9 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android">
- <PreferenceCategory android:title="@string/pref_font_size_category">
+ <PreferenceCategory
+ android:layout="@layout/swe_preference_category_first"
+ android:title="@string/pref_font_size_category">
<com.android.browser.preferences.FontSizePreview android:title="@string/preview" />
<com.android.browser.preferences.SeekBarSummaryPreference
android:defaultValue="10"
@@ -31,7 +33,7 @@
android:max="20"
android:title="@string/pref_min_font_size" />
- <CheckBoxPreference
+ <SwitchPreference
android:defaultValue="false"
android:key="force_userscalable"
android:summary="@string/pref_force_userscalable_summary"
diff --git a/res/xml/bandwidth_preferences.xml b/res/xml/bandwidth_preferences.xml
index 9946b48..a31d0e8 100644
--- a/res/xml/bandwidth_preferences.xml
+++ b/res/xml/bandwidth_preferences.xml
@@ -32,7 +32,7 @@
android:entryValues="@array/pref_link_prefetch_values"
android:dialogTitle="@string/pref_link_prefetch_dialogtitle" />
- <CheckBoxPreference
+ <SwitchPreference
android:key="load_images"
android:defaultValue="true"
android:title="@string/pref_content_load_images"
diff --git a/res/xml/content_preferences.xml b/res/xml/content_preferences.xml
new file mode 100644
index 0000000..68fc90a
--- /dev/null
+++ b/res/xml/content_preferences.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (c) 2015, The Linux Foundation. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of The Linux Foundation nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ android:key="content_settings">
+ <SwitchPreference
+ android:layout="@layout/swe_preference"
+ android:defaultValue="false"
+ android:key="open_in_background"
+ android:summary="@string/pref_content_open_in_background_summary"
+ android:title="@string/pref_content_open_in_background" />
+
+ <SwitchPreference
+ android:layout="@layout/swe_preference"
+ android:defaultValue="true"
+ android:key="enable_javascript"
+ android:title="@string/pref_content_javascript" />
+
+ <PreferenceScreen
+ android:key="download_path_setting_screen"
+ android:title="@string/pref_download_path_setting_screen_title"/>
+
+ <ListPreference
+ android:layout="@layout/swe_preference"
+ android:widgetLayout="@layout/swe_preference_list_widget"
+ android:defaultValue="@string/pref_default_text_encoding_default"
+ android:dialogTitle="@string/pref_default_text_encoding_dialogtitle"
+ android:entries="@array/pref_default_text_encoding_choices"
+ android:entryValues="@array/pref_default_text_encoding_values"
+ android:key="default_text_encoding"
+ android:title="@string/pref_default_text_encoding" />
+
+ <SwitchPreference
+ android:layout="@layout/swe_preference"
+ android:key="load_images"
+ android:defaultValue="true"
+ android:title="@string/pref_content_load_images"
+ android:summary="@string/pref_content_load_images_summary" />
+
+</PreferenceScreen>
diff --git a/res/xml/debug_preferences.xml b/res/xml/debug_preferences.xml
index dc6b723..f23ce12 100644
--- a/res/xml/debug_preferences.xml
+++ b/res/xml/debug_preferences.xml
@@ -17,58 +17,69 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android" >
- <CheckBoxPreference
+ <SwitchPreference
+ android:layout="@layout/swe_preference"
android:key="enable_hardware_accel"
android:defaultValue="true"
android:title="@string/pref_development_hardware_accel" />
- <CheckBoxPreference
+ <SwitchPreference
+ android:layout="@layout/swe_preference"
android:key="enable_hardware_accel_skia"
android:defaultValue="false"
android:title="@string/pref_development_hardware_accel_skia"
android:enabled="false" />
- <CheckBoxPreference
+ <SwitchPreference
+ android:layout="@layout/swe_preference"
android:key="enable_visual_indicator"
android:defaultValue="false"
android:title="@string/pref_development_visual_indicator" />
- <CheckBoxPreference
+ <SwitchPreference
+ android:layout="@layout/swe_preference"
android:key="enable_cpu_upload_path"
android:defaultValue="false"
android:title="@string/pref_development_cpu_upload_path" />
- <CheckBoxPreference
+ <SwitchPreference
+ android:layout="@layout/swe_preference"
android:key="small_screen"
android:defaultValue="false"
android:title="@string/pref_development_single_column_rendering" />
- <CheckBoxPreference
+ <SwitchPreference
+ android:layout="@layout/swe_preference"
android:key="wide_viewport"
android:defaultValue="true"
android:title="@string/pref_development_viewport" />
- <CheckBoxPreference
+ <SwitchPreference
+ android:layout="@layout/swe_preference"
android:key="normal_layout"
android:defaultValue="false"
android:title="@string/pref_development_normal_rendering" />
- <CheckBoxPreference
+ <SwitchPreference
+ android:layout="@layout/swe_preference"
android:key="enable_tracing"
android:defaultValue="false"
android:title="@string/pref_development_trace" />
- <CheckBoxPreference
+ <SwitchPreference
+ android:layout="@layout/swe_preference"
android:key="enable_light_touch"
android:defaultValue="false"
android:title="Enable light touch" />
- <CheckBoxPreference
+ <SwitchPreference
+ android:layout="@layout/swe_preference"
android:key="enable_nav_dump"
android:defaultValue="false"
android:title="@string/pref_development_nav_dump" />
<EditTextPreference
+ android:layout="@layout/swe_preference"
android:key="js_engine_flags"
android:title="@string/js_engine_flags"
android:singleLine="true" />
diff --git a/res/xml/download_settings_preferences.xml b/res/xml/download_settings_preferences.xml
index 0cd99a9..91a1859 100644
--- a/res/xml/download_settings_preferences.xml
+++ b/res/xml/download_settings_preferences.xml
@@ -31,9 +31,10 @@
xmlns:android="http://schemas.android.com/apk/res/android" >
<PreferenceCategory
- android:title="@string/pref_download_title"
- android:key="download_path_setting_category">
- <PreferenceScreen
+ android:layout="@layout/swe_preference_category_first"
+ android:title="@string/pref_download_title"
+ android:key="download_path_setting_category">
+ <PreferenceScreen
android:key="download_path_setting_screen"
android:title="@string/pref_download_path_setting_screen_title"/>
diff --git a/res/xml/general_preferences.xml b/res/xml/general_preferences.xml
index 816503b..7571a6a 100644
--- a/res/xml/general_preferences.xml
+++ b/res/xml/general_preferences.xml
@@ -16,204 +16,94 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
- <PreferenceCategory android:title="@string/pref_general_title">
+ <PreferenceCategory
+ android:layout="@layout/swe_preference_category_first"
+ android:title="@string/pref_general_title">
<com.android.browser.preferences.NonformattingListPreference
+ android:layout="@layout/swe_preference"
+ android:widgetLayout="@layout/swe_preference_list_widget"
android:key="homepage_picker"
android:entries="@array/pref_homepage_choices"
android:entryValues="@array/pref_homepage_values"
android:title="@string/pref_content_homepage" />
<com.android.browser.search.SearchEnginePreference
+ android:layout="@layout/swe_preference"
+ android:widgetLayout="@layout/swe_preference_list_widget"
android:defaultValue="@string/default_search_engine_value"
android:dialogTitle="@string/pref_content_search_engine"
android:key="search_engine"
android:summary="@string/pref_content_search_engine_summary"
android:title="@string/pref_content_search_engine" />
- <CheckBoxPreference
+ <SwitchPreference
+ android:layout="@layout/swe_preference"
android:defaultValue="false"
android:key="fullscreen"
android:summary="@string/pref_lab_fullscreen_summary"
android:title="@string/pref_lab_fullscreen" />
- <CheckBoxPreference
+ <SwitchPreference
+ android:layout="@layout/swe_preference"
android:defaultValue="false"
android:key="powersave_enabled"
android:summary="@string/pref_powersave_enabled_summary"
android:title="@string/pref_powersave_enabled" />
- <CheckBoxPreference
+ <SwitchPreference
+ android:layout="@layout/swe_preference"
android:defaultValue="false"
android:key="nightmode_enabled"
android:summary="@string/pref_nightmode_enabled_summary"
android:title="@string/pref_nightmode_enabled" />
- <CheckBoxPreference
+ <SwitchPreference
+ android:layout="@layout/swe_preference"
android:key="autofill_enabled"
android:title="@string/pref_autofill_enabled"
android:summary="@string/pref_autofill_enabled_summary"
android:defaultValue="true" />
- <CheckBoxPreference
- android:key="web_refiner_enabled"
- android:title="@string/pref_web_refiner_enabled"
- android:summary="@string/pref_web_refiner_enabled_summary"
- android:defaultValue="true" />
-
<PreferenceScreen
+ android:layout="@layout/swe_preference"
android:key="autofill_profile"
android:title="@string/pref_autofill_profile_editor"
android:summary="@string/pref_autofill_profile_editor_summary" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/pref_extras_title"
+ android:layout="@layout/swe_preference_category"
android:key="advanced">
<PreferenceScreen android:title="@string/pref_privacy_security_title"
- android:key="privacy_security">
- <PreferenceScreen android:title="@string/webstorage_clear_data_title"
- android:key="clear_data">
- <com.android.browser.BrowserYesNoPreference
- android:dialogIcon="@android:drawable/ic_dialog_alert"
- android:dialogMessage="@string/pref_privacy_clear_selected_dlg"
- android:key="privacy_clear_selected"
- android:summary="@string/pref_privacy_clear_selected_summary"
- android:title="@string/pref_privacy_clear_selected" />
-
- <CheckBoxPreference
- android:defaultValue="true"
- android:key="privacy_clear_history"
- android:summary="@string/pref_privacy_clear_history_summary"
- android:title="@string/pref_privacy_clear_history" />
-
- <CheckBoxPreference
- android:defaultValue="true"
- android:key="privacy_clear_cache"
- android:summary="@string/pref_privacy_clear_cache_summary"
- android:title="@string/pref_privacy_clear_cache" />
-
- <CheckBoxPreference
- android:defaultValue="true"
- android:key="privacy_clear_cookies"
- android:summary="@string/pref_privacy_clear_cookies_summary"
- android:title="@string/pref_privacy_clear_cookies" />
-
- <CheckBoxPreference
- android:defaultValue="true"
- android:key="privacy_clear_form_data"
- android:summary="@string/pref_privacy_clear_form_data_summary"
- android:title="@string/pref_privacy_clear_form_data" />
-
- <CheckBoxPreference
- android:defaultValue="true"
- android:key="privacy_clear_passwords"
- android:summary="@string/pref_privacy_clear_passwords_summary"
- android:title="@string/pref_privacy_clear_passwords" />
-
- <CheckBoxPreference
- android:defaultValue="true"
- android:dependency="enable_geolocation"
- android:key="privacy_clear_geolocation_access"
- android:summary="@string/pref_privacy_clear_geolocation_access_summary"
- android:title="@string/pref_privacy_clear_geolocation_access" />
-
- </PreferenceScreen>
-
- <CheckBoxPreference
- android:defaultValue="true"
- android:key="show_security_warnings"
- android:summary="@string/pref_security_show_security_warning_summary"
- android:title="@string/pref_security_show_security_warning" />
-
- <com.android.browser.mdm.MdmCheckBoxPreference
- android:defaultValue="true"
- android:key="do_not_track"
- android:summary="@string/pref_do_not_track_summary"
- android:title="@string/pref_do_not_track" />
-
- <CheckBoxPreference
- android:defaultValue="true"
- android:key="accept_cookies"
- android:summary="@string/pref_security_accept_cookies_summary"
- android:title="@string/pref_security_accept_cookies" />
-
- <CheckBoxPreference
- android:defaultValue="true"
- android:key="save_formdata"
- android:summary="@string/pref_security_save_form_data_summary"
- android:title="@string/pref_security_save_form_data" />
-
- <CheckBoxPreference
- android:defaultValue="true"
- android:key="enable_geolocation"
- android:summary="@string/pref_privacy_enable_geolocation_summary"
- android:title="@string/pref_privacy_enable_geolocation" />
-
- <CheckBoxPreference
- android:defaultValue="true"
- android:key="remember_passwords"
- android:summary="@string/pref_security_remember_passwords_summary"
- android:title="@string/pref_security_remember_passwords" />
-
- </PreferenceScreen>
+ android:summary="@string/pref_privacy_security_title_summary"
+ android:layout="@layout/swe_preference"
+ android:key="privacy_security" />
<PreferenceScreen
+ android:layout="@layout/swe_preference"
android:key="accessibility_menu"
- android:title="@string/pref_accessibility_title" />
+ android:summary="@string/pref_accessibility_title_summary"
+ android:title="@string/pref_accessibility_title"/>
<PreferenceScreen android:title="@string/pref_content_title"
- android:key="content_settings">
- <CheckBoxPreference
- android:defaultValue="true"
- android:key="block_popup_windows"
- android:title="@string/pref_content_block_popups" />
-
- <CheckBoxPreference
- android:defaultValue="false"
- android:key="open_in_background"
- android:summary="@string/pref_content_open_in_background_summary"
- android:title="@string/pref_content_open_in_background" />
-
- <CheckBoxPreference
- android:defaultValue="true"
- android:key="enable_javascript"
- android:title="@string/pref_content_javascript" />
-
- <PreferenceScreen
- android:key="download_path_setting_screen"
- android:title="@string/pref_download_path_setting_screen_title"/>
-
- <ListPreference
- android:defaultValue="@string/pref_default_text_encoding_default"
- android:dialogTitle="@string/pref_default_text_encoding_dialogtitle"
- android:entries="@array/pref_default_text_encoding_choices"
- android:entryValues="@array/pref_default_text_encoding_values"
- android:key="default_text_encoding"
- android:title="@string/pref_default_text_encoding" />
-
- <CheckBoxPreference
- android:key="load_images"
- android:defaultValue="true"
- android:title="@string/pref_content_load_images"
- android:summary="@string/pref_content_load_images_summary" />
-
- </PreferenceScreen>
-
-
- <PreferenceScreen
- android:key="website_settings"
- android:summary="@string/pref_extras_website_settings_summary"
- android:title="@string/pref_extras_website_settings" />
+ android:summary="@string/pref_content_title_summary"
+ android:layout="@layout/swe_preference"
+ android:key="content_settings" />
<ListPreference
+ android:layout="@layout/swe_preference"
+ android:widgetLayout="@layout/swe_preference_list_widget"
android:dialogTitle="@string/pref_edge_swipe_option_msg"
android:entries="@array/pref_edge_swiping_choices"
android:entryValues="@array/pref_edge_swiping_values"
+ android:summary="%s"
android:key="edge_swiping_action"
android:title="@string/pref_edge_swipe_title" />
<com.android.browser.BrowserYesNoPreference
+ android:layout="@layout/swe_preference"
android:key="reset_default_preferences"
android:title="@string/pref_extras_reset_default"
android:summary="@string/pref_extras_reset_default_summary"
@@ -221,6 +111,7 @@
android:dialogIcon="@android:drawable/ic_dialog_alert" />
<PreferenceScreen
+ android:layout="@layout/swe_preference"
android:key="debug_menu"
android:title="@string/pref_development_title" />
</PreferenceCategory>
diff --git a/res/xml/privacy_and_security_preferences.xml b/res/xml/privacy_and_security_preferences.xml
new file mode 100644
index 0000000..d5b2f9a
--- /dev/null
+++ b/res/xml/privacy_and_security_preferences.xml
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (c) 2015, The Linux Foundation. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of The Linux Foundation nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+ <PreferenceCategory
+ android:layout="@layout/swe_preference_category_first"
+ android:title="@string/pref_general_title">
+ <com.android.browser.mdm.MdmCheckBoxPreference
+ android:layout="@layout/swe_preference"
+ android:defaultValue="true"
+ android:key="do_not_track"
+ android:summaryOn="@string/pref_security_protect"
+ android:summaryOff="@string/pref_security_not_allowed"
+ android:title="@string/pref_do_not_track" />
+
+ <SwitchPreference
+ android:layout="@layout/swe_preference"
+ android:defaultValue="true"
+ android:key="remember_passwords"
+ android:summaryOn="@string/pref_security_remember"
+ android:summaryOff="@string/pref_security_not_allowed"
+ android:title="@string/pref_security_remember_passwords" />
+
+ <SwitchPreference
+ android:layout="@layout/swe_preference"
+ android:defaultValue="true"
+ android:key="save_formdata"
+ android:summaryOn="@string/pref_security_remember"
+ android:summaryOff="@string/pref_security_not_allowed"
+ android:title="@string/pref_security_save_form_data" />
+
+ <SwitchPreference
+ android:layout="@layout/swe_preference"
+ android:defaultValue="true"
+ android:key="accept_third_cookies"
+ android:summaryOn="@string/pref_security_allowed"
+ android:summaryOff="@string/pref_security_not_allowed"
+ android:title="@string/pref_security_accept_third_party_cookies" />
+
+ <PreferenceScreen android:title="@string/webstorage_private_data_title"
+ android:layout="@layout/swe_preference"
+ android:widgetLayout="@layout/swe_preference_storage_widget"
+ >
+ <CheckBoxPreference
+ android:defaultValue="true"
+ android:key="privacy_clear_history"
+ android:summary="@string/pref_privacy_clear_history_summary"
+ android:title="@string/pref_privacy_clear_history" />
+
+ <CheckBoxPreference
+ android:defaultValue="true"
+ android:key="privacy_clear_cache"
+ android:summary="@string/pref_privacy_clear_cache_summary"
+ android:title="@string/pref_privacy_clear_cache" />
+
+ <CheckBoxPreference
+ android:defaultValue="true"
+ android:key="privacy_clear_cookies"
+ android:summary="@string/pref_privacy_clear_cookies_summary"
+ android:title="@string/pref_privacy_clear_cookies" />
+
+ <CheckBoxPreference
+ android:defaultValue="true"
+ android:key="privacy_clear_form_data"
+ android:summary="@string/pref_privacy_clear_form_data_summary"
+ android:title="@string/pref_privacy_clear_form_data" />
+
+ <CheckBoxPreference
+ android:defaultValue="true"
+ android:key="privacy_clear_passwords"
+ android:summary="@string/pref_privacy_clear_passwords_summary"
+ android:title="@string/pref_privacy_clear_passwords" />
+
+ <CheckBoxPreference
+ android:defaultValue="true"
+ android:dependency="enable_geolocation"
+ android:key="privacy_clear_geolocation_access"
+ android:summary="@string/pref_privacy_clear_geolocation_access_summary"
+ android:title="@string/pref_privacy_clear_geolocation_access" />
+
+ <com.android.browser.BrowserYesNoPreference
+ android:layout="@layout/swe_preference_button"
+ android:dialogIcon="@android:drawable/ic_dialog_alert"
+ android:dialogMessage="@string/pref_privacy_clear_selected_dlg"
+ android:key="privacy_clear_selected"
+ android:summary="@string/pref_privacy_clear_selected_summary"
+ android:title="@string/pref_privacy_clear_selected" />
+
+ </PreferenceScreen>
+
+ <PreferenceScreen
+ android:layout="@layout/swe_preference"
+ android:key="website_settings"
+ android:summary="@string/pref_extras_website_settings_summary"
+ android:title="@string/pref_extras_website_settings" />
+
+ </PreferenceCategory>
+
+ <PreferenceCategory
+ android:layout="@layout/swe_preference_category"
+ android:title="@string/pref_default_site_settings_title">
+ <SwitchPreference
+ android:layout="@layout/swe_preference"
+ android:defaultValue="true"
+ android:icon="@drawable/ic_sp_location"
+ android:key="enable_geolocation"
+ android:summaryOn="@string/pref_security_ask_before_using"
+ android:summaryOff="@string/pref_security_not_allowed"
+ android:title="@string/pref_privacy_enable_geolocation" />
+
+ <SwitchPreference
+ android:layout="@layout/swe_preference"
+ android:defaultValue="true"
+ android:icon="@drawable/ic_sp_microphone"
+ android:key="microphone"
+ android:summaryOn="@string/pref_security_ask_before_using"
+ android:summaryOff="@string/pref_security_not_allowed"
+ android:title="@string/pref_security_allow_mic" />
+
+ <SwitchPreference
+ android:layout="@layout/swe_preference"
+ android:defaultValue="true"
+ android:icon="@drawable/ic_sp_camera"
+ android:key="camera"
+ android:summaryOn="@string/pref_security_ask_before_using"
+ android:summaryOff="@string/pref_security_not_allowed"
+ android:title="@string/pref_security_allow_camera" />
+
+ <SwitchPreference
+ android:layout="@layout/swe_preference"
+ android:defaultValue="false"
+ android:icon="@drawable/ic_sp_webrefiner"
+ android:key="distracting_contents"
+ android:summaryOn="@string/pref_security_allowed"
+ android:summaryOff="@string/pref_security_not_allowed"
+ android:title="@string/pref_security_web_refiner" />
+
+ <SwitchPreference
+ android:layout="@layout/swe_preference"
+ android:defaultValue="false"
+ android:icon="@drawable/ic_sp_popups"
+ android:key="popup_windows"
+ android:summaryOn="@string/pref_security_allowed"
+ android:summaryOff="@string/pref_security_not_allowed"
+ android:title="@string/pref_security_allow_popups" />
+
+ <SwitchPreference
+ android:layout="@layout/swe_preference"
+ android:defaultValue="true"
+ android:icon="@drawable/ic_sp_thirdcookies"
+ android:key="accept_cookies"
+ android:summaryOn="@string/pref_security_allowed"
+ android:summaryOff="@string/pref_security_not_allowed"
+ android:title="@string/pref_security_accept_cookies" />
+
+ </PreferenceCategory>
+</PreferenceScreen>
diff --git a/res/xml/site_specific_preferences.xml b/res/xml/site_specific_preferences.xml
new file mode 100644
index 0000000..19aac5c
--- /dev/null
+++ b/res/xml/site_specific_preferences.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (c) 2015, The Linux Foundation. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of The Linux Foundation nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ android:key="site_specific_prefs">
+
+ <PreferenceCategory
+ android:layout="@layout/swe_preference_category_first"
+ android:title="@string/pref_website_title" >
+ <Preference
+ android:layout="@layout/swe_preference"
+ android:key="site_name"/>
+ </PreferenceCategory>
+
+ <PreferenceCategory
+ android:layout="@layout/swe_preference_category"
+ android:key="site_security_info_title"
+ android:title="@string/pref_site_settings_info_panel" >
+
+ <PreferenceScreen
+ android:key="site_security_info"
+ android:layout="@layout/site_specific_security_info"/>
+ </PreferenceCategory>
+
+ <PreferenceCategory
+ android:title="@string/pref_site_settings_title"
+ android:layout="@layout/swe_preference_category"
+ android:key="reset_default">
+
+ <ListPreference
+ android:layout="@layout/swe_preference"
+ android:widgetLayout="@layout/swe_preference_list_widget"
+ android:icon="@drawable/ic_sp_location"
+ android:key="select_geolocation"
+ android:dialogTitle="@string/pref_privacy_clear_geolocation_access"
+ android:entries="@array/geolocation_settings_choices"
+ android:entryValues="@array/geolocation_settings_choices"
+ android:title="@string/pref_privacy_enable_geolocation" />
+
+ <SwitchPreference
+ android:layout="@layout/swe_preference"
+ android:defaultValue="true"
+ android:icon="@drawable/ic_sp_microphone"
+ android:key="microphone"
+ android:summaryOn="@string/pref_security_allowed"
+ android:summaryOff="@string/pref_security_not_allowed"
+ android:title="@string/pref_security_allow_mic" />
+
+ <SwitchPreference
+ android:layout="@layout/swe_preference"
+ android:defaultValue="true"
+ android:icon="@drawable/ic_sp_camera"
+ android:key="camera"
+ android:summaryOn="@string/pref_security_allowed"
+ android:summaryOff="@string/pref_security_not_allowed"
+ android:title="@string/pref_security_allow_camera" />
+
+ <SwitchPreference
+ android:layout="@layout/swe_preference"
+ android:defaultValue="false"
+ android:icon="@drawable/ic_sp_webrefiner"
+ android:key="distracting_contents"
+ android:summaryOn="@string/pref_security_allowed"
+ android:summaryOff="@string/pref_security_not_allowed"
+ android:title="@string/pref_security_web_refiner" />
+
+ <SwitchPreference
+ android:layout="@layout/swe_preference"
+ android:defaultValue="false"
+ android:icon="@drawable/ic_sp_popups"
+ android:key="popup_windows"
+ android:summaryOn="@string/pref_security_allowed"
+ android:summaryOff="@string/pref_security_not_allowed"
+ android:title="@string/pref_security_allow_popups" />
+
+ <SwitchPreference
+ android:layout="@layout/swe_preference"
+ android:defaultValue="true"
+ android:icon="@drawable/ic_sp_thirdcookies"
+ android:key="accept_cookies"
+ android:summaryOn="@string/pref_security_allowed"
+ android:summaryOff="@string/pref_security_not_allowed"
+ android:title="@string/pref_security_accept_cookies" />
+
+ <Preference
+ android:layout="@layout/swe_preference"
+ android:widgetLayout="@layout/swe_preference_trashcan_widget"
+ android:icon="@drawable/ic_sp_storage"
+ android:key="clear_data"
+ android:title="@string/webstorage_clear_data_title" />
+ </PreferenceCategory>
+</PreferenceScreen>
