[Android] Clean up after the root removal

Edward Wang git at videolan.org
Thu Nov 22 01:18:27 CET 2012


vlc-ports/android | branch: master | Edward Wang <edward.c.wang at compdigitec.com> | Wed Nov 21 19:18:18 2012 -0500| [a8d7830649aa453313a751bef9d82298ede16795] | committer: Edward Wang

Clean up after the root removal

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=a8d7830649aa453313a751bef9d82298ede16795
---

 vlc-android/res/layout/root_selection.xml |   75 -----------------------------
 vlc-android/res/values/strings.xml        |    2 -
 2 files changed, 77 deletions(-)

diff --git a/vlc-android/res/layout/root_selection.xml b/vlc-android/res/layout/root_selection.xml
deleted file mode 100644
index 10ae977..0000000
--- a/vlc-android/res/layout/root_selection.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?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="match_parent"
-    android:orientation="vertical">
-
-    <!-- Dummy item to prevent the "other" box from recieving focus
-         unless desired. -->
-    <LinearLayout
-        android:focusable="true" android:focusableInTouchMode="true"
-        android:layout_width="0px" android:layout_height="0px" />
-
-    <ScrollView
-        android:id="@+id/scrollView1"
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <RadioGroup
-                android:id="@+id/radiogroup"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <RadioButton
-                    android:id="@+id/internal_memory"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:focusable="true"
-                    android:text="@string/internal_memory" />
-
-                <RadioButton
-                    android:id="@+id/other"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:focusable="true"
-                    android:tag="other"
-                    android:text="@string/other" />
-            </RadioGroup>
-
-            <EditText
-                android:id="@+id/other_path"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:inputType="textNoSuggestions">
-            </EditText>
-        </LinearLayout>
-    </ScrollView>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-
-        <Button
-            android:id="@+id/ok"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0.5"
-            android:text="@string/ok" />
-
-        <Button
-            android:id="@+id/cancel"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0.5"
-            android:text="@string/cancel" />
-
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/vlc-android/res/values/strings.xml b/vlc-android/res/values/strings.xml
index 4f5ea50..94b8a27 100644
--- a/vlc-android/res/values/strings.xml
+++ b/vlc-android/res/values/strings.xml
@@ -149,8 +149,6 @@
     <!-- Preferences -->
     <string name="preferences">Preferences</string>
     <string name="main_prefs_category">Main</string>
-    <string name="internal_memory">Internal memory</string>
-    <string name="external_mount">External mount</string>
     <string name="privacy_prefs_category">Privacy</string>
     <string name="clear_history">Clear search history</string>
     <string name="advanced_prefs_category">Advanced</string>



More information about the Android mailing list