diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-04-09 11:42:06 +0200 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-04-09 11:45:15 +0200 |
| commit | 3ef75e60fef1f16d6a97c3b4ad80c45e362b82ef (patch) | |
| tree | d34c0998afe507ffb708099f5e00d9531c45e8ac /bitmask_android/src/main | |
| parent | c12319eb8ff27f41ae577aee19fd341d6191c3d7 (diff) | |
Danger on resources split into debug and release.
New provider dialog resources use danger_on checkbox in debug, but not in release.
This kind of solutions forces us to maintain 2 different codebases for the same class, so beware for next updates.
Next step: split java code.
Diffstat (limited to 'bitmask_android/src/main')
| -rw-r--r-- | bitmask_android/src/main/res/layout-xlarge/new_provider_dialog.xml | 26 | ||||
| -rw-r--r-- | bitmask_android/src/main/res/layout/new_provider_dialog.xml | 24 |
2 files changed, 0 insertions, 50 deletions
diff --git a/bitmask_android/src/main/res/layout-xlarge/new_provider_dialog.xml b/bitmask_android/src/main/res/layout-xlarge/new_provider_dialog.xml deleted file mode 100644 index fc7d84ab..00000000 --- a/bitmask_android/src/main/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/main/res/layout/new_provider_dialog.xml b/bitmask_android/src/main/res/layout/new_provider_dialog.xml deleted file mode 100644 index 19b8f442..00000000 --- a/bitmask_android/src/main/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 |