diff --git a/res/drawable-night/satellite_sos_illustration.xml b/res/drawable-night/satellite_sos_illustration.xml new file mode 100644 index 00000000000..91c86097ecf --- /dev/null +++ b/res/drawable-night/satellite_sos_illustration.xml @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/account_circle_24dp.xml b/res/drawable/account_circle_24dp.xml new file mode 100644 index 00000000000..50004d94495 --- /dev/null +++ b/res/drawable/account_circle_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/res/drawable/contact_emergency_24dp.xml b/res/drawable/contact_emergency_24dp.xml new file mode 100644 index 00000000000..0f3badcadc3 --- /dev/null +++ b/res/drawable/contact_emergency_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/res/drawable/satellite_sos_counter_1.xml b/res/drawable/satellite_sos_counter_1.xml new file mode 100644 index 00000000000..14cce3cb2ad --- /dev/null +++ b/res/drawable/satellite_sos_counter_1.xml @@ -0,0 +1,9 @@ + + + diff --git a/res/drawable/satellite_sos_counter_2.xml b/res/drawable/satellite_sos_counter_2.xml new file mode 100644 index 00000000000..3f59d0bd0d9 --- /dev/null +++ b/res/drawable/satellite_sos_counter_2.xml @@ -0,0 +1,9 @@ + + + diff --git a/res/drawable/satellite_sos_counter_3.xml b/res/drawable/satellite_sos_counter_3.xml new file mode 100644 index 00000000000..0b923882159 --- /dev/null +++ b/res/drawable/satellite_sos_counter_3.xml @@ -0,0 +1,9 @@ + + + diff --git a/res/drawable/satellite_sos_illustration.xml b/res/drawable/satellite_sos_illustration.xml new file mode 100644 index 00000000000..332b478c971 --- /dev/null +++ b/res/drawable/satellite_sos_illustration.xml @@ -0,0 +1,136 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 new file mode 100644 index 00000000000..2aff18fcf67 --- /dev/null +++ b/res/drawable/satellite_sos_quantum_gm_ic_hand_gesture_vd_20.xml @@ -0,0 +1,32 @@ + + + + + + + \ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index ea505da4442..2062f3f2a9c 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -12329,12 +12329,41 @@ Use of data is included with your account - Satellite SOS + Satellite SOS 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 diff --git a/res/xml/mobile_network_settings.xml b/res/xml/mobile_network_settings.xml index 72acbe05461..c5e6d2f9e56 100644 --- a/res/xml/mobile_network_settings.xml +++ b/res/xml/mobile_network_settings.xml @@ -220,7 +220,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /> + \ 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 new file mode 100644 index 00000000000..37866bf5c21 --- /dev/null +++ b/src/com/android/settings/network/telephony/SatelliteSettingsSosController.java @@ -0,0 +1,25 @@ +/* + * 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/SatelliteSettingsSosFragment.java b/src/com/android/settings/network/telephony/SatelliteSettingsSosFragment.java index 911939a9a00..c0141ac86b4 100644 --- a/src/com/android/settings/network/telephony/SatelliteSettingsSosFragment.java +++ b/src/com/android/settings/network/telephony/SatelliteSettingsSosFragment.java @@ -16,11 +16,30 @@ package com.android.settings.network.telephony; -import com.android.settings.SettingsPreferenceFragment; +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); + } -public class SatelliteSettingsSosFragment extends SettingsPreferenceFragment { @Override public int getMetricsCategory() { return 0; } + + @Override + protected int getPreferenceScreenResId() { + return R.xml.satellite_setting_sos; + } + + @Override + protected String getLogTag() { + return ""; + } }