Merge "Satellite UX - Add learn more into Footer" into main
This commit is contained in:
committed by
Android (Google) Code Review
commit
351f6258d8
@@ -12366,6 +12366,8 @@
|
|||||||
<string name="satellite_sos_sharing_preferences_step_2">Your Google Account</string>
|
<string name="satellite_sos_sharing_preferences_step_2">Your Google Account</string>
|
||||||
<!-- Description of sharing preference for Satellite SOS. [CHAR_LIMIT=200] -->
|
<!-- Description of sharing preference for Satellite SOS. [CHAR_LIMIT=200] -->
|
||||||
<string name="satellite_sos_sharing_preferences_description">Review or update info that will be shared with emergency services</string>
|
<string name="satellite_sos_sharing_preferences_description">Review or update info that will be shared with emergency services</string>
|
||||||
|
<!-- Footer link to support page for Satellite SOS [CHAR LIMIT=NONE] -->
|
||||||
|
<string name="satellite_sos_learn_more_link">https://support.google.com/pixelphone/answer/15254448</string>
|
||||||
|
|
||||||
|
|
||||||
<!-- Title for Apn settings in mobile network settings [CHAR LIMIT=60] -->
|
<!-- Title for Apn settings in mobile network settings [CHAR LIMIT=60] -->
|
||||||
|
@@ -77,6 +77,7 @@
|
|||||||
android:key="key_satellite_sos_footer"
|
android:key="key_satellite_sos_footer"
|
||||||
android:title="@string/satellite_sos_footer_text"
|
android:title="@string/satellite_sos_footer_text"
|
||||||
android:selectable="false"
|
android:selectable="false"
|
||||||
settings:searchable="false"/>
|
settings:searchable="false"
|
||||||
|
settings:controller="com.android.settings.network.telephony.SatelliteSettingsSosFooterPreferenceController"/>
|
||||||
/>
|
/>
|
||||||
</androidx.preference.PreferenceScreen>
|
</androidx.preference.PreferenceScreen>
|
@@ -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;
|
||||||
|
}
|
||||||
|
}
|
@@ -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());
|
||||||
|
}
|
||||||
|
}
|
Reference in New Issue
Block a user