MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into digitalhigh_automount

Browse Source 
Woop woop
This commit is contained in:
d8ahazard 2016-09-15 13:49:30 -05:00
commit c3b1070b83
2 changed files with 63 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/topjohnwu/magisk/ModulesFragment.java
View File

@ -70,6 +70,8 @@ public class ModulesFragment extends Fragment {
intent.setAction(Intent.ACTION_GET_CONTENT); intent.setAction(Intent.ACTION_GET_CONTENT);
startActivityForResult(intent,FILE_SELECT_CODE); startActivityForResult(intent,FILE_SELECT_CODE);
} }
}); });
} }

98
app/src/main/res/layout/modules_fragment.xml
View File

@ -1,43 +1,67 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:id="@+id/main_content"
android:layout_height="match_parent" android:layout_width="match_parent"
android:layout_marginTop="?attr/actionBarSize" android:layout_height="match_parent">
android:orientation="vertical">
<android.support.design.widget.TabLayout <RelativeLayout
android:id="@+id/tab_layout" android:layout_width="fill_parent"
android:layout_width="match_parent" android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
android:elevation="4dp"
android:minHeight="?attr/actionBarSize"
app:tabGravity="fill"
app:tabIndicatorColor="?attr/colorAccent"
app:tabMode="fixed"
app:tabTextAppearance="@style/TextAppearance.Design.Tab"/>
<ProgressBar <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/progressBar" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="wrap_content" android:id="@+id/llayout"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:layout_gravity="center"/> android:layout_height="fill_parent"
android:layout_marginTop="?attr/actionBarSize"
android:orientation="vertical">
<android.support.v4.view.ViewPager <android.support.design.widget.TabLayout
android:id="@+id/pager" android:id="@+id/tab_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="wrap_content"
android:layout_weight="1"/> android:background="?attr/colorPrimary"
android:elevation="4dp"
android:minHeight="?attr/actionBarSize"
app:tabGravity="fill"
app:tabIndicatorColor="?attr/colorAccent"
app:tabMode="fixed"
app:tabTextAppearance="@style/TextAppearance.Design.Tab" />
<android.support.design.widget.FloatingActionButton <ProgressBar
android:id="@+id/fab" android:id="@+id/progressBar"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="right" android:layout_gravity="center" />
android:layout_margin="16dp"
android:clickable="true"
android:src="@drawable/ic_add"
/>
</LinearLayout> <android.support.v4.view.ViewPager
android:id="@+id/pager"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:animateLayoutChanges="true" />
</LinearLayout>
<LinearLayout
android:id="@+id/ly_bar_bottom"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:gravity="center"
android:orientation="horizontal">
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:baselineAlignBottom="false"
android:clickable="true"
android:src="@drawable/ic_add"
app:layout_anchorGravity="bottom|right|end"
/>
</LinearLayout>
</RelativeLayout>
</android.support.design.widget.CoordinatorLayout>