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

Commit d9ea5b06 authored by Bonian Chen's avatar Bonian Chen Committed by Android (Google) Code Review
Browse files

Merge "[Settings] configuration for hidding SIM notification UI"

parents 6eb3f717 504e71c2

src/com/android/settings/sim/SimDialogActivity.java

+6 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import androidx.fragment.app.FragmentActivity; 
import androidx.fragment.app.FragmentManager;



import com.android.settings.R;

import com.android.settings.network.SubscriptionUtil;

import com.android.settings.network.telephony.SubscriptionActionDialogActivity;



import java.util.List;
@@ -65,6 +66,11 @@ public class SimDialogActivity extends FragmentActivity { 
    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);



        if (!SubscriptionUtil.isSimHardwareVisible(this)) {

            Log.d(TAG, "Not support on device without SIM.");

            finish();

            return;

        }

        SimDialogProhibitService.supportDismiss(this);



        getWindow().addSystemFlags(

src/com/android/settings/sim/SimSelectNotification.java

+4 −0
Original line number Diff line number Diff line
@@ -77,6 +77,10 @@ public class SimSelectNotification extends BroadcastReceiver { 


    @Override

    public void onReceive(Context context, Intent intent) {

        if (!SubscriptionUtil.isSimHardwareVisible(context)) {

            Log.w(TAG, "Received unexpected intent with null action.");

            return;

        }

        String action = intent.getAction();



        if (action == null) {

src/com/android/settings/sim/smartForwarding/SmartForwardingActivity.java

+9 −1
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import androidx.core.content.ContextCompat; 


import com.android.settings.R;

import com.android.settings.core.SettingsBaseActivity;

import com.android.settings.network.SubscriptionUtil;



import com.google.common.util.concurrent.FutureCallback;

import com.google.common.util.concurrent.Futures;
@@ -48,6 +49,7 @@ import com.google.common.util.concurrent.MoreExecutors; 
import java.util.concurrent.Executors;



public class SmartForwardingActivity extends SettingsBaseActivity {

    static final String LOG_TAG = SmartForwardingActivity.class.toString();

    final ListeningExecutorService service =

            MoreExecutors.listeningDecorator(Executors.newSingleThreadExecutor());
@@ -55,6 +57,12 @@ public class SmartForwardingActivity extends SettingsBaseActivity { 
    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);



        if (!SubscriptionUtil.isSimHardwareVisible(this)) {

            Log.d(LOG_TAG, "Not support on device without SIM.");

            finish();

            return;

        }



        final Toolbar toolbar = findViewById(R.id.action_bar);

        toolbar.setVisibility(View.VISIBLE);

        setActionBar(toolbar);

tests/robotests/src/com/android/settings/sim/SimSelectNotificationTest.java

+1 −0
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ public class SimSelectNotificationTest { 
        when(mSubInfo.getDisplayName()).thenReturn(mFakeDisplayName);

        when(mContext.getResources()).thenReturn(mResources);



        when(mResources.getBoolean(R.bool.config_show_sim_info)).thenReturn(true);

        when(mResources.getText(R.string.enable_sending_mms_notification_title))

                .thenReturn(mFakeNotificationTitle);

        when(mResources.getText(R.string.enable_mms_notification_channel_title))