diff options
| author | scria1000 <91804886+scria1000@users.noreply.github.com> | 2021-11-27 17:10:50 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-27 17:10:50 +0000 |
| commit | a399200be2bb7b3580127c6125980e1cdfd386c7 (patch) | |
| tree | b0e1eb5e93186a4385677f4c8e3cdb80e8e06150 /app/src/main/AndroidManifest.xml | |
| parent | 90a9b1033f36087ce302e06304cbf3581921748b (diff) | |
| parent | d8f657226293c2be4f97eae687fde0dec1936d22 (diff) | |
| download | infinity-for-reddit-a399200be2bb7b3580127c6125980e1cdfd386c7.tar infinity-for-reddit-a399200be2bb7b3580127c6125980e1cdfd386c7.tar.gz infinity-for-reddit-a399200be2bb7b3580127c6125980e1cdfd386c7.tar.bz2 infinity-for-reddit-a399200be2bb7b3580127c6125980e1cdfd386c7.tar.lz infinity-for-reddit-a399200be2bb7b3580127c6125980e1cdfd386c7.tar.xz infinity-for-reddit-a399200be2bb7b3580127c6125980e1cdfd386c7.tar.zst infinity-for-reddit-a399200be2bb7b3580127c6125980e1cdfd386c7.zip | |
Merge branch 'master' into gallery-captions-feature
Diffstat (limited to 'app/src/main/AndroidManifest.xml')
| -rw-r--r-- | app/src/main/AndroidManifest.xml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 51a0ca10..6852e8a5 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -25,7 +25,7 @@ <uses-permission android:name="android.permission.WAKE_LOCK" /> <application - android:name=".Infinity" + android:name="ml.docilealligator.infinityforreddit.Infinity" android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="@string/application_name" @@ -34,6 +34,11 @@ android:theme="@style/AppTheme" android:usesCleartextTraffic="true" tools:replace="android:label"> + <activity android:name=".activities.EditProfileActivity" + android:label="@string/edit_profile_activity_label" + android:parentActivityName=".activities.MainActivity" + android:theme="@style/AppTheme.Slidable" + android:windowSoftInputMode="adjustPan" /> <activity android:name=".activities.WikiActivity" android:label="@string/wiki_activity_label" @@ -393,11 +398,6 @@ android:parentActivityName=".activities.MainActivity" android:theme="@style/AppTheme.SlidableWithTranslucentWindow" /> - <activity android:name=".activities.EditProfileActivity" - android:parentActivityName=".activities.MainActivity" - android:theme="@style/AppTheme.SlidableWithTranslucentWindow" - android:windowSoftInputMode="adjustPan" /> - <provider android:name="androidx.core.content.FileProvider" android:authorities="ml.docilealligator.infinityforreddit.provider" |