Full screen default app fragment
Fix: 34280137 Test: make RunSettingsRoboTests Change-Id: Ib44e39589781d68c7952a2c16a44682791a422f1
This commit is contained in:
@@ -21,8 +21,6 @@ import android.app.Activity;
|
||||
import android.app.ActivityManager;
|
||||
import android.app.AlertDialog;
|
||||
import android.app.LoaderManager.LoaderCallbacks;
|
||||
import android.app.Notification;
|
||||
import android.app.NotificationManager;
|
||||
import android.app.admin.DevicePolicyManager;
|
||||
import android.content.ActivityNotFoundException;
|
||||
import android.content.BroadcastReceiver;
|
||||
@@ -52,8 +50,6 @@ import android.os.RemoteException;
|
||||
import android.os.ServiceManager;
|
||||
import android.os.UserHandle;
|
||||
import android.os.UserManager;
|
||||
import android.provider.Settings;
|
||||
import android.service.notification.NotificationListenerService.Ranking;
|
||||
import android.support.annotation.VisibleForTesting;
|
||||
import android.support.v7.preference.Preference;
|
||||
import android.support.v7.preference.Preference.OnPreferenceClickListener;
|
||||
@@ -78,7 +74,6 @@ import android.widget.TextView;
|
||||
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
|
||||
import com.android.internal.os.BatterySipper;
|
||||
import com.android.internal.os.BatteryStatsHelper;
|
||||
import com.android.internal.widget.LockPatternUtils;
|
||||
import com.android.settings.AppHeader;
|
||||
import com.android.settings.DeviceAdminAdd;
|
||||
import com.android.settings.R;
|
||||
@@ -86,6 +81,11 @@ import com.android.settings.SettingsActivity;
|
||||
import com.android.settings.SettingsPreferenceFragment;
|
||||
import com.android.settings.Utils;
|
||||
import com.android.settings.applications.PermissionsSummaryHelper.PermissionsResultCallback;
|
||||
import com.android.settings.applications.defaultapps.DefaultBrowserPreferenceController;
|
||||
import com.android.settings.applications.defaultapps.DefaultEmergencyPreferenceController;
|
||||
import com.android.settings.applications.defaultapps.DefaultHomePreferenceController;
|
||||
import com.android.settings.applications.defaultapps.DefaultPhonePreferenceController;
|
||||
import com.android.settings.applications.defaultapps.DefaultSmsPreferenceController;
|
||||
import com.android.settings.dashboard.DashboardFeatureProvider;
|
||||
import com.android.settings.datausage.AppDataUsage;
|
||||
import com.android.settings.datausage.DataUsageList;
|
||||
@@ -908,27 +908,28 @@ public class InstalledAppDetails extends AppInfoBase
|
||||
return;
|
||||
}
|
||||
final PreferenceScreen screen = getPreferenceScreen();
|
||||
if (DefaultHomePreference.hasHomePreference(mPackageName, getContext())) {
|
||||
final Context context = getContext();
|
||||
if (DefaultHomePreferenceController.hasHomePreference(mPackageName, context)) {
|
||||
screen.addPreference(new ShortcutPreference(getPrefContext(),
|
||||
AdvancedAppSettings.class, "default_home", R.string.home_app,
|
||||
R.string.configure_apps));
|
||||
}
|
||||
if (DefaultBrowserPreference.hasBrowserPreference(mPackageName, getContext())) {
|
||||
if (DefaultBrowserPreferenceController.hasBrowserPreference(mPackageName, context)) {
|
||||
screen.addPreference(new ShortcutPreference(getPrefContext(),
|
||||
AdvancedAppSettings.class, "default_browser", R.string.default_browser_title,
|
||||
R.string.configure_apps));
|
||||
}
|
||||
if (DefaultPhonePreference.hasPhonePreference(mPackageName, getContext())) {
|
||||
if (DefaultPhonePreferenceController.hasPhonePreference(mPackageName, context)) {
|
||||
screen.addPreference(new ShortcutPreference(getPrefContext(),
|
||||
AdvancedAppSettings.class, "default_phone_app", R.string.default_phone_title,
|
||||
R.string.configure_apps));
|
||||
}
|
||||
if (DefaultEmergencyPreference.hasEmergencyPreference(mPackageName, getContext())) {
|
||||
if (DefaultEmergencyPreferenceController.hasEmergencyPreference(mPackageName, context)) {
|
||||
screen.addPreference(new ShortcutPreference(getPrefContext(),
|
||||
AdvancedAppSettings.class, "default_emergency_app",
|
||||
R.string.default_emergency_app, R.string.configure_apps));
|
||||
}
|
||||
if (DefaultSmsPreference.hasSmsPreference(mPackageName, getContext())) {
|
||||
if (DefaultSmsPreferenceController.hasSmsPreference(mPackageName, context)) {
|
||||
screen.addPreference(new ShortcutPreference(getPrefContext(),
|
||||
AdvancedAppSettings.class, "default_sms_app", R.string.sms_application_title,
|
||||
R.string.configure_apps));
|
||||
@@ -1021,29 +1022,33 @@ public class InstalledAppDetails extends AppInfoBase
|
||||
}
|
||||
|
||||
private void updateDynamicPrefs() {
|
||||
final Context context = getContext();
|
||||
Preference pref = findPreference("default_home");
|
||||
|
||||
if (pref != null) {
|
||||
pref.setSummary(DefaultHomePreference.isHomeDefault(mPackageName, getContext())
|
||||
pref.setSummary(DefaultHomePreferenceController.isHomeDefault(mPackageName, context)
|
||||
? R.string.yes : R.string.no);
|
||||
}
|
||||
pref = findPreference("default_browser");
|
||||
if (pref != null) {
|
||||
pref.setSummary(DefaultBrowserPreference.isBrowserDefault(mPackageName, getContext())
|
||||
pref.setSummary(
|
||||
DefaultBrowserPreferenceController.isBrowserDefault(mPackageName, context)
|
||||
? R.string.yes : R.string.no);
|
||||
}
|
||||
pref = findPreference("default_phone_app");
|
||||
if (pref != null) {
|
||||
pref.setSummary(DefaultPhonePreference.isPhoneDefault(mPackageName, getContext())
|
||||
pref.setSummary(
|
||||
DefaultPhonePreferenceController.isPhoneDefault(mPackageName, context)
|
||||
? R.string.yes : R.string.no);
|
||||
}
|
||||
pref = findPreference("default_emergency_app");
|
||||
if (pref != null) {
|
||||
pref.setSummary(DefaultEmergencyPreference.isEmergencyDefault(mPackageName,
|
||||
pref.setSummary(DefaultEmergencyPreferenceController.isEmergencyDefault(mPackageName,
|
||||
getContext()) ? R.string.yes : R.string.no);
|
||||
}
|
||||
pref = findPreference("default_sms_app");
|
||||
if (pref != null) {
|
||||
pref.setSummary(DefaultSmsPreference.isSmsDefault(mPackageName, getContext())
|
||||
pref.setSummary(DefaultSmsPreferenceController.isSmsDefault(mPackageName, context)
|
||||
? R.string.yes : R.string.no);
|
||||
}
|
||||
pref = findPreference("system_alert_window");
|
||||
|
Reference in New Issue
Block a user