Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1da7fbb0 authored by yuanjiahsu's avatar yuanjiahsu
Browse files

Clean Safetyhub feature flag from Settings. 

Clean all related code, need submit together.

Test: Manually
Bug: 118848485
Change-Id: Icaa0c0736dfa4a7d96aba396a884c9d3383a0f22
parent 87631db9

src/com/android/settings/accounts/EmergencyInfoPreferenceController.java

+4 −17
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.content.res.Resources; 
import android.os.UserHandle;

import android.os.UserManager;

import android.text.TextUtils;

import android.util.FeatureFlagUtils;



import androidx.preference.Preference;
@@ -35,9 +34,9 @@ import java.util.List; 


public class EmergencyInfoPreferenceController extends BasePreferenceController {



    public static final String ACTION_EDIT_EMERGENCY_INFO = "android.settings.EDIT_EMERGENCY_INFO";



    private static final String PACKAGE_NAME_EMERGENCY = "com.android.emergency";

    public static String getIntentAction(Context context) {

        return context.getResources().getString(R.string.config_emergency_intent_action);

    }



    public EmergencyInfoPreferenceController(Context context, String preferenceKey) {

        super(context, preferenceKey);
@@ -85,19 +84,7 @@ public class EmergencyInfoPreferenceController extends BasePreferenceController 
                ? 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) {

        if (FeatureFlagUtils.isEnabled(context, FeatureFlagUtils.SAFETY_HUB)) {

        return context.getResources().getString(R.string.config_emergency_package_name);

    }



        return PACKAGE_NAME_EMERGENCY;

    }

}

src/com/android/settings/homepage/contextualcards/deviceinfo/EmergencyInfoSlice.java

+2 −3
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package com.android.settings.homepage.contextualcards.deviceinfo;



import static com.android.settings.accounts.EmergencyInfoPreferenceController.ACTION_EDIT_EMERGENCY_INFO;



import android.app.PendingIntent;

import android.content.Context;

import android.content.Intent;
@@ -29,6 +27,7 @@ import androidx.slice.builders.ListBuilder; 
import androidx.slice.builders.SliceAction;



import com.android.settings.R;

import com.android.settings.accounts.EmergencyInfoPreferenceController;

import com.android.settings.slices.CustomSliceRegistry;

import com.android.settings.slices.CustomSliceable;
@@ -62,7 +61,7 @@ public class EmergencyInfoSlice implements CustomSliceable { 


    @Override

    public Intent getIntent() {

        return new Intent(ACTION_EDIT_EMERGENCY_INFO);

        return new Intent(EmergencyInfoPreferenceController.getIntentAction(mContext));

    }



    @Override