From ceac8c1ddedf0693a8111a28efb721004743d580 Mon Sep 17 00:00:00 2001 From: tomhsu Date: Tue, 3 Dec 2024 11:02:28 +0000 Subject: [PATCH] Satellite UX - Add learn more into Footer Flag: com.android.settings.flags.satellite_oem_settings_ux_migration Bug: 378408877 Test: atest pass Test: Manual test pass. Change-Id: I27f2c82fe5d6c34cf204472c4199538326d6aec4 --- res/values/strings.xml | 2 + res/xml/satellite_setting_sos.xml | 3 +- ...SettingsSosFooterPreferenceController.java | 60 +++++++++++++++++ ...ingsSosFooterPreferenceControllerTest.java | 67 +++++++++++++++++++ 4 files changed, 131 insertions(+), 1 deletion(-) create mode 100644 src/com/android/settings/network/telephony/SatelliteSettingsSosFooterPreferenceController.java create mode 100644 tests/unit/src/com/android/settings/network/telephony/SatelliteSettingsSosFooterPreferenceControllerTest.java diff --git a/res/values/strings.xml b/res/values/strings.xml index 2062f3f2a9c..875ee2e84ff 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -12364,6 +12364,8 @@ 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/satellite_setting_sos.xml b/res/xml/satellite_setting_sos.xml index a99ba865d22..abc9d65644d 100644 --- a/res/xml/satellite_setting_sos.xml +++ b/res/xml/satellite_setting_sos.xml @@ -77,6 +77,7 @@ android:key="key_satellite_sos_footer" android:title="@string/satellite_sos_footer_text" android:selectable="false" - settings:searchable="false"/> + settings:searchable="false" + settings:controller="com.android.settings.network.telephony.SatelliteSettingsSosFooterPreferenceController"/> /> \ No newline at end of file diff --git a/src/com/android/settings/network/telephony/SatelliteSettingsSosFooterPreferenceController.java b/src/com/android/settings/network/telephony/SatelliteSettingsSosFooterPreferenceController.java new file mode 100644 index 00000000000..d2390191e09 --- /dev/null +++ b/src/com/android/settings/network/telephony/SatelliteSettingsSosFooterPreferenceController.java @@ -0,0 +1,60 @@ +/* + * 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/tests/unit/src/com/android/settings/network/telephony/SatelliteSettingsSosFooterPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/SatelliteSettingsSosFooterPreferenceControllerTest.java new file mode 100644 index 00000000000..7aa6535962d --- /dev/null +++ b/tests/unit/src/com/android/settings/network/telephony/SatelliteSettingsSosFooterPreferenceControllerTest.java @@ -0,0 +1,67 @@ +/* + * 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 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.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(); + + private Context mContext = null; + private FooterPreference mFooterPreference; + private SatelliteSettingsSosFooterPreferenceController mController; + + @Before + public void setUp() { + if (Looper.myLooper() == null) { + Looper.prepare(); + } + mContext = spy(ApplicationProvider.getApplicationContext()); + mFooterPreference = spy(new FooterPreference(mContext)); + mFooterPreference.setKey(KEY); + mController = new SatelliteSettingsSosFooterPreferenceController(mContext, KEY); + } + + @Test + public void updateState_setLearnMoreAction_success() { + + mController.updateState(mFooterPreference); + + verify(mFooterPreference).setLearnMoreAction(any()); + } +}