Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add feature flag in Settings."

Browse Source 
am: 55b91f6d93

Change-Id: I27aa24563358fe4467de3aa3660825f1d8bd73d5
This commit is contained in:
Yuanjia Hsu
2018-09-17 07:09:28 -07:00
committed by android-build-merger
parent b4c55fac9a 55b91f6d93
commit b04fcd5842
4 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/provider/Settings.java
View File

@@ -11330,14 +11330,6 @@ public final class Settings {
*/
public static final String EMERGENCY_AFFORDANCE_NEEDED = "emergency_affordance_needed";
/**
* Enable faster emergency phone call feature.
* The value is a boolean (1 or 0).
* @hide
*/
public static final String FASTER_EMERGENCY_PHONE_CALL_ENABLED =
"faster_emergency_phone_call_enabled";
/**
* See RIL_PreferredNetworkType in ril.h
* @hide

2
core/java/android/util/FeatureFlagUtils.java
View File

@@ -33,6 +33,7 @@ public class FeatureFlagUtils {
public static final String FFLAG_PREFIX = "sys.fflag.";
public static final String FFLAG_OVERRIDE_PREFIX = FFLAG_PREFIX + "override.";
public static final String EMERGENCY_DIAL_SHORTCUTS = "settings_emergency_dial_shortcuts";
private static final Map<String, String> DEFAULT_FLAGS;
static {
@@ -44,6 +45,7 @@ public class FeatureFlagUtils {
DEFAULT_FLAGS.put("settings_data_usage_v2", "true");
DEFAULT_FLAGS.put("settings_audio_switcher", "true");
DEFAULT_FLAGS.put("settings_systemui_theme", "true");
DEFAULT_FLAGS.put(EMERGENCY_DIAL_SHORTCUTS, "false");
}
/**

1
core/tests/coretests/src/android/provider/SettingsBackupTest.java
View File

@@ -238,7 +238,6 @@ public class SettingsBackupTest {
Settings.Global.EUICC_SUPPORTED_COUNTRIES,
Settings.Global.EUICC_FACTORY_RESET_TIMEOUT_MILLIS,
Settings.Global.FANCY_IME_ANIMATIONS,
Settings.Global.FASTER_EMERGENCY_PHONE_CALL_ENABLED,
Settings.Global.FORCE_ALLOW_ON_EXTERNAL,
Settings.Global.FORCED_APP_STANDBY_ENABLED,
Settings.Global.FORCED_APP_STANDBY_FOR_SMALL_BATTERY_ENABLED,

5
packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
View File

@@ -55,6 +55,7 @@ import android.telephony.ServiceState;
import android.telephony.TelephonyManager;
import android.text.TextUtils;
import android.util.ArraySet;
import android.util.FeatureFlagUtils;
import android.util.Log;
import android.view.ContextThemeWrapper;
import android.view.LayoutInflater;
@@ -318,8 +319,8 @@ class GlobalActionsDialog implements DialogInterface.OnDismissListener,
ArraySet<String> addedKeys = new ArraySet<String>();
mHasLogoutButton = false;
mHasLockdownButton = false;
mSeparatedEmergencyButtonEnabled = Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.FASTER_EMERGENCY_PHONE_CALL_ENABLED, 0) != 0;
mSeparatedEmergencyButtonEnabled = FeatureFlagUtils
.isEnabled(mContext, FeatureFlagUtils.EMERGENCY_DIAL_SHORTCUTS);
for (int i = 0; i < defaultActions.length; i++) {
String actionKey = defaultActions[i];
if (addedKeys.contains(actionKey)) {