|
3 | 3 | android:layout_width="match_parent"
|
4 | 4 | android:layout_height="match_parent"
|
5 | 5 | android:background="@color/dark_comment"
|
6 |
| - android:minWidth="@dimen/minstd"> |
| 6 | + android:minWidth="@dimen/std"> |
7 | 7 |
|
8 | 8 | <LinearLayout
|
9 | 9 | android:layout_width="match_parent"
|
|
26 | 26 |
|
27 | 27 | </LinearLayout>
|
28 | 28 |
|
29 |
| - |
30 |
| - <LinearLayout style="@style/OptionItem"> |
31 |
| - |
32 |
| - <TextView |
33 |
| - style="@style/OptionName" |
34 |
| - android:text="@string/score" /> |
35 |
| - |
36 |
| - <TextView |
37 |
| - android:id="@+id/score" |
38 |
| - style="@style/OptionValue" /> |
39 |
| - |
40 |
| - </LinearLayout> |
41 |
| - |
42 | 29 | <LinearLayout style="@style/OptionItem">
|
43 | 30 |
|
44 | 31 | <TextView
|
|
58 | 45 | <LinearLayout style="@style/OptionItem">
|
59 | 46 |
|
60 | 47 | <Button
|
61 |
| - android:id="@+id/clear" |
| 48 | + android:id="@+id/reset" |
62 | 49 | style="@style/OptionButton"
|
63 | 50 | android:text="@string/clear" />
|
64 | 51 |
|
65 | 52 | </LinearLayout>
|
66 | 53 |
|
67 | 54 | <LinearLayout style="@style/OptionItem">
|
68 | 55 |
|
| 56 | + <!-- text programmatically set --> |
69 | 57 | <Button
|
70 | 58 | android:id="@+id/charm"
|
71 | 59 | style="@style/OptionButton" />
|
|
74 | 62 |
|
75 | 63 | <LinearLayout style="@style/OptionItem">
|
76 | 64 |
|
| 65 | + <!-- text programmatically set --> |
77 | 66 | <Button
|
78 | 67 | android:id="@+id/notif"
|
79 | 68 | style="@style/OptionButton" />
|
80 | 69 |
|
81 | 70 | </LinearLayout>
|
82 | 71 |
|
83 | 72 | <LinearLayout style="@style/OptionItem">
|
| 73 | + <TextView |
| 74 | + style="@style/OptionName" |
| 75 | + android:text="@string/set_mode" /> |
84 | 76 |
|
85 |
| - <Button |
86 |
| - android:id="@+id/mode" |
87 |
| - style="@style/OptionButton" |
88 |
| - android:text="@string/mode" /> |
89 |
| - |
| 77 | + <Spinner |
| 78 | + style="@style/OptionName" |
| 79 | + android:id="@+id/mode_selector" /> |
90 | 80 | </LinearLayout>
|
91 | 81 |
|
92 | 82 | <Button
|
93 |
| - android:id="@+id/footer" |
94 | 83 | style="@style/Header"
|
| 84 | + android:id="@+id/footer" |
95 | 85 | android:text="@string/footer"
|
96 | 86 | android:textAllCaps="false" />
|
97 | 87 | </LinearLayout>
|
|
0 commit comments