Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
Magisk
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Magisk
Commits
c3b1070b
Commit
c3b1070b
authored
Sep 15, 2016
by
d8ahazard
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'refs/remotes/origin/master' into digitalhigh_automount
Woop woop
parents
c992b89b
20db2162
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
68 additions
and
42 deletions
+68
-42
ModulesFragment.java
app/src/main/java/com/topjohnwu/magisk/ModulesFragment.java
+2
-0
modules_fragment.xml
app/src/main/res/layout/modules_fragment.xml
+66
-42
No files found.
app/src/main/java/com/topjohnwu/magisk/ModulesFragment.java
View file @
c3b1070b
...
@@ -70,6 +70,8 @@ public class ModulesFragment extends Fragment {
...
@@ -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
);
}
}
});
});
}
}
...
...
app/src/main/res/layout/modules_fragment.xml
View file @
c3b1070b
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<
Linea
rLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<
android.support.design.widget.Coordinato
rLayout
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:id=
"@+id/main_content"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
>
<RelativeLayout
android:layout_width=
"fill_parent"
android:layout_height=
"wrap_content"
>
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
android:id=
"@+id/llayout"
android:layout_width=
"match_parent"
android:layout_height=
"fill_parent"
android:layout_marginTop=
"?attr/actionBarSize"
android:layout_marginTop=
"?attr/actionBarSize"
android:orientation=
"vertical"
>
android:orientation=
"vertical"
>
...
@@ -16,28 +27,41 @@
...
@@ -16,28 +27,41 @@
app:tabGravity=
"fill"
app:tabGravity=
"fill"
app:tabIndicatorColor=
"?attr/colorAccent"
app:tabIndicatorColor=
"?attr/colorAccent"
app:tabMode=
"fixed"
app:tabMode=
"fixed"
app:tabTextAppearance=
"@style/TextAppearance.Design.Tab"
/>
app:tabTextAppearance=
"@style/TextAppearance.Design.Tab"
/>
<ProgressBar
<ProgressBar
android:id=
"@+id/progressBar"
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=
"center"
/>
android:layout_gravity=
"center"
/>
<android.support.v4.view.ViewPager
<android.support.v4.view.ViewPager
android:id=
"@+id/pager"
android:id=
"@+id/pager"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"0dp
"
android:layout_height=
"match_parent
"
android:layout_weight=
"1"
/>
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.support.design.widget.FloatingActionButton
android:id=
"@+id/fab"
android:id=
"@+id/fab"
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_margin=
"16dp"
android:layout_margin=
"16dp"
android:baselineAlignBottom=
"false"
android:clickable=
"true"
android:clickable=
"true"
android:src=
"@drawable/ic_add"
android:src=
"@drawable/ic_add"
app:layout_anchorGravity=
"bottom|right|end"
/>
/>
</LinearLayout>
</LinearLayout>
</RelativeLayout>
\ No newline at end of file
</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment