Nextrek

Explore

Commits

Diff Revisions 661 vs 680 for /Android/SmartCharging/SmartCharging/app/src/main/res/layout/activity_setting_selection.xml

		@@ -5,29 +5,29 @@
5	5		android:layout_height="match_parent"
6	6		android:orientation="vertical">
7	7
8		-	<ImageView
9		-	android:layout_width="match_parent"
10		-	android:layout_height="250dp"
11		-	android:id="@+id/imageView5"
12		-	android:src="@drawable/screen1"
13		-	android:background="#3cdbff" />
14		-
15		-	<LinearLayout
16		-	android:orientation="vertical"
17		-	android:layout_width="match_parent"
18		-	android:layout_height="match_parent">
19		-
20		-	<ScrollView
21		-	android:layout_width="fill_parent"
22		-	android:layout_height="wrap_content"
23		-	android:id="@+id/scrollView3">
	8	+	<ScrollView
	9	+	android:layout_width="fill_parent"
	10	+	android:layout_height="wrap_content"
	11	+	android:id="@+id/scrollView3">
	12	+
	13	+	<LinearLayout
	14	+	android:orientation="vertical"
	15	+	android:layout_width="match_parent"
	16	+	android:layout_height="wrap_content">
	17	+	<ImageView
	18	+	android:layout_width="match_parent"
	19	+	android:layout_height="250dp"
	20	+	android:id="@+id/imageView5"
	21	+	android:src="@drawable/screen1"
	22	+	android:background="#3cdbff" />
24	23
25	24		<LinearLayout
26	25		android:orientation="vertical"
27	26		android:padding="@dimen/space_16dp"
28	27		android:layout_width="match_parent"
29		-	android:layout_height="wrap_content"
30		-	android:layout_weight="0.5">
	28	+	android:layout_height="wrap_content">
	29	+
	30	+
31	31
32	32		<LinearLayout
33	33		android:orientation="vertical"
		@@ -178,9 +178,7 @@
178	178		android:id="@+id/linear2"
179	179		android:layout_weight="0.5">
180	180		</LinearLayout>
181		-
182	181		</LinearLayout>
183		-	</ScrollView>
184		-	</LinearLayout>
185		-
	182	+	</LinearLayout>
	183	+	</ScrollView>
186	184		</LinearLayout>