Skip to content

Commit b44c3fd

Browse files
committed
Fix #2375
1 parent 6ac9414 commit b44c3fd

File tree

4 files changed

+11
-13
lines changed

4 files changed

+11
-13
lines changed

mobile/proguard-rules.pro

-1
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,3 @@
2222
#-renamesourcefileattribute SourceFile
2323

2424
-dontwarn com.google.android.gms.internal.**
25-
-keep class com.github.shadowsocks.ProfileConfigFragment

mobile/src/main/res/layout/layout_profile_config.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
android:layout_width="match_parent"
55
android:layout_height="match_parent">
66
<include layout="@layout/toolbar_light_dark" />
7-
<androidx.fragment.app.FragmentContainerView
7+
<fragment
88
android:id="@+id/content"
99
android:name="com.github.shadowsocks.ProfileConfigFragment"
1010
android:layout_width="match_parent"

mobile/src/main/res/layout/layout_scanner.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
android:layout_height="match_parent"
77
android:orientation="vertical">
88
<include layout="@layout/toolbar_light_dark" />
9-
<androidx.fragment.app.FragmentContainerView
9+
<fragment
1010
android:id="@+id/barcode"
1111
android:name="com.google.android.gms.samples.vision.barcodereader.BarcodeCapture"
1212
android:layout_width="fill_parent"
+9-10
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<androidx.fragment.app.FragmentContainerView
3-
xmlns:android="http://schemas.android.com/apk/res/android"
4-
xmlns:tools="http://schemas.android.com/tools"
5-
android:id="@+id/main_browse_fragment"
6-
android:name="com.github.shadowsocks.tv.MainFragment"
7-
android:layout_width="match_parent"
8-
android:layout_height="match_parent"
9-
tools:context=".MainActivity"
10-
tools:deviceIds="tv"
11-
tools:ignore="MergeRootFrame"/>
2+
<fragment xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools"
4+
android:id="@+id/main_browse_fragment"
5+
android:name="com.github.shadowsocks.tv.MainFragment"
6+
android:layout_width="match_parent"
7+
android:layout_height="match_parent"
8+
tools:context=".MainActivity"
9+
tools:deviceIds="tv"
10+
tools:ignore="MergeRootFrame"/>

0 commit comments

Comments
 (0)