Revision 2fa4f15e

View differences:

res/layout/activity_app_select.xml
1
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
2
    xmlns:tools="http://schemas.android.com/tools"
3
    android:layout_width="match_parent"
4
    android:layout_height="match_parent" >
5

  
6
    <fragment
7
        android:id="@+id/fragment_app_list"
8
        android:layout_width="fill_parent"
9
        android:layout_height="fill_parent"
10
        class="info.guardianproject.checkey.AppListFragment" />
11

  
12
</RelativeLayout>
res/layout/activity_main.xml
1
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
1
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
2 2
    xmlns:tools="http://schemas.android.com/tools"
3
    android:id="@+id/container"
4 3
    android:layout_width="match_parent"
5
    android:layout_height="match_parent"
6
    tools:context="info.guardianproject.checkey.MainActivity"
7
    tools:ignore="MergeRootFrame" />
4
    android:layout_height="match_parent" >
5

  
6
    <fragment
7
        android:id="@+id/fragment_app_list"
8
        android:layout_width="fill_parent"
9
        android:layout_height="fill_parent"
10
        class="info.guardianproject.checkey.AppListFragment" />
11

  
12
</RelativeLayout>
src/info/guardianproject/checkey/MainActivity.java
13 13
    @Override
14 14
    protected void onCreate(Bundle savedInstanceState) {
15 15
        super.onCreate(savedInstanceState);
16
        setContentView(R.layout.activity_app_select);
16
        setContentView(R.layout.activity_main);
17 17
    }
18 18

  
19 19
    @Override

Also available in: Unified diff