|
@@ -5,105 +5,116 @@
|
|
android:layout_width="match_parent"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent">
|
|
android:layout_height="match_parent">
|
|
|
|
|
|
- <ViewGroup
|
|
|
|
|
|
+ <RelativeLayout
|
|
android:layout_width="fill_parent"
|
|
android:layout_width="fill_parent"
|
|
- android:layout_height="wrap_content">
|
|
|
|
- android:layout_weight="1">
|
|
|
|
- <TextView
|
|
|
|
- android:id="@+id/textView"
|
|
|
|
- android:layout_width="fill_parent"
|
|
|
|
- android:layout_height="wrap_content"
|
|
|
|
- android:layout_alignParentEnd="true"
|
|
|
|
- android:layout_alignParentLeft="true"
|
|
|
|
- android:layout_alignParentRight="false"
|
|
|
|
- android:layout_marginLeft="15dp"
|
|
|
|
- android:layout_marginTop="20dp"
|
|
|
|
- android:layout_weight="1"
|
|
|
|
- android:text="@string/current_connection"
|
|
|
|
- android:textSize="18dp"
|
|
|
|
- android:textStyle="bold" />
|
|
|
|
|
|
+ android:layout_height="wrap_content"
|
|
|
|
+ android:layout_weight="3">
|
|
|
|
|
|
- <ImageView
|
|
|
|
- android:id="@+id/services_button_connection_info"
|
|
|
|
- android:layout_width="fill_parent"
|
|
|
|
- android:layout_height="wrap_content"
|
|
|
|
- android:layout_alignParentEnd="true"
|
|
|
|
- android:layout_alignParentRight="true"
|
|
|
|
- android:layout_alignParentTop="true"
|
|
|
|
- android:layout_marginTop="5dp"
|
|
|
|
- android:layout_marginRight="12dp"
|
|
|
|
- android:src="@android:drawable/ic_menu_info_details" />
|
|
|
|
- </ViewGroup>
|
|
|
|
|
|
+ <LinearLayout android:layout_width="fill_parent"
|
|
|
|
+ android:layout_height="wrap_content"
|
|
|
|
+ android:orientation="vertical">
|
|
|
|
|
|
- <ViewGroup android:layout_width="fill_parent"
|
|
|
|
- android:layout_height="wrap_content"
|
|
|
|
- android:layout_weight="1">
|
|
|
|
- <View
|
|
|
|
- android:layout_width="fill_parent"
|
|
|
|
- android:layout_height="1dp"
|
|
|
|
- android:layout_marginLeft="15dp"
|
|
|
|
- android:layout_marginRight="15dp"
|
|
|
|
- android:background="@android:color/darker_gray" />
|
|
|
|
- <RelativeLayout
|
|
|
|
- android:layout_width="fill_parent"
|
|
|
|
- android:layout_height="wrap_content" >
|
|
|
|
|
|
+ <LinearLayout android:layout_width="fill_parent"
|
|
|
|
+ android:layout_height="wrap_content"
|
|
|
|
+ android:orientation="vertical"
|
|
|
|
+ android:layout_weight="1"
|
|
|
|
+ android:layout_marginTop="20dp"
|
|
|
|
+ android:layout_marginLeft="15dp">
|
|
|
|
+ <ImageView
|
|
|
|
+ android:id="@+id/services_button_connection_info"
|
|
|
|
+ android:layout_width="fill_parent"
|
|
|
|
+ android:layout_height="wrap_content"
|
|
|
|
+ android:scaleType="fitEnd"
|
|
|
|
+ android:src="@android:drawable/ic_menu_info_details"/>
|
|
|
|
|
|
- <TextView
|
|
|
|
- android:id="@+id/services_text_name"
|
|
|
|
- android:layout_width="fill_parent"
|
|
|
|
- android:layout_height="wrap_content"
|
|
|
|
- android:layout_alignParentTop="true"
|
|
|
|
- android:layout_centerHorizontal="true"
|
|
|
|
- android:layout_gravity="center_horizontal"
|
|
|
|
- android:layout_marginTop="21dp"
|
|
|
|
- android:text="Eduroam"
|
|
|
|
- android:textAppearance="?android:attr/textAppearanceLarge"
|
|
|
|
- android:textSize="26sp" />
|
|
|
|
|
|
+ <TextView
|
|
|
|
+ android:id="@+id/textView"
|
|
|
|
+ android:layout_width="fill_parent"
|
|
|
|
+ android:layout_height="0dip"
|
|
|
|
+ android:layout_marginLeft="15dp"
|
|
|
|
+ android:layout_weight="1"
|
|
|
|
+ android:layout_marginTop="0dp"
|
|
|
|
+ android:text="@string/current_connection"
|
|
|
|
+ android:textSize="18sp"
|
|
|
|
+ android:textStyle="bold" />
|
|
|
|
|
|
|
|
+ </LinearLayout>
|
|
|
|
+ <RelativeLayout android:layout_width="fill_parent"
|
|
|
|
+ android:layout_height="wrap_content"
|
|
|
|
+ android:orientation="horizontal"
|
|
|
|
+ android:layout_weight="1"
|
|
|
|
+ android:layout_gravity="center_vertical"
|
|
|
|
+ android:layout_marginLeft="15dp"
|
|
|
|
+ android:layout_marginTop="5dp">
|
|
|
|
+ <View
|
|
|
|
+ android:layout_width="fill_parent"
|
|
|
|
+ android:layout_height="1dp"
|
|
|
|
+ android:layout_weight="1"
|
|
|
|
+ android:layout_marginLeft="15dp"
|
|
|
|
+ android:layout_marginRight="15dp"
|
|
|
|
+ android:background="@android:color/darker_gray" />
|
|
|
|
+
|
|
|
|
+ <TextView
|
|
|
|
+ android:id="@+id/services_text_name"
|
|
|
|
+ android:layout_width="fill_parent"
|
|
|
|
+ android:layout_height="wrap_content"
|
|
|
|
+ android:layout_marginTop="10dp"
|
|
|
|
+ android:layout_marginLeft="15dp"
|
|
|
|
+ android:layout_marginRight="15dp"
|
|
|
|
+ android:layout_alignParentTop="false"
|
|
|
|
+ android:layout_centerHorizontal="true"
|
|
|
|
+ android:layout_gravity="center_horizontal"
|
|
|
|
+ android:text="Eduroam"
|
|
|
|
+ android:textAppearance="?android:attr/textAppearanceLarge"
|
|
|
|
+ android:textSize="26sp" />
|
|
|
|
+ </RelativeLayout>
|
|
|
|
+ </LinearLayout>
|
|
</RelativeLayout>
|
|
</RelativeLayout>
|
|
|
|
|
|
- <RelativeLayout
|
|
|
|
- android:layout_width="fill_parent"
|
|
|
|
- android:layout_height="wrap_content"
|
|
|
|
- android:baselineAligned="false"
|
|
|
|
- android:orientation="horizontal"
|
|
|
|
- android:weightSum="1" >
|
|
|
|
|
|
+ <LinearLayout android:layout_width="fill_parent"
|
|
|
|
+ android:layout_height="wrap_content"
|
|
|
|
+ android:layout_weight="2"
|
|
|
|
+ android:orientation="vertical">
|
|
|
|
|
|
- <TextView
|
|
|
|
- android:id="@+id/textView"
|
|
|
|
|
|
+ <RelativeLayout
|
|
android:layout_width="fill_parent"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
- android:layout_alignParentEnd="true"
|
|
|
|
- android:layout_alignParentLeft="true"
|
|
|
|
- android:layout_alignParentRight="false"
|
|
|
|
- android:layout_marginLeft="15dp"
|
|
|
|
- android:layout_marginTop="0dp"
|
|
|
|
- android:layout_weight="1"
|
|
|
|
- android:text="@string/monitor_services"
|
|
|
|
- android:textStyle="bold"
|
|
|
|
- android:textSize="20dp"/>
|
|
|
|
|
|
+ android:baselineAligned="false"
|
|
|
|
+ android:orientation="horizontal"
|
|
|
|
+ android:weightSum="1" >
|
|
|
|
|
|
- <Switch
|
|
|
|
- android:id="@+id/service_switch_connection"
|
|
|
|
- android:layout_width="wrap_content"
|
|
|
|
- android:layout_height="wrap_content"
|
|
|
|
- android:layout_alignParentBottom="false"
|
|
|
|
- android:layout_alignParentEnd="false"
|
|
|
|
- android:layout_alignParentLeft="false"
|
|
|
|
- android:layout_alignParentRight="true"
|
|
|
|
- android:layout_alignParentTop="false"
|
|
|
|
- android:layout_gravity="right"
|
|
|
|
- android:layout_marginLeft="0dp"
|
|
|
|
- android:layout_marginRight="15dp"
|
|
|
|
- android:layout_marginTop="30dp"
|
|
|
|
- android:layout_marginBottom="0dp"
|
|
|
|
- android:layout_weight="1"
|
|
|
|
- android:checked="false"
|
|
|
|
- android:textSize="10dp" />
|
|
|
|
|
|
+ <TextView
|
|
|
|
+ android:id="@+id/textView"
|
|
|
|
+ android:layout_width="wrap_content"
|
|
|
|
+ android:layout_height="wrap_content"
|
|
|
|
+ android:layout_alignParentEnd="true"
|
|
|
|
+ android:layout_alignParentLeft="true"
|
|
|
|
+ android:layout_alignParentRight="false"
|
|
|
|
+ android:layout_marginLeft="15dp"
|
|
|
|
+ android:layout_marginTop="35dp"
|
|
|
|
+ android:text="@string/monitor_services"
|
|
|
|
+ android:textStyle="bold"
|
|
|
|
+ android:textSize="20sp"/>
|
|
|
|
|
|
- </RelativeLayout>
|
|
|
|
|
|
+ <Switch
|
|
|
|
+ android:id="@+id/service_switch_connection"
|
|
|
|
+ android:layout_width="wrap_content"
|
|
|
|
+ android:layout_height="wrap_content"
|
|
|
|
+ android:layout_alignParentBottom="false"
|
|
|
|
+ android:layout_alignParentEnd="false"
|
|
|
|
+ android:layout_alignParentLeft="false"
|
|
|
|
+ android:layout_alignParentRight="true"
|
|
|
|
+ android:layout_alignParentTop="false"
|
|
|
|
+ android:layout_gravity="right"
|
|
|
|
+ android:layout_marginLeft="0dp"
|
|
|
|
+ android:layout_marginRight="15dp"
|
|
|
|
+ android:layout_marginTop="30dp"
|
|
|
|
+ android:layout_marginBottom="0dp"
|
|
|
|
+ android:checked="false"
|
|
|
|
+ android:textSize="10sp" />
|
|
|
|
|
|
- <View
|
|
|
|
|
|
+ </RelativeLayout>
|
|
|
|
+ <View
|
|
android:layout_width="fill_parent"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="1dp"
|
|
android:layout_height="1dp"
|
|
android:layout_marginLeft="15dp"
|
|
android:layout_marginLeft="15dp"
|
|
@@ -119,5 +130,5 @@
|
|
|
|
|
|
|
|
|
|
</ListView>
|
|
</ListView>
|
|
- </ViewGroup>
|
|
|
|
|
|
+ </LinearLayout>
|
|
</LinearLayout>
|
|
</LinearLayout>
|