Skip to content

Commit da458a9

Browse files
Rename BaseActivity.setImmersiveModeNotApplicable to setImmersiveModeNotApplicableBelowAndroid16. setImmersiveModeNotApplicableBelowAndroid16 has no effect on Android >= 15. Edge to edge in SettingsActivity and CustomFontPreferenceFragmentCompat on Android >= 15.
1 parent 8a42e46 commit da458a9

34 files changed

+87
-38
lines changed

app/src/main/java/ml/docilealligator/infinityforreddit/activities/BaseActivity.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,10 @@ protected void setHasDrawerLayout() {
369369
hasDrawerLayout = true;
370370
}
371371

372-
public void setImmersiveModeNotApplicable() {
372+
public void setImmersiveModeNotApplicableBelowAndroid16() {
373+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
374+
return;
375+
}
373376
isImmersiveInterfaceApplicable = false;
374377
}
375378

app/src/main/java/ml/docilealligator/infinityforreddit/activities/CommentActivity.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package ml.docilealligator.infinityforreddit.activities;
22

33
import android.content.ActivityNotFoundException;
4-
import android.content.DialogInterface;
54
import android.content.Intent;
65
import android.content.SharedPreferences;
76
import android.net.Uri;
@@ -12,7 +11,6 @@
1211
import android.provider.MediaStore;
1312
import android.text.Spanned;
1413
import android.text.TextUtils;
15-
import android.util.Log;
1614
import android.view.Menu;
1715
import android.view.MenuItem;
1816
import android.view.View;
@@ -160,7 +158,7 @@ public class CommentActivity extends BaseActivity implements UploadImageEnabledA
160158
protected void onCreate(Bundle savedInstanceState) {
161159
((Infinity) getApplication()).getAppComponent().inject(this);
162160

163-
setImmersiveModeNotApplicable();
161+
setImmersiveModeNotApplicableBelowAndroid16();
164162

165163
super.onCreate(savedInstanceState);
166164
binding = ActivityCommentBinding.inflate(getLayoutInflater());

app/src/main/java/ml/docilealligator/infinityforreddit/activities/CommentFilterPreferenceActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public class CommentFilterPreferenceActivity extends BaseActivity {
5353
protected void onCreate(Bundle savedInstanceState) {
5454
((Infinity) getApplication()).getAppComponent().inject(this);
5555

56-
setImmersiveModeNotApplicable();
56+
setImmersiveModeNotApplicableBelowAndroid16();
5757

5858
super.onCreate(savedInstanceState);
5959
binding = ActivityCommentFilterPreferenceBinding.inflate(getLayoutInflater());

app/src/main/java/ml/docilealligator/infinityforreddit/activities/CommentFilterUsageListingActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public class CommentFilterUsageListingActivity extends BaseActivity {
5959
protected void onCreate(Bundle savedInstanceState) {
6060
((Infinity) getApplication()).getAppComponent().inject(this);
6161

62-
setImmersiveModeNotApplicable();
62+
setImmersiveModeNotApplicableBelowAndroid16();
6363

6464
super.onCreate(savedInstanceState);
6565
binding = ActivityCommentFilterUsageListingBinding.inflate(getLayoutInflater());

app/src/main/java/ml/docilealligator/infinityforreddit/activities/CreateMultiRedditActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public class CreateMultiRedditActivity extends BaseActivity {
6060
protected void onCreate(Bundle savedInstanceState) {
6161
((Infinity) getApplication()).getAppComponent().inject(this);
6262

63-
setImmersiveModeNotApplicable();
63+
setImmersiveModeNotApplicableBelowAndroid16();
6464

6565
super.onCreate(savedInstanceState);
6666
binding = ActivityCreateMultiRedditBinding.inflate(getLayoutInflater());

app/src/main/java/ml/docilealligator/infinityforreddit/activities/CustomThemeListingActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public class CustomThemeListingActivity extends BaseActivity implements
9999
protected void onCreate(Bundle savedInstanceState) {
100100
((Infinity) getApplication()).getAppComponent().inject(this);
101101

102-
setImmersiveModeNotApplicable();
102+
setImmersiveModeNotApplicableBelowAndroid16();
103103

104104
super.onCreate(savedInstanceState);
105105
binding = ActivityCustomThemeListingBinding.inflate(getLayoutInflater());

app/src/main/java/ml/docilealligator/infinityforreddit/activities/CustomizeCommentFilterActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public class CustomizeCommentFilterActivity extends BaseActivity {
7373
protected void onCreate(Bundle savedInstanceState) {
7474
((Infinity) getApplication()).getAppComponent().inject(this);
7575

76-
setImmersiveModeNotApplicable();
76+
setImmersiveModeNotApplicableBelowAndroid16();
7777

7878
super.onCreate(savedInstanceState);
7979
binding = ActivityCustomizeCommentFilterBinding.inflate(getLayoutInflater());

app/src/main/java/ml/docilealligator/infinityforreddit/activities/CustomizePostFilterActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public class CustomizePostFilterActivity extends BaseActivity {
7777
protected void onCreate(Bundle savedInstanceState) {
7878
((Infinity) getApplication()).getAppComponent().inject(this);
7979

80-
setImmersiveModeNotApplicable();
80+
setImmersiveModeNotApplicableBelowAndroid16();
8181

8282
super.onCreate(savedInstanceState);
8383
binding = ActivityCustomizePostFilterBinding.inflate(getLayoutInflater());

app/src/main/java/ml/docilealligator/infinityforreddit/activities/CustomizeThemeActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public class CustomizeThemeActivity extends BaseActivity {
9696
protected void onCreate(Bundle savedInstanceState) {
9797
((Infinity) getApplication()).getAppComponent().inject(this);
9898

99-
setImmersiveModeNotApplicable();
99+
setImmersiveModeNotApplicableBelowAndroid16();
100100

101101
super.onCreate(savedInstanceState);
102102
binding = ActivityCustomizeThemeBinding.inflate(getLayoutInflater());

app/src/main/java/ml/docilealligator/infinityforreddit/activities/EditCommentActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public class EditCommentActivity extends BaseActivity implements UploadImageEnab
108108
protected void onCreate(Bundle savedInstanceState) {
109109
((Infinity) getApplication()).getAppComponent().inject(this);
110110

111-
setImmersiveModeNotApplicable();
111+
setImmersiveModeNotApplicableBelowAndroid16();
112112

113113
super.onCreate(savedInstanceState);
114114

0 commit comments

Comments
 (0)