From 1684c8f398922065a97e7da4dac4ac6a33cc5218 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Wed, 9 Apr 2014 16:03:55 +0200
Subject: Back to the standard "app" module.

This return to "app" instead of "bitmask_android" is due to this reading: https://developer.android.com/sdk/installing/studio-build.html#projectStructure
I'll have to tweak the final apk name in build.gradle.
---
 .../res/layout-xlarge/new_provider_dialog.xml      | 26 ----------------------
 .../src/debug/res/layout/new_provider_dialog.xml   | 24 --------------------
 bitmask_android/src/debug/res/values/strings.xml   |  4 ----
 3 files changed, 54 deletions(-)
 delete mode 100644 bitmask_android/src/debug/res/layout-xlarge/new_provider_dialog.xml
 delete mode 100644 bitmask_android/src/debug/res/layout/new_provider_dialog.xml
 delete mode 100644 bitmask_android/src/debug/res/values/strings.xml

(limited to 'bitmask_android/src/debug/res')

diff --git a/bitmask_android/src/debug/res/layout-xlarge/new_provider_dialog.xml b/bitmask_android/src/debug/res/layout-xlarge/new_provider_dialog.xml
deleted file mode 100644
index fc7d84ab..00000000
--- a/bitmask_android/src/debug/res/layout-xlarge/new_provider_dialog.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:textSize="24sp" >
-    
-    <EditText
-        android:id="@+id/new_provider_url"
-        android:inputType="textUri"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:layout_marginLeft="4dp"
-        android:layout_marginRight="4dp"
-        android:textSize="24sp"
-        android:hint="@string/new_provider_uri" />
-
-    <CheckBox
-        android:id="@+id/danger_checkbox"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textSize="24sp"
-        android:text="@string/danger_checkbox" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/bitmask_android/src/debug/res/layout/new_provider_dialog.xml b/bitmask_android/src/debug/res/layout/new_provider_dialog.xml
deleted file mode 100644
index 19b8f442..00000000
--- a/bitmask_android/src/debug/res/layout/new_provider_dialog.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:orientation="vertical" >
-    
-    <EditText
-        android:id="@+id/new_provider_url"
-        android:inputType="textUri"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:layout_marginLeft="4dp"
-        android:layout_marginRight="4dp"
-        android:layout_marginBottom="4dp"
-        android:hint="@string/new_provider_uri" />
-
-    <CheckBox
-        android:id="@+id/danger_checkbox"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/danger_checkbox" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/bitmask_android/src/debug/res/values/strings.xml b/bitmask_android/src/debug/res/values/strings.xml
deleted file mode 100644
index 3e568115..00000000
--- a/bitmask_android/src/debug/res/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="danger_checkbox">Skip security check</string>
-</resources>
-- 
cgit v1.2.3