diff options
author | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2012-08-03 14:08:40 +0200 |
---|---|---|
committer | Michael Meeks <michael.meeks@suse.com> | 2012-08-06 10:23:10 +0100 |
commit | b5d6989e8b7a739881f54ce9db0d560fb69e7eb9 (patch) | |
tree | b3f89831b5f29e39fd018879f59424b75e906c59 /android/sdremote/res | |
parent | 98e52c47474e91dcaa5d41d8fd4925b17689fd65 (diff) |
Implemented Server selector.
Change-Id: Ib6d0712c498e831a559df00d301ea2d4b851deed
Diffstat (limited to 'android/sdremote/res')
-rw-r--r-- | android/sdremote/res/layout/activity_selector.xml | 72 | ||||
-rw-r--r-- | android/sdremote/res/layout/activity_selector_sublayout_server.xml | 20 | ||||
-rw-r--r-- | android/sdremote/res/values/strings.xml | 3 | ||||
-rw-r--r-- | android/sdremote/res/values/styles.xml | 2 |
4 files changed, 97 insertions, 0 deletions
diff --git a/android/sdremote/res/layout/activity_selector.xml b/android/sdremote/res/layout/activity_selector.xml new file mode 100644 index 000000000000..6f4cfa158cd8 --- /dev/null +++ b/android/sdremote/res/layout/activity_selector.xml @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="utf-8"?> +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" > + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="10dip" + android:orientation="vertical" > + + <LinearLayout + android:id="@+id/selector_container_bluetooth" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" > + + <TextView + android:id="@+id/selector_label_none" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/selector_noservers" + android:textAppearance="?android:attr/textAppearanceLarge" /> + + <TextView + android:id="@+id/selector_label_bluetooth" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/bluetooth" + android:textAppearance="?android:attr/textAppearanceLarge" /> + + <ImageView + android:id="@+id/selector_divider1" + android:layout_width="fill_parent" + android:layout_height="2dip" + android:src="@color/medium_grey" /> + + <LinearLayout + android:id="@+id/selector_list_bluetooth" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" /> + </LinearLayout> + + <LinearLayout + android:id="@+id/selector_container_network" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" > + + <TextView + android:id="@+id/selector_label_network" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/wifi" + android:textAppearance="?android:attr/textAppearanceLarge" /> + + <ImageView + android:id="@+id/selector_divider1" + android:layout_width="fill_parent" + android:layout_height="2dip" + android:src="@color/medium_grey" /> + + <LinearLayout + android:id="@+id/selector_list_network" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" /> + </LinearLayout> + </LinearLayout> + +</ScrollView>
\ No newline at end of file diff --git a/android/sdremote/res/layout/activity_selector_sublayout_server.xml b/android/sdremote/res/layout/activity_selector_sublayout_server.xml new file mode 100644 index 000000000000..14bec2349d8e --- /dev/null +++ b/android/sdremote/res/layout/activity_selector_sublayout_server.xml @@ -0,0 +1,20 @@ +<?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="vertical" > + + <ImageView + android:id="@+id/sub_divider" + android:layout_width="fill_parent" + android:layout_height="1dip" + android:src="@color/medium_grey" /> + + <TextView + android:id="@+id/selector_sub_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="10dip" + android:textAppearance="?android:attr/textAppearanceMedium" /> + +</LinearLayout>
\ No newline at end of file diff --git a/android/sdremote/res/values/strings.xml b/android/sdremote/res/values/strings.xml index ac51b864f488..0e14caa5a519 100644 --- a/android/sdremote/res/values/strings.xml +++ b/android/sdremote/res/values/strings.xml @@ -20,5 +20,8 @@ <string name="options_volumeswitching_descripton">Change slides using volume buttons</string> <string name="options_switchcomputer">Switch computer</string> <string name="blankscreen_return">Return to Slide</string> + <string name="bluetooth">Bluetooth</string> + <string name="wifi">WI-FI</string> + <string name="selector_noservers">Searching for computers…</string> </resources>
\ No newline at end of file diff --git a/android/sdremote/res/values/styles.xml b/android/sdremote/res/values/styles.xml index c95fb0cdbce7..e5a465100222 100644 --- a/android/sdremote/res/values/styles.xml +++ b/android/sdremote/res/values/styles.xml @@ -7,6 +7,7 @@ <color name="black">#000000</color> <color name="light_grey">#E8E9E8</color> <color name="medium_grey">#C1C2C1</color> + <color name="text_grey">#5E5F5F</color> <integer name="thumbnail_border_width">3</integer> @@ -48,6 +49,7 @@ <item name="android:actionDropDownStyle">@style/Theme.ImpressRemote.ActionBarMenu</item> <item name="android:windowBackground">@color/light_grey</item> <item name="android:homeAsUpIndicator">@drawable/up_indicator_white</item> + <item name="android:textColor">@color/text_grey</item> </style> </resources>
\ No newline at end of file |