PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch to use EmergencyNumberUtils to update e-number.

Browse Source 
The backend storage choice is delegated to EmergencyNumberUtils. Using
the utils class abstrats underlying details away from Settings app.

Bug: 177006940
Test: manual
Change-Id: I78c5ef79e141e3609ab9d10e558803457b617911
This commit is contained in:
Fan Zhang
2021-01-07 22:45:39 -08:00
parent 6f74b9a5dd
commit 80c7251526
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/gestures/EmergencyGestureNumberOverridePreference.java
View File

@@ -20,7 +20,6 @@ import static android.content.DialogInterface.BUTTON_POSITIVE;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.provider.Settings;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.View; import android.view.View;
@@ -91,11 +90,9 @@ public class EmergencyGestureNumberOverridePreference extends
if (which == BUTTON_POSITIVE) { if (which == BUTTON_POSITIVE) {
final String input = mEditText.getText().toString(); final String input = mEditText.getText().toString();
if (!TextUtils.isEmpty(input)) { if (!TextUtils.isEmpty(input)) {
Settings.Secure.putString(getContext().getContentResolver(), mEmergencyNumberUtils.setEmergencyNumberOverride(input);
Settings.Secure.EMERGENCY_GESTURE_CALL_NUMBER, input);
} else { } else {
Settings.Secure.putString(getContext().getContentResolver(), mEmergencyNumberUtils.setEmergencyNumberOverride(
Settings.Secure.EMERGENCY_GESTURE_CALL_NUMBER,
mEmergencyNumberUtils.getDefaultPoliceNumber()); mEmergencyNumberUtils.getDefaultPoliceNumber());
} }
} }

7
src/com/android/settings/gestures/EmergencyGestureNumberOverridePreferenceController.java
View File

@@ -16,11 +16,12 @@
package com.android.settings.gestures; package com.android.settings.gestures;
import static com.android.settingslib.emergencynumber.EmergencyNumberUtils.EMERGENCY_NUMBER_OVERRIDE_AUTHORITY;
import android.content.Context; import android.content.Context;
import android.database.ContentObserver; import android.database.ContentObserver;
import android.os.Handler; import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import android.provider.Settings;
import android.telephony.PhoneNumberUtils; import android.telephony.PhoneNumberUtils;
import android.text.Spannable; import android.text.Spannable;
@@ -86,8 +87,8 @@ public class EmergencyGestureNumberOverridePreferenceController extends BasePref
@Override @Override
public void onStart() { public void onStart() {
mContext.getContentResolver().registerContentObserver(Settings.Secure.getUriFor( mContext.getContentResolver().registerContentObserver(EMERGENCY_NUMBER_OVERRIDE_AUTHORITY,
Settings.Secure.EMERGENCY_GESTURE_CALL_NUMBER), false, mSettingsObserver); false, mSettingsObserver);
} }
@Override @Override