Whitelisting extras

res/layout/ondemand.xml

@@ -121,6 +121,13 @@
             android:layout_height="wrap_content" >
         </CheckBox>
 
+        <CheckBox
+            android:id="@+id/cbWhitelist"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="gone" >
+        </CheckBox>
+
         <ProgressBar
             android:id="@+id/pbProgress"
             style="@android:style/Widget.ProgressBar.Horizontal"

res/layout/whitelistentry.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal" >
+
+    <CheckedTextView
+        android:id="@+id/cbName"
+        android:layout_width="0dip"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_weight="1"
+        android:checkMark="?android:attr/listChoiceIndicatorMultiple"
+        android:gravity="center_vertical"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
+
+    <ImageView
+        android:id="@+id/imgDelete"
+        android:layout_width="32dip"
+        android:layout_height="?android:attr/listPreferredItemHeightSmall"
+        android:layout_gravity="center_vertical"
+        android:src="@drawable/delete" />
+
+</LinearLayout>

res/layout/whitelists.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/drawable_background"
+    android:orientation="vertical"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin" >
+
+    <Spinner
+        android:id="@+id/spWhitelistType"
+        android:layout_width="match_parent"
+        android:layout_height="37dip" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/title_check_whitelist"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dip"
+        android:background="@android:color/darker_gray" />
+
+    <ListView
+        android:id="@+id/lvWhitelist"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="6dip"
+        android:paddingRight="2dip"
+        android:scrollbarStyle="insideInset" />
+
+</LinearLayout>

res/menu/app.xml

@@ -44,6 +44,9 @@
     <item
         android:id="@+id/menu_contacts"
         android:title="@string/menu_contacts"/>
+    <item
+        android:id="@+id/menu_whitelists"
+        android:title="@string/menu_whitelists"/>
     <item
         android:id="@+id/menu_settings"
         android:title="@string/menu_settings"/>

res/values-ar/strings.xml

@@ -41,6 +41,7 @@
     <string name="menu_applications">إختر التطبيقات التي تود تمكينها</string>
     <string name="menu_accounts">إختر الحسابات التي تود تمكينها</string>
     <string name="menu_contacts">إختر الأسماء التي تود تمكينها</string>
+    <string name="menu_whitelists">Manage whitelists</string>
     <string name="menu_tutorial">تعليمي</string>
     <string name="menu_exclude">إستبعاد</string>
     <string name="menu_close">إغلاق</string>
@@ -98,6 +99,7 @@
     <string name="restrict_view">تصفح (المتصفح)</string>
     <string name="title_categories">الفئات</string>
     <string name="title_restrict">إختر للتقيد:</string>
+    <string name="title_check_whitelist">Check to allow</string>
     <string name="title_fused">التصفية حسب استخدام البيانات</string>
     <string name="title_finternet">التصفية حسب الوصول للإنترنت</string>
     <string name="title_fpermission">التصفية حسب الأُذونات</string>
@@ -118,6 +120,7 @@
     <string name="title_parameters">مدخلات:</string>
     <string name="title_applycat">تطبيق على الفئة بأكملها</string>
     <string name="title_once">مرة واحدة ل %1$s ثانية</string>
+    <string name="title_whitelist">Whitelist \'%s\'</string>
     <string name="title_allow">تمكين</string>
     <string name="title_deny">منع</string>
     <string name="title_pleasesubmit">الرجاء إرسال القيود لمساعدة الآخرين</string>

res/values-bg/strings.xml

@@ -41,6 +41,7 @@
     <string name="menu_accounts">Изберете сметки с позволение</string>
     <string name="menu_applications">Select applications to allow</string>
     <string name="menu_contacts">Изберете контакти с позволение</string>
+    <string name="menu_whitelists">Manage whitelists</string>
     <string name="menu_tutorial">Tutorial</string>
     <string name="menu_exclude">Exclude</string>
     <string name="menu_close">Close</string>
@@ -98,6 +99,7 @@
     <string name="restrict_view">Преглед (браузър)</string>
     <string name="title_categories">Categories</string>
     <string name="title_restrict">Отбележи за ограничаване:</string>
+    <string name="title_check_whitelist">Check to allow</string>
     <string name="title_fused">Filter on data usage</string>
     <string name="title_finternet">Filter on internet access</string>
     <string name="title_fpermission">Filter on permission</string>
@@ -118,6 +120,7 @@
     <string name="title_parameters">Parameters:</string>
     <string name="title_applycat">Apply to entire category</string>
     <string name="title_once">Once for %1$s seconds</string>
+    <string name="title_whitelist">Whitelist \'%s\'</string>
     <string name="title_allow">Allow</string>
     <string name="title_deny">Deny</string>
     <string name="title_pleasesubmit">Please submit your restrictions to help others</string>

res/values-ca/strings.xml

@@ -41,6 +41,7 @@
     <string name="menu_accounts">Selecciona comptes a permetre</string>
     <string name="menu_applications">Select applications to allow</string>
     <string name="menu_contacts">Selecciona contactes a permetre</string>
+    <string name="menu_whitelists">Manage whitelists</string>
     <string name="menu_tutorial">Tutorial</string>
     <string name="menu_exclude">Exclude</string>
     <string name="menu_close">Close</string>
@@ -96,6 +97,7 @@
     <string name="restrict_view">Vista (navegador)</string>
     <string name="title_categories">Categories</string>
     <string name="title_restrict">Activa per a restringir:</string>
+    <string name="title_check_whitelist">Check to allow</string>
     <string name="title_fused">Filtra per ús de dades</string>
     <string name="title_finternet">Filtra per accés a Internet</string>
     <string name="title_fpermission">Filtra per permís</string>
@@ -116,6 +118,7 @@
     <string name="title_parameters">Parameters:</string>
     <string name="title_applycat">Apply to entire category</string>
     <string name="title_once">Once for %1$s seconds</string>
+    <string name="title_whitelist">Whitelist \'%s\'</string>
     <string name="title_allow">Allow</string>
     <string name="title_deny">Deny</string>
     <string name="title_pleasesubmit">Please submit your restrictions to help others</string>

res/values-cs/strings.xml

@@ -41,6 +41,7 @@
     <string name="menu_accounts">Povolené účty aplikace</string>
     <string name="menu_applications">Povolený přístup k aplikacím</string>
     <string name="menu_contacts">Povolené kontakty aplikace</string>
+    <string name="menu_whitelists">Manage whitelists</string>
     <string name="menu_tutorial">Příručka</string>
     <string name="menu_exclude">Vyloučit</string>
     <string name="menu_close">Zavřít</string>
@@ -98,6 +99,7 @@ nicméně je nemožné zaručit bezchybnou funkčnost na všech zařízeních a
     <string name="restrict_view">Zobrazení (v prohlížeči)</string>
     <string name="title_categories">Kategorie</string>
     <string name="title_restrict">Zaškrtněte pro omezení:</string>
+    <string name="title_check_whitelist">Check to allow</string>
     <string name="title_fused">Filtrovat přístup k datům</string>
     <string name="title_finternet">Filtrovat přístup k internetu</string>
     <string name="title_fpermission">Filtrovat oprávnění</string>
@@ -118,6 +120,7 @@ nicméně je nemožné zaručit bezchybnou funkčnost na všech zařízeních a
     <string name="title_parameters">Parameters:</string>
     <string name="title_applycat">Apply to entire category</string>
     <string name="title_once">Once for %1$s seconds</string>
+    <string name="title_whitelist">Whitelist \'%s\'</string>
     <string name="title_allow">Allow</string>
     <string name="title_deny">Deny</string>
     <string name="title_pleasesubmit">Please submit your restrictions to help others</string>

res/values-da/strings.xml

@@ -41,6 +41,7 @@
     <string name="menu_accounts">Vælg konti som skal tillades</string>
     <string name="menu_applications">Select applications to allow</string>
     <string name="menu_contacts">Vælg kontakter som skal tillades</string>
+    <string name="menu_whitelists">Manage whitelists</string>
     <string name="menu_tutorial">Tutorial</string>
     <string name="menu_exclude">Exclude</string>
     <string name="menu_close">Close</string>
@@ -96,6 +97,7 @@
     <string name="restrict_view">Vis (browser)</string>
     <string name="title_categories">Categories</string>
     <string name="title_restrict">Markér for at blokere:</string>
+    <string name="title_check_whitelist">Check to allow</string>
     <string name="title_fused">Filter on data usage</string>
     <string name="title_finternet">Filter on internet access</string>
     <string name="title_fpermission">Filter on permission</string>
@@ -116,6 +118,7 @@
     <string name="title_parameters">Parameters:</string>
     <string name="title_applycat">Apply to entire category</string>
     <string name="title_once">Once for %1$s seconds</string>
+    <string name="title_whitelist">Whitelist \'%s\'</string>
     <string name="title_allow">Allow</string>
     <string name="title_deny">Deny</string>
     <string name="title_pleasesubmit">Please submit your restrictions to help others</string>

res/values-de/strings.xml

@@ -41,6 +41,7 @@
     <string name="menu_accounts">Konten für Zugriff freigeben</string>
     <string name="menu_applications">Apps für Zugriff freigeben</string>
     <string name="menu_contacts">Kontakte für Zugriff freigeben</string>
+    <string name="menu_whitelists">Manage whitelists</string>
     <string name="menu_tutorial">Anleitung</string>
     <string name="menu_exclude">Ausschließen</string>
     <string name="menu_close">Schließen</string>
@@ -98,6 +99,7 @@
     <string name="restrict_view">Anzeigen (mittels Browser)</string>
     <string name="title_categories">Kategorien</string>
     <string name="title_restrict">Zum Beschränken markieren:</string>
+    <string name="title_check_whitelist">Check to allow</string>
     <string name="title_fused">Datennutzung</string>
     <string name="title_finternet">Internetzugang</string>
     <string name="title_fpermission">Berechtigungen</string>
@@ -118,6 +120,7 @@
     <string name="title_parameters">Parameter:</string>
     <string name="title_applycat">Auf die gesamte Kategorie anwenden</string>
     <string name="title_once">Nur einmal für %1$s Sekunden</string>
+    <string name="title_whitelist">Whitelist \'%s\'</string>
     <string name="title_allow">Zulassen</string>
     <string name="title_deny">Blockieren</string>
     <string name="title_pleasesubmit">Bitte geben Sie Ihre Einstellungen der Beschränkungen weiter um anderen zu helfen</string>

res/values-ee/strings.xml

@@ -41,6 +41,7 @@
     <string name="menu_accounts">Vali kasutajad mida lubada</string>
     <string name="menu_applications">Select applications to allow</string>
     <string name="menu_contacts">Vali kontaktid mida lubada</string>
+    <string name="menu_whitelists">Manage whitelists</string>
     <string name="menu_tutorial">Tutorial</string>
     <string name="menu_exclude">Exclude</string>
     <string name="menu_close">Close</string>
@@ -98,6 +99,7 @@ kuid on võimatu garanteerida, et see töötab igal seadmel ja iga rakendusega.
     <string name="restrict_view">Vaade (brauser)</string>
     <string name="title_categories">Categories</string>
     <string name="title_restrict">Lisa linnuke, et keelata:</string>
+    <string name="title_check_whitelist">Check to allow</string>
     <string name="title_filters">Filters</string>
     <string name="title_fused">Filter on data usage</string>
     <string name="title_finternet">Filter on internet access</string>
@@ -119,6 +121,7 @@ kuid on võimatu garanteerida, et see töötab igal seadmel ja iga rakendusega.
     <string name="title_parameters">Parameters:</string>
     <string name="title_applycat">Apply to entire category</string>
     <string name="title_once">Once for %1$s seconds</string>
+    <string name="title_whitelist">Whitelist \'%s\'</string>
     <string name="title_allow">Allow</string>
     <string name="title_deny">Deny</string>
     <string name="title_pleasesubmit">Please submit your restrictions to help others</string>

res/values-el/strings.xml

@@ -41,6 +41,7 @@
     <string name="menu_accounts">Επιλογή επιτρεπόμενων λογαριασμών</string>
     <string name="menu_applications">Select applications to allow</string>
     <string name="menu_contacts">Επιλογή επιτρεπόμενων επαφών</string>
+    <string name="menu_whitelists">Manage whitelists</string>
     <string name="menu_tutorial">Tutorial</string>
     <string name="menu_exclude">Exclude</string>
     <string name="menu_close">Close</string>
@@ -98,6 +99,7 @@
     <string name="restrict_view">Εμφάνιση (browser)</string>
     <string name="title_categories">Categories</string>
     <string name="title_restrict">Επιλέξτε για περιορισμό:</string>
+    <string name="title_check_whitelist">Check to allow</string>
     <string name="title_fused">Filter on data usage</string>
     <string name="title_finternet">Filter on internet access</string>
     <string name="title_fpermission">Filter on permission</string>
@@ -118,6 +120,7 @@
     <string name="title_parameters">Parameters:</string>
     <string name="title_applycat">Apply to entire category</string>
     <string name="title_once">Once for %1$s seconds</string>
+    <string name="title_whitelist">Whitelist \'%s\'</string>
     <string name="title_allow">Allow</string>
     <string name="title_deny">Deny</string>
     <string name="title_pleasesubmit">Please submit your restrictions to help others</string>

res/values-es/strings.xml

@@ -41,6 +41,7 @@
     <string name="menu_accounts">Seleccione las cuentas permitidas</string>
     <string name="menu_applications">Seleccione las aplicaciones permitidas</string>
     <string name="menu_contacts">Seleccione los contactos permitidos</string>
+    <string name="menu_whitelists">Manage whitelists</string>
     <string name="menu_tutorial">Tutorial</string>
     <string name="menu_exclude">Excluir</string>
     <string name="menu_close">Cerrar</string>
@@ -98,6 +99,7 @@ sin embargo no puedo garantizar que funcione sin ningún fallo para cada disposi
     <string name="restrict_view">Ver (navegador)</string>
     <string name="title_categories">Categorias</string>
     <string name="title_restrict">Seleccione para restringir:</string>
+    <string name="title_check_whitelist">Check to allow</string>
     <string name="title_fused">Filtrar uso de datos</string>
     <string name="title_finternet">Filtrar acceso a Internet</string>
     <string name="title_fpermission">Filtrar permisos Android</string>
@@ -118,6 +120,7 @@ sin embargo no puedo garantizar que funcione sin ningún fallo para cada disposi
     <string name="title_parameters">Parámetros:</string>
     <string name="title_applycat">Aplicar a toda la categoría</string>
     <string name="title_once">Recordar por %1$s segundos</string>
+    <string name="title_whitelist">Whitelist \'%s\'</string>
     <string name="title_allow">Permitir</string>
     <string name="title_deny">Denegar</string>
     <string name="title_pleasesubmit">Por favor suba sus restricciones para ayudar a otros usuarios</string>

res/values-fa/strings.xml

@@ -43,6 +43,7 @@
     <string name="menu_accounts">حساب هایی را که اجازه می دهید انتخاب کنید</string>
     <string name="menu_applications">Select applications to allow</string>
     <string name="menu_contacts">تماس هایی را که احازه می دهید انتخاب کنید</string>
+    <string name="menu_whitelists">Manage whitelists</string>
     <string name="menu_tutorial">Tutorial</string>
     <string name="menu_exclude">Exclude</string>
     <string name="menu_close">Close</string>
@@ -100,6 +101,7 @@
     <string name="restrict_view">نما (مرورگر)</string>
     <string name="title_categories">Categories</string>
     <string name="title_restrict">برای محدود شدن انتخاب کنید:</string>
+    <string name="title_check_whitelist">Check to allow</string>
     <string name="title_fused">Filter on data usage</string>
     <string name="title_finternet">Filter on internet access</string>
     <string name="title_fpermission">Filter on permission</string>
@@ -120,6 +122,7 @@
     <string name="title_parameters">Parameters:</string>
     <string name="title_applycat">Apply to entire category</string>
     <string name="title_once">Once for %1$s seconds</string>
+    <string name="title_whitelist">Whitelist \'%s\'</string>
     <string name="title_allow">Allow</string>
     <string name="title_deny">Deny</string>
     <string name="title_pleasesubmit">Please submit your restrictions to help others</string>

res/values-fi/strings.xml

@@ -41,6 +41,7 @@
     <string name="menu_accounts">Valitse sallittavat tilit</string>
     <string name="menu_applications">Valitse sallittavat applikaatiot</string>
     <string name="menu_contacts">Valitse sallittavat kontaktit</string>
+    <string name="menu_whitelists">Manage whitelists</string>
     <string name="menu_tutorial">Tutorial</string>
     <string name="menu_exclude">Exclude</string>
     <string name="menu_close">Close</string>
@@ -97,6 +98,7 @@
     <string name="restrict_view">Katso (selaimessa)</string>
     <string name="title_categories">Categories</string>
     <string name="title_restrict">Valitse rajoittaaksesi:</string>
+    <string name="title_check_whitelist">Check to allow</string>
     <string name="title_fused">Suodata datan käyttöön</string>
     <string name="title_finternet">Suodata internet yhteyksiin</string>
     <string name="title_fpermission">Suodata käyttöoikeuksiin</string>
@@ -117,6 +119,7 @@
     <string name="title_parameters">Parameters:</string>
     <string name="title_applycat">Apply to entire category</string>
     <string name="title_once">Once for %1$s seconds</string>
+    <string name="title_whitelist">Whitelist \'%s\'</string>
     <string name="title_allow">Allow</string>
     <string name="title_deny">Deny</string>
     <string name="title_pleasesubmit">Please submit your restrictions to help others</string>