Project

General

Profile

« Previous | Next » 

Revision b4a73ea5

Added by Leszek Koltunski almost 8 years ago

Essentially revert the last commit :)

View differences:

src/main/res/layout/fragment3dchroma.xml
1 1
<?xml version="1.0" encoding="utf-8"?>
2
            <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3
                          android:id="@+id/fragment3dRowChroma"
4
                          android:orientation="horizontal"
5
                          android:layout_width="match_parent"
6
                          android:layout_height="wrap_content" >
7 2

  
8
                <LinearLayout
9
                    android:layout_width="0dp"
10
                    android:layout_height="match_parent"
11
                    android:layout_weight="0.70"
12
                    android:orientation="vertical" >
3
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
4
              android:id="@+id/fragment3dRowChroma"
5
              android:orientation="horizontal"
6
              android:layout_width="match_parent"
7
              android:layout_height="wrap_content" >
8
    <LinearLayout
9
        android:layout_width="0dp"
10
        android:layout_height="match_parent"
11
        android:layout_weight="0.70"
12
        android:orientation="vertical" >
13 13

  
14
                    <TextView
15
                        android:id="@+id/fragment3dchromaText"
16
                        android:layout_width="wrap_content"
17
                        android:layout_height="wrap_content"
18
                        android:layout_marginEnd="5dp"
19
                        android:layout_marginStart="5dp"
20
                        android:layout_marginTop="3dp"
21
                        />
14
        <TextView
15
            android:id="@+id/fragment3dchromaText"
16
            android:layout_width="wrap_content"
17
            android:layout_height="wrap_content"
18
            android:layout_marginEnd="5dp"
19
            android:layout_marginStart="5dp"
20
            android:layout_marginTop="3dp" />
22 21

  
23
                    <SeekBar
24
                        android:id="@+id/fragment3dchromaBar1"
25
                        android:layout_width="fill_parent"
26
                        android:layout_height="wrap_content"
27
                        android:layout_gravity="end"
28
                        android:layout_marginEnd="5dp"
29
                        android:layout_marginLeft="5dp"
30
                        android:layout_marginRight="5dp" />
22
        <SeekBar
23
            android:id="@+id/fragment3dchromaBar1"
24
            android:layout_width="fill_parent"
25
            android:layout_height="wrap_content"
26
            android:layout_gravity="end"
27
            android:layout_marginEnd="5dp"
28
            android:layout_marginLeft="5dp"
29
            android:layout_marginRight="5dp" />
31 30

  
32
                    <LinearLayout
33
                        android:orientation="horizontal"
34
                        android:layout_width="match_parent"
35
                        android:layout_height="match_parent">
31
        <LinearLayout
32
            android:orientation="horizontal"
33
            android:layout_width="match_parent"
34
            android:layout_height="match_parent">
36 35

  
37
                        <SeekBar
38
                            android:id="@+id/fragment3dchromaBar2"
39
                            android:layout_width="fill_parent"
40
                            android:layout_height="wrap_content"
41
                            android:layout_marginLeft="5dp"
42
                            android:layout_marginRight="5dp"
43
                            android:layout_weight="0.33"/>
36
            <SeekBar
37
                android:id="@+id/fragment3dchromaBar2"
38
                android:layout_width="fill_parent"
39
                android:layout_height="wrap_content"
40
                android:layout_marginLeft="5dp"
41
                android:layout_marginRight="5dp"
42
                android:layout_weight="0.33"/>
44 43

  
45
                        <SeekBar
46
                            android:id="@+id/fragment3dchromaBar3"
47
                            android:layout_width="fill_parent"
48
                            android:layout_height="wrap_content"
49
                            android:layout_marginEnd="5dp"
50
                            android:layout_marginLeft="5dp"
51
                            android:layout_marginRight="5dp"
52
                            android:layout_weight="0.33"/>
44
            <SeekBar
45
                android:id="@+id/fragment3dchromaBar3"
46
                android:layout_width="fill_parent"
47
                android:layout_height="wrap_content"
48
                android:layout_marginEnd="5dp"
49
                android:layout_marginLeft="5dp"
50
                android:layout_marginRight="5dp"
51
                android:layout_weight="0.33"/>
53 52

  
54
                        <SeekBar
55
                            android:id="@+id/fragment3dchromaBar4"
56
                            android:layout_width="fill_parent"
57
                            android:layout_height="wrap_content"
58
                            android:layout_marginRight="5dp"
59
                            android:layout_marginLeft="5dp"
60
                            android:layout_weight="0.33"/>
61
                    </LinearLayout>
53
            <SeekBar
54
                android:id="@+id/fragment3dchromaBar4"
55
                android:layout_width="fill_parent"
56
                android:layout_height="wrap_content"
57
                android:layout_marginRight="5dp"
58
                android:layout_marginLeft="5dp"
59
                android:layout_weight="0.33"/>
62 60

  
63
                </LinearLayout>
61
        </LinearLayout>
64 62

  
65
                <Button
66
                    android:id="@+id/fragment3dUpChroma"
67
                    android:layout_width="60dp"
68
                    android:layout_height="fill_parent"
69
                    android:onClick="ButtonChroma"
70
                    android:text="@string/Up" />
63
    </LinearLayout>
71 64

  
72
            </LinearLayout>
65
    <Button
66
        android:id="@+id/fragment3dUpChroma"
67
        android:layout_width="60dp"
68
        android:layout_height="fill_parent"
69
        android:onClick="ButtonChroma"
70
        android:text="@string/Up" />
71

  
72
</LinearLayout>

Also available in: Unified diff