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

Merge "Added onClick logic for domain url list screen" into nyc-mr1-dev

Browse Source
This commit is contained in:
Salvador Martinez
2016-10-06 22:37:05 +00:00
committed by Android (Google) Code Review
parent a6b32526d7 26e5760033
commit 8a468ccbdf
1 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/com/android/settings/applications/ManageDomainUrls.java
View File

@@ -16,9 +16,7 @@ package com.android.settings.applications;
import android.app.Application; import android.app.Application;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.UserHandle; import android.os.UserHandle;
import android.provider.Settings; import android.provider.Settings;
@@ -26,28 +24,19 @@ import android.provider.Settings.Global;
import android.support.v14.preference.SwitchPreference; import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference; import android.support.v7.preference.Preference;
import android.support.v7.preference.Preference.OnPreferenceChangeListener; import android.support.v7.preference.Preference.OnPreferenceChangeListener;
import android.support.v7.preference.Preference.OnPreferenceClickListener;
import android.support.v7.preference.PreferenceCategory; import android.support.v7.preference.PreferenceCategory;
import android.support.v7.preference.PreferenceGroup; import android.support.v7.preference.PreferenceGroup;
import android.support.v7.preference.PreferenceViewHolder; import android.support.v7.preference.PreferenceViewHolder;
import android.util.ArraySet; import android.util.ArraySet;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View; import android.view.View;
import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.AppHeader;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment; import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils; import com.android.settings.Utils;
import com.android.settings.applications.AppInfoBase;
import com.android.settings.applications.AppStateBaseBridge;
import com.android.settings.applications.InstalledAppDetails;
import com.android.settings.datausage.AppStateDataUsageBridge.DataUsageState;
import com.android.settingslib.applications.ApplicationsState; import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.applications.ApplicationsState.AppEntry; import com.android.settingslib.applications.ApplicationsState.AppEntry;
import com.android.settingslib.applications.ApplicationsState.AppFilter;
import java.util.ArrayList; import java.util.ArrayList;
@@ -56,7 +45,11 @@ import java.util.ArrayList;
* handling as well as system handling for Web Actions. * handling as well as system handling for Web Actions.
*/ */
public class ManageDomainUrls extends SettingsPreferenceFragment public class ManageDomainUrls extends SettingsPreferenceFragment
implements ApplicationsState.Callbacks, OnPreferenceChangeListener { implements ApplicationsState.Callbacks, OnPreferenceChangeListener,
OnPreferenceClickListener {
// constant value that can be used to check return code from sub activity.
private static final int INSTALLED_APP_DETAILS = 1;
private ApplicationsState mApplicationsState; private ApplicationsState mApplicationsState;
private ApplicationsState.Session mSession; private ApplicationsState.Session mSession;
@@ -77,7 +70,6 @@ public class ManageDomainUrls extends SettingsPreferenceFragment
@Override @Override
public void onViewCreated(View view, Bundle savedInstanceState) { public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState); super.onViewCreated(view, savedInstanceState);
setLoading(true, false);
} }
@Override @Override
@@ -141,7 +133,6 @@ public class ManageDomainUrls extends SettingsPreferenceFragment
} }
} }
rebuildAppList(mDomainAppList, apps); rebuildAppList(mDomainAppList, apps);
setLoading(false, true);
} }
@Override @Override
@@ -173,6 +164,7 @@ public class ManageDomainUrls extends SettingsPreferenceFragment
if (preference == null) { if (preference == null) {
preference = new DomainAppPreference(getPrefContext(), entry); preference = new DomainAppPreference(getPrefContext(), entry);
preference.setKey(key); preference.setKey(key);
preference.setOnPreferenceClickListener(this);
group.addPreference(preference); group.addPreference(preference);
} else { } else {
preference.reuse(); preference.reuse();
@@ -208,6 +200,18 @@ public class ManageDomainUrls extends SettingsPreferenceFragment
return MetricsEvent.MANAGE_DOMAIN_URLS; return MetricsEvent.MANAGE_DOMAIN_URLS;
} }
@Override
public boolean onPreferenceClick(Preference preference) {
if (preference.getClass() == DomainAppPreference.class) {
ApplicationsState.AppEntry entry = ((DomainAppPreference) preference).mEntry;
AppInfoBase.startAppInfoFragment(AppLaunchSettings.class, R.string.auto_launch_label,
entry.info.packageName, entry.info.uid, this,
INSTALLED_APP_DETAILS);
return true;
}
return false;
}
private class DomainAppPreference extends Preference { private class DomainAppPreference extends Preference {
private final AppEntry mEntry; private final AppEntry mEntry;
private final PackageManager mPm; private final PackageManager mPm;