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

Merge "Clean Safetyhub feature flag from Settings." into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-05-02 08:44:39 +00:00
committed by Android (Google) Code Review
parent 0dde3a3b34 1da7fbb09d
commit ccfd708b87
2 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/com/android/settings/accounts/EmergencyInfoPreferenceController.java
View File

@@ -23,7 +23,6 @@ import android.content.res.Resources;
import android.os.UserHandle; import android.os.UserHandle;
import android.os.UserManager; import android.os.UserManager;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.FeatureFlagUtils;
import androidx.preference.Preference; import androidx.preference.Preference;
@@ -35,9 +34,9 @@ import java.util.List;
public class EmergencyInfoPreferenceController extends BasePreferenceController { public class EmergencyInfoPreferenceController extends BasePreferenceController {
public static final String ACTION_EDIT_EMERGENCY_INFO = "android.settings.EDIT_EMERGENCY_INFO"; public static String getIntentAction(Context context) {
return context.getResources().getString(R.string.config_emergency_intent_action);
private static final String PACKAGE_NAME_EMERGENCY = "com.android.emergency"; }
public EmergencyInfoPreferenceController(Context context, String preferenceKey) { public EmergencyInfoPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey); super(context, preferenceKey);
@@ -85,19 +84,7 @@ public class EmergencyInfoPreferenceController extends BasePreferenceController
? AVAILABLE : UNSUPPORTED_ON_DEVICE; ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
} }
private static String getIntentAction(Context context) {
if (FeatureFlagUtils.isEnabled(context, FeatureFlagUtils.SAFETY_HUB)) {
return context.getResources().getString(R.string.config_emergency_intent_action);
}
return ACTION_EDIT_EMERGENCY_INFO;
}
private static String getPackageName(Context context) { private static String getPackageName(Context context) {
if (FeatureFlagUtils.isEnabled(context, FeatureFlagUtils.SAFETY_HUB)) { return context.getResources().getString(R.string.config_emergency_package_name);
return context.getResources().getString(R.string.config_emergency_package_name);
}
return PACKAGE_NAME_EMERGENCY;
} }
} }

5
src/com/android/settings/homepage/contextualcards/deviceinfo/EmergencyInfoSlice.java
View File

@@ -16,8 +16,6 @@
package com.android.settings.homepage.contextualcards.deviceinfo; package com.android.settings.homepage.contextualcards.deviceinfo;
import static com.android.settings.accounts.EmergencyInfoPreferenceController.ACTION_EDIT_EMERGENCY_INFO;
import android.app.PendingIntent; import android.app.PendingIntent;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
@@ -29,6 +27,7 @@ import androidx.slice.builders.ListBuilder;
import androidx.slice.builders.SliceAction; import androidx.slice.builders.SliceAction;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.accounts.EmergencyInfoPreferenceController;
import com.android.settings.slices.CustomSliceRegistry; import com.android.settings.slices.CustomSliceRegistry;
import com.android.settings.slices.CustomSliceable; import com.android.settings.slices.CustomSliceable;
@@ -62,7 +61,7 @@ public class EmergencyInfoSlice implements CustomSliceable {
@Override @Override
public Intent getIntent() { public Intent getIntent() {
return new Intent(ACTION_EDIT_EMERGENCY_INFO); return new Intent(EmergencyInfoPreferenceController.getIntentAction(mContext));
} }
@Override @Override