Skip to content

Commit 30b4d81

Browse files
committed
Reset for start of lecture
1 parent c4bc1f4 commit 30b4d81

File tree

4 files changed

+2
-122
lines changed

4 files changed

+2
-122
lines changed

app/src/main/java/edu/uw/layoutdemo/MainActivity.java

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22

33
import android.os.Bundle;
44
import android.support.v7.app.AppCompatActivity;
5-
import android.view.View;
6-
import android.view.ViewStub;
7-
import android.widget.Button;
85

96
public class MainActivity extends AppCompatActivity {
107

@@ -14,18 +11,5 @@ public class MainActivity extends AppCompatActivity {
1411
protected void onCreate(Bundle savedInstanceState) {
1512
super.onCreate(savedInstanceState);
1613
setContentView(R.layout.activity_main);
17-
// setContentView(R.layout.activity_relative);
18-
// setContentView(R.layout.input_control_layout);
19-
20-
Button btn = (Button)findViewById(R.id.button);
21-
btn.setOnClickListener(new View.OnClickListener() {
22-
@Override
23-
public void onClick(View v) {
24-
ViewStub stub = (ViewStub) findViewById(R.id.stub);
25-
if(stub != null) {
26-
View inflated = stub.inflate();
27-
}
28-
}
29-
});
3014
}
3115
}

app/src/main/res/layout/activity_main.xml

Lines changed: 2 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
android:paddingRight="@dimen/activity_horizontal_margin"
99
android:paddingTop="@dimen/activity_vertical_margin"
1010
android:orientation="vertical"
11-
android:background="#EEEEEE"
1211
tools:context="edu.uw.layoutdemo.MainActivity">
1312

1413
<TextView
@@ -19,50 +18,8 @@
1918
android:text="@string/greeting" />
2019
<Button
2120
android:id="@+id/button"
22-
android:layout_width="match_parent"
23-
android:layout_height="0dp"
24-
android:layout_weight="1"
25-
android:text="Click me!" />
26-
27-
<!--<ImageView-->
28-
<!--android:id="@+id/picture"-->
29-
<!--android:layout_width="wrap_content"-->
30-
<!--android:layout_height="0dp"-->
31-
<!--android:layout_weight="2"-->
32-
<!--android:layout_gravity="center"-->
33-
<!--android:src="@drawable/android_maneki"-->
34-
<!--/>-->
35-
36-
<ViewStub
37-
android:id="@+id/stub"
38-
android:inflatedId="@+id/stubTree"
39-
android:layout="@layout/image_content"
40-
android:layout_width="match_parent"
41-
android:layout_height="0dp"
42-
android:layout_weight="2"
43-
/>
44-
45-
<LinearLayout
46-
android:layout_width="match_parent"
21+
android:layout_width="wrap_content"
4722
android:layout_height="wrap_content"
48-
android:layout_below="@+id/picture">
49-
50-
<TextView
51-
android:layout_width="0dp"
52-
android:layout_height="wrap_content"
53-
android:layout_weight="1"
54-
android:text="Text 1"/>
55-
56-
<TextView
57-
android:layout_width="0dp"
58-
android:layout_height="wrap_content"
59-
android:layout_weight="1"
60-
android:text="Text 2"/>
23+
android:text="Click me!" />
6124

62-
<TextView
63-
android:layout_width="0dp"
64-
android:layout_height="wrap_content"
65-
android:layout_weight="1"
66-
android:text="Text 3"/>
67-
</LinearLayout>
6825
</LinearLayout>

app/src/main/res/layout/activity_relative.xml

Lines changed: 0 additions & 57 deletions
This file was deleted.

app/src/main/res/values-fr/strings.xml

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)