diff --git a/res/drawable/satellite_sos_counter_1.xml b/res/drawable/satellite_sos_counter_1.xml deleted file mode 100644 index 14cce3cb2ad..00000000000 --- a/res/drawable/satellite_sos_counter_1.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/res/drawable/satellite_sos_counter_2.xml b/res/drawable/satellite_sos_counter_2.xml deleted file mode 100644 index 3f59d0bd0d9..00000000000 --- a/res/drawable/satellite_sos_counter_2.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/res/drawable/satellite_sos_counter_3.xml b/res/drawable/satellite_sos_counter_3.xml deleted file mode 100644 index 0b923882159..00000000000 --- a/res/drawable/satellite_sos_counter_3.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/res/drawable/satellite_sos_illustration.xml b/res/drawable/satellite_sos_illustration.xml deleted file mode 100644 index 332b478c971..00000000000 --- a/res/drawable/satellite_sos_illustration.xml +++ /dev/null @@ -1,136 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/res/drawable/satellite_sos_quantum_gm_ic_hand_gesture_vd_20.xml b/res/drawable/satellite_sos_quantum_gm_ic_hand_gesture_vd_20.xml deleted file mode 100644 index 2aff18fcf67..00000000000 --- a/res/drawable/satellite_sos_quantum_gm_ic_hand_gesture_vd_20.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index 847e27cb09b..1e95168b798 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -12377,38 +12377,6 @@ Message with emergency services when you can\u2019t connect to a mobile or Wi\u2011Fi network satellite sos, sos - - About Satellite SOS - - You can message with emergency services and share your location when you can’t connect to a mobile or Wi-Fi network. This service may not be available at all times in all locations or circumstances. - - Call or text emergency services - - Answer questions about the emergency - - Follow steps to connect to the satellite - - If you don’t have a mobile network, you’ll see an option to use Satellite SOS - - Send answers to emergency services to get you the right kind of help - - Once you’re connected, you can message with emergency services - - Try a demo - - When you connect with emergency services by satellite, your name, email, phone number, location, device information (IMEI, language, model, battery level), and emergency contact information are shared with emergency services and satellite service providers. - \n\nTo use Satellite SOS, Google Messages must be your default SMS app. - \n\nIf automatic network selection is off, it will be turned on, and your device will automatically connect to any network. - - Sharing preferences - - Emergency contacts - - Your Google Account - - Review or update info that will be shared with emergency services - - https://support.google.com/pixelphone/answer/15254448 diff --git a/res/xml/mobile_network_settings.xml b/res/xml/mobile_network_settings.xml index c5e6d2f9e56..a1ac8824861 100644 --- a/res/xml/mobile_network_settings.xml +++ b/res/xml/mobile_network_settings.xml @@ -223,7 +223,6 @@ android:title="@string/title_for_satellite_sos" android:summary="@string/summary_for_satellite_sos_entry" settings:keywords="@string/keywords_satellite_setting" - settings:fragment="com.android.settings.network.telephony.SatelliteSettingsSosFragment" settings:controller= "com.android.settings.network.telephony.SatelliteSettingSosPreferenceController"/> diff --git a/res/xml/satellite_setting_sos.xml b/res/xml/satellite_setting_sos.xml deleted file mode 100644 index abc9d65644d..00000000000 --- a/res/xml/satellite_setting_sos.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - /> - \ No newline at end of file diff --git a/src/com/android/settings/network/telephony/SatelliteSettingsSosController.java b/src/com/android/settings/network/telephony/SatelliteSettingsSosController.java deleted file mode 100644 index 37866bf5c21..00000000000 --- a/src/com/android/settings/network/telephony/SatelliteSettingsSosController.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (C) 2024 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.settings.network.telephony; - -import android.app.Fragment; - -public class SatelliteSettingsSosController { - - public SatelliteSettingsSosController(Fragment fragment) { - } -} diff --git a/src/com/android/settings/network/telephony/SatelliteSettingsSosFooterPreferenceController.java b/src/com/android/settings/network/telephony/SatelliteSettingsSosFooterPreferenceController.java deleted file mode 100644 index d2390191e09..00000000000 --- a/src/com/android/settings/network/telephony/SatelliteSettingsSosFooterPreferenceController.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (C) 2024 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.settings.network.telephony; - -import android.content.Context; -import android.util.Log; - -import androidx.preference.Preference; - -import com.android.settings.R; -import com.android.settings.core.BasePreferenceController; -import com.android.settingslib.HelpUtils; -import com.android.settingslib.widget.FooterPreference; - -/** Footer for Satellite SOS. */ -public class SatelliteSettingsSosFooterPreferenceController extends BasePreferenceController { - private static final String TAG = "SatelliteSettingsSosFooterPrefCtrl"; - - public SatelliteSettingsSosFooterPreferenceController(Context context, - String preferenceKey) { - super(context, preferenceKey); - } - - @Override - public void updateState(Preference preference) { - if (preference == null || !preference.getKey().equals(getPreferenceKey())) { - Log.d(TAG, "Wrong key for footer"); - return; - } - FooterPreference footerPreference = (FooterPreference) preference; - footerPreference.setLearnMoreAction(v -> openSatelliteSosLearnMoreLink()); - } - - private void openSatelliteSosLearnMoreLink() { - mContext.startActivity( - HelpUtils.getHelpIntent( - mContext, - mContext.getString(R.string.satellite_sos_learn_more_link), - /*backupContext=*/"")); - } - - @Override - public int getAvailabilityStatus() { - return AVAILABLE; - } -} diff --git a/src/com/android/settings/network/telephony/SatelliteSettingsSosFragment.java b/src/com/android/settings/network/telephony/SatelliteSettingsSosFragment.java deleted file mode 100644 index c0141ac86b4..00000000000 --- a/src/com/android/settings/network/telephony/SatelliteSettingsSosFragment.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (C) 2024 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.settings.network.telephony; - -import android.os.UserManager; - -import com.android.settings.R; -import com.android.settings.dashboard.RestrictedDashboardFragment; - -public class SatelliteSettingsSosFragment extends RestrictedDashboardFragment { - - - public SatelliteSettingsSosFragment() { - super(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS); - } - - @Override - public int getMetricsCategory() { - return 0; - } - - @Override - protected int getPreferenceScreenResId() { - return R.xml.satellite_setting_sos; - } - - @Override - protected String getLogTag() { - return ""; - } -} diff --git a/tests/unit/src/com/android/settings/network/telephony/SatelliteSettingsSosFooterPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/SatelliteSettingsSosFooterPreferenceControllerTest.java deleted file mode 100644 index 498ebced6b0..00000000000 --- a/tests/unit/src/com/android/settings/network/telephony/SatelliteSettingsSosFooterPreferenceControllerTest.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright (C) 2024 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.settings.network.telephony; - -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import android.content.Context; -import android.os.Looper; - -import androidx.test.core.app.ApplicationProvider; -import androidx.test.ext.junit.runners.AndroidJUnit4; - -import com.android.settingslib.widget.FooterPreference; - -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.junit.MockitoJUnit; -import org.mockito.junit.MockitoRule; - -@RunWith(AndroidJUnit4.class) -public class SatelliteSettingsSosFooterPreferenceControllerTest { - private static final String KEY = "key_satellite_sos_footer"; - - @Rule - public final MockitoRule mMockitoRule = MockitoJUnit.rule(); - - @Mock - private FooterPreference mFooterPreference; - - private Context mContext = null; - private SatelliteSettingsSosFooterPreferenceController mController; - - @Before - public void setUp() { - if (Looper.myLooper() == null) { - Looper.prepare(); - } - mContext = spy(ApplicationProvider.getApplicationContext()); - when(mFooterPreference.getKey()).thenReturn(KEY); - mController = new SatelliteSettingsSosFooterPreferenceController(mContext, KEY); - } - - @Test - public void updateState_setLearnMoreAction_success() { - - mController.updateState(mFooterPreference); - - verify(mFooterPreference).setLearnMoreAction(any()); - } -}