Merge "Add default phone app to system settings"
This commit is contained in:
@@ -750,7 +750,7 @@
|
|||||||
</plurals>
|
</plurals>
|
||||||
<!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=22] -->
|
<!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=22] -->
|
||||||
<string name="security_settings_fingerprint_enroll_onboard_title">Fingerprint setup</string>
|
<string name="security_settings_fingerprint_enroll_onboard_title">Fingerprint setup</string>
|
||||||
<!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
|
<!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
|
||||||
alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
|
alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
|
||||||
<string name="security_settings_fingerprint_enroll_onboard_message">
|
<string name="security_settings_fingerprint_enroll_onboard_message">
|
||||||
To use your fingerprint to unlock your screen or confirm purchases, we\'ll need to:
|
To use your fingerprint to unlock your screen or confirm purchases, we\'ll need to:
|
||||||
@@ -5800,6 +5800,7 @@
|
|||||||
<string name="keywords_keyboard_and_ime">text correction correct sound vibrate auto language gesture suggest suggestion theme offensive word type emoji international</string>
|
<string name="keywords_keyboard_and_ime">text correction correct sound vibrate auto language gesture suggest suggestion theme offensive word type emoji international</string>
|
||||||
<string name="keywords_reset_apps">reset preferences default</string>
|
<string name="keywords_reset_apps">reset preferences default</string>
|
||||||
<string name="keywords_emergency_app">emergency ice app default</string>
|
<string name="keywords_emergency_app">emergency ice app default</string>
|
||||||
|
<string name="keywords_default_dialer_app">dialer default</string>
|
||||||
<string name="keywords_all_apps">apps download applications system</string>
|
<string name="keywords_all_apps">apps download applications system</string>
|
||||||
<string name="keywords_app_permissions">apps permissions security</string>
|
<string name="keywords_app_permissions">apps permissions security</string>
|
||||||
<string name="keywords_default_apps">apps default</string>
|
<string name="keywords_default_apps">apps default</string>
|
||||||
@@ -6461,6 +6462,9 @@
|
|||||||
<!-- Summary for No Default Browser settings [CHAR LIMIT=45] -->
|
<!-- Summary for No Default Browser settings [CHAR LIMIT=45] -->
|
||||||
<string name="default_browser_title_none">No default Browser</string>
|
<string name="default_browser_title_none">No default Browser</string>
|
||||||
|
|
||||||
|
<!-- Title for Default Dialer settings [CHAR LIMIT=30] -->
|
||||||
|
<string name="default_dialer_title">Dialer app</string>
|
||||||
|
|
||||||
<!-- Label of default app for current setting [CHAR LIMIT=40] -->
|
<!-- Label of default app for current setting [CHAR LIMIT=40] -->
|
||||||
<string name="default_app">(Default)</string>
|
<string name="default_app">(Default)</string>
|
||||||
|
|
||||||
|
@@ -25,6 +25,12 @@
|
|||||||
android:summary="@string/default_browser_title_none"
|
android:summary="@string/default_browser_title_none"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
<com.android.settings.applications.DefaultDialerPreference
|
||||||
|
android:key="default_dialer"
|
||||||
|
android:title="@string/default_dialer_title"
|
||||||
|
settings:keywords="@string/keywords_default_dialer_app"
|
||||||
|
/>
|
||||||
|
|
||||||
<com.android.settings.applications.DefaultEmergencyPreference
|
<com.android.settings.applications.DefaultEmergencyPreference
|
||||||
android:key="default_emergency_app"
|
android:key="default_emergency_app"
|
||||||
android:title="@string/default_emergency_app"
|
android:title="@string/default_emergency_app"
|
||||||
|
@@ -0,0 +1,81 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2015 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.applications;
|
||||||
|
|
||||||
|
import android.content.ComponentName;
|
||||||
|
import android.content.Context;
|
||||||
|
import android.os.UserManager;
|
||||||
|
import android.telecom.DefaultDialerManager;
|
||||||
|
import android.telephony.TelephonyManager;
|
||||||
|
import android.text.TextUtils;
|
||||||
|
import android.util.AttributeSet;
|
||||||
|
|
||||||
|
import com.android.settings.AppListPreference;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
|
public class DefaultDialerPreference extends AppListPreference {
|
||||||
|
|
||||||
|
public DefaultDialerPreference(Context context, AttributeSet attrs) {
|
||||||
|
super(context, attrs);
|
||||||
|
|
||||||
|
if (isAvailable(context)) {
|
||||||
|
loadDialerApps();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected boolean persistString(String value) {
|
||||||
|
if (!TextUtils.isEmpty(value) && !Objects.equals(value, getDefaultPackage())) {
|
||||||
|
DefaultDialerManager.setDefaultPhoneApplication(getContext(), value);
|
||||||
|
}
|
||||||
|
setSummary(getEntry());
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void loadDialerApps() {
|
||||||
|
List<ComponentName> dialerComponents =
|
||||||
|
DefaultDialerManager.getInstalledDialerApplications(getContext());
|
||||||
|
|
||||||
|
final String[] dialers = new String[dialerComponents.size()];
|
||||||
|
for (int i = 0; i < dialerComponents.size(); i++) {
|
||||||
|
dialers[i] = dialerComponents.get(i).getPackageName();
|
||||||
|
}
|
||||||
|
setPackageNames(dialers, getDefaultPackage());
|
||||||
|
}
|
||||||
|
|
||||||
|
private String getDefaultPackage() {
|
||||||
|
ComponentName appName = DefaultDialerManager.getDefaultDialerApplication(getContext());
|
||||||
|
if (appName != null) {
|
||||||
|
return appName.getPackageName();
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean isAvailable(Context context) {
|
||||||
|
final TelephonyManager tm =
|
||||||
|
(TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
|
||||||
|
if (!tm.isVoiceCapable()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
final UserManager um =
|
||||||
|
(UserManager) context.getSystemService(Context.USER_SERVICE);
|
||||||
|
return !um.hasUserRestriction(UserManager.DISALLOW_OUTGOING_CALLS);
|
||||||
|
}
|
||||||
|
}
|
@@ -26,6 +26,7 @@ import android.os.UserHandle;
|
|||||||
import android.os.UserManager;
|
import android.os.UserManager;
|
||||||
import android.preference.Preference;
|
import android.preference.Preference;
|
||||||
import android.provider.SearchIndexableResource;
|
import android.provider.SearchIndexableResource;
|
||||||
|
import android.telephony.TelephonyManager;
|
||||||
import android.text.TextUtils;
|
import android.text.TextUtils;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
@@ -47,8 +48,9 @@ public class ManageDefaultApps extends SettingsPreferenceFragment
|
|||||||
private static final String TAG = ManageDefaultApps.class.getSimpleName();
|
private static final String TAG = ManageDefaultApps.class.getSimpleName();
|
||||||
|
|
||||||
private static final String KEY_DEFAULT_BROWSER = "default_browser";
|
private static final String KEY_DEFAULT_BROWSER = "default_browser";
|
||||||
private static final String KEY_SMS_APPLICATION = "default_sms_app";
|
private static final String KEY_DEFAULT_DIALER = "default_dialer";
|
||||||
private static final String KEY_DEFAULT_EMERGENCY_APP = "default_emergency_app";
|
private static final String KEY_DEFAULT_EMERGENCY_APP = "default_emergency_app";
|
||||||
|
private static final String KEY_SMS_APPLICATION = "default_sms_app";
|
||||||
|
|
||||||
private DefaultBrowserPreference mDefaultBrowserPreference;
|
private DefaultBrowserPreference mDefaultBrowserPreference;
|
||||||
private PackageManager mPm;
|
private PackageManager mPm;
|
||||||
@@ -84,6 +86,10 @@ public class ManageDefaultApps extends SettingsPreferenceFragment
|
|||||||
removePreference(KEY_SMS_APPLICATION);
|
removePreference(KEY_SMS_APPLICATION);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!DefaultDialerPreference.isAvailable(getActivity())) {
|
||||||
|
removePreference(KEY_DEFAULT_DIALER);
|
||||||
|
}
|
||||||
|
|
||||||
if (!DefaultEmergencyPreference.isAvailable(getActivity())) {
|
if (!DefaultEmergencyPreference.isAvailable(getActivity())) {
|
||||||
removePreference(KEY_DEFAULT_EMERGENCY_APP);
|
removePreference(KEY_DEFAULT_EMERGENCY_APP);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user