Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

manifest merger failed resolved for android 12 #512

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

manifest merger failed resolved for android 12 #512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eddf1c7
manifest merger failed
Dec 23, 2021
7ad0ab3
progress dialog style
Dec 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 6 additions & 3 deletions folioreader/AndroidManifest.xml
View file
Open in desktop
Expand Up @@ -21,15 +21,18 @@
<activity
android:name="com.folioreader.ui.activity.FolioActivity"
android:label="@string/app_name"
android:theme="@style/FolioActivityDayTheme" />
android:theme="@style/FolioActivityDayTheme"
android:exported="false" />

<activity
android:name="com.folioreader.ui.activity.ContentHighlightActivity"
android:theme="@style/AppTheme.NoActionBar" />
android:theme="@style/AppTheme.NoActionBar"
android:exported="false" />

<activity
android:name="com.folioreader.ui.activity.SearchActivity"
android:launchMode="singleTop">
android:launchMode="singleTop"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.SEARCH" />
</intent-filter>
Expand Down
3 changes: 1 addition & 2 deletions folioreader/res/layout/progress_dialog.xml
View file
Open in desktop
Expand Up @@ -13,8 +13,7 @@
<ProgressBar
android:id="@+id/loading"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="?android:attr/android:progressBarStyle" />
android:layout_height="wrap_content"/>

<TextView
android:id="@+id/label_loading"
Expand Down
3 changes: 2 additions & 1 deletion sample/src/main/AndroidManifest.xml
View file
Open in desktop
Expand Up @@ -13,7 +13,8 @@

<activity
android:name=".HomeActivity"
android:label="@string/app_name">
android:label="@string/app_name"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
Expand Down