PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't show bubble settings when framework doesn't support it

Browse Source 
Some devices don't support bubbles by configuring config_supportsBubble
value. When the value is set false, it doesn't make sense to show bubble
related preferences.

This CL disables showing bubble preferences when device doesn't support
it.

Bug: 274711609
Test: Set config_supportsBubble false, and check UI.
Test: m -j80 RunSettingsRoboTests ROBOTEST_FILTER="Bubble"
Change-Id: I670ad2a9e243819ea014e5e1ddb9d62ad76d2168
This commit is contained in:
Hiroki Sato
2023-05-02 12:13:50 +09:00
parent 2095c5c5e9
commit e44848cdce
9 changed files with 88 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/notification/app/BubblePreferenceController.java
View File

@@ -20,16 +20,15 @@ import static android.app.NotificationManager.BUBBLE_PREFERENCE_NONE;
import static android.provider.Settings.Secure.NOTIFICATION_BUBBLES;
import android.annotation.Nullable;
import android.app.ActivityManager;
import android.app.NotificationChannel;
import android.content.Context;
import android.provider.Settings;
import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.FragmentManager;
import androidx.preference.Preference;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.notification.BubbleHelper;
import com.android.settings.notification.NotificationBackend;
import com.android.settingslib.RestrictedSwitchPreference;
@@ -42,10 +41,6 @@ public class BubblePreferenceController extends NotificationPreferenceController
private static final String TAG = "BubblePrefContr";
private static final String KEY = "bubble_pref";
@VisibleForTesting
static final int SYSTEM_WIDE_ON = 1;
@VisibleForTesting
static final int SYSTEM_WIDE_OFF = 0;
private FragmentManager mFragmentManager;
private boolean mIsAppPage;
@@ -146,9 +141,7 @@ public class BubblePreferenceController extends NotificationPreferenceController
}
private boolean isEnabled() {
ActivityManager am = mContext.getSystemService(ActivityManager.class);
return !am.isLowRamDevice() && Settings.Secure.getInt(mContext.getContentResolver(),
NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF) == SYSTEM_WIDE_ON;
return BubbleHelper.isEnabledSystemWide(mContext);
}
/**
@@ -163,7 +156,7 @@ public class BubblePreferenceController extends NotificationPreferenceController
// correct preference state
Settings.Secure.putInt(context.getContentResolver(),
NOTIFICATION_BUBBLES,
SYSTEM_WIDE_OFF);
BubbleHelper.SYSTEM_WIDE_OFF);
}
/**
@@ -176,6 +169,6 @@ public class BubblePreferenceController extends NotificationPreferenceController
// correct preference state
Settings.Secure.putInt(context.getContentResolver(),
NOTIFICATION_BUBBLES,
SYSTEM_WIDE_ON);
BubbleHelper.SYSTEM_WIDE_ON);
}
}