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

Merge "Add misc logging:"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-03-14 17:17:14 +00:00
committed by Android (Google) Code Review
parent ae4d32e2ab c49ab99007
commit e02d17ac8a
6 changed files with 76 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/applications/AppStorageSettings.java
View File

@@ -192,6 +192,8 @@ public class AppStorageSettings extends AppInfoWithHeader
} else if (mClearCacheObserver == null) { // Lazy initialization of observer
mClearCacheObserver = new ClearCacheObserver();
}
mMetricsFeatureProvider.action(getContext(),
MetricsEvent.ACTION_SETTINGS_CLEAR_APP_CACHE);
mPm.deleteApplicationCacheFiles(mPackageName, mClearCacheObserver);
} else if (v == mClearDataButton) {
if (mAppsControlDisallowedAdmin != null && !mAppsControlDisallowedBySystem) {
@@ -340,6 +342,7 @@ public class AppStorageSettings extends AppInfoWithHeader
* button for a system package
*/
private void initiateClearUserData() {
mMetricsFeatureProvider.action(getContext(), MetricsEvent.ACTION_SETTINGS_CLEAR_APP_DATA);
mClearDataButton.setEnabled(false);
// Invoke uninstall or clear user data based on sysPackage
String packageName = mAppEntry.info.packageName;

20
src/com/android/settings/applications/InstalledAppDetails.java
View File

@@ -157,8 +157,6 @@ public class InstalledAppDetails extends AppInfoBase
private static final String KEY_MEMORY = "memory";
private static final String KEY_VERSION = "app_version";
private static final String NOTIFICATION_TUNER_SETTING = "show_importance_slider";
private final HashSet<String> mHomePackages = new HashSet<>();
private boolean mInitialized;
@@ -735,6 +733,8 @@ public class InstalledAppDetails extends AppInfoBase
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
// Disable the app
mMetricsFeatureProvider.action(getContext(),
MetricsEvent.ACTION_SETTINGS_DISABLE_APP);
new DisableChanger(InstalledAppDetails.this, mAppEntry.info,
PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER)
.execute((Object)null);
@@ -749,6 +749,8 @@ public class InstalledAppDetails extends AppInfoBase
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
// Disable the app and ask for uninstall
mMetricsFeatureProvider.action(getContext(),
MetricsEvent.ACTION_SETTINGS_DISABLE_APP);
uninstallPkg(mAppEntry.info.packageName,
false, true);
}
@@ -777,13 +779,14 @@ public class InstalledAppDetails extends AppInfoBase
Uri packageURI = Uri.parse("package:"+packageName);
Intent uninstallIntent = new Intent(Intent.ACTION_UNINSTALL_PACKAGE, packageURI);
uninstallIntent.putExtra(Intent.EXTRA_UNINSTALL_ALL_USERS, allUsers);
mMetricsFeatureProvider.action(
getContext(), MetricsEvent.ACTION_SETTINGS_UNINSTALL_APP);
startActivityForResult(uninstallIntent, REQUEST_UNINSTALL);
mDisableAfterUninstall = andDisable;
}
private void forceStopPackage(String pkgName) {
FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider().action(getContext(),
MetricsEvent.ACTION_APP_FORCE_STOP, pkgName);
mMetricsFeatureProvider.action(getContext(), MetricsEvent.ACTION_APP_FORCE_STOP, pkgName);
ActivityManager am = (ActivityManager) getActivity().getSystemService(
Context.ACTIVITY_SERVICE);
Log.d(LOG_TAG, "Stopping package " + pkgName);
@@ -802,7 +805,7 @@ public class InstalledAppDetails extends AppInfoBase
mForceStopButton.setEnabled(false);
} else {
mForceStopButton.setEnabled(enabled);
mForceStopButton.setOnClickListener(InstalledAppDetails.this);
mForceStopButton.setOnClickListener(this);
}
}
@@ -875,6 +878,8 @@ public class InstalledAppDetails extends AppInfoBase
Intent uninstallDAIntent = new Intent(activity, DeviceAdminAdd.class);
uninstallDAIntent.putExtra(DeviceAdminAdd.EXTRA_DEVICE_ADMIN_PACKAGE_NAME,
mPackageName);
mMetricsFeatureProvider.action(
activity, MetricsEvent.ACTION_SETTINGS_UNINSTALL_DEVICE_ADMIN);
activity.startActivityForResult(uninstallDAIntent, REQUEST_REMOVE_DEVICE_ADMIN);
return;
}
@@ -895,6 +900,11 @@ public class InstalledAppDetails extends AppInfoBase
showDialogInner(DLG_DISABLE, 0);
}
} else {
mMetricsFeatureProvider.action(
getActivity(),
mAppEntry.info.enabled
? MetricsEvent.ACTION_SETTINGS_DISABLE_APP
: MetricsEvent.ACTION_SETTINGS_ENABLE_APP);
new DisableChanger(this, mAppEntry.info,
PackageManager.COMPONENT_ENABLED_STATE_DEFAULT)
.execute((Object) null);

26
src/com/android/settings/search2/InlineSwitchViewHolder.java
View File

@@ -18,10 +18,11 @@
package com.android.settings.search2;
import android.content.Context;
import android.util.Pair;
import android.view.View;
import android.widget.CompoundButton;
import android.widget.Switch;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
/**
@@ -36,7 +37,7 @@ public class InlineSwitchViewHolder extends SearchViewHolder {
public InlineSwitchViewHolder(View view, Context context) {
super(view);
mContext = context;
switchView = (Switch) view.findViewById(R.id.switchView);
switchView = view.findViewById(R.id.switchView);
}
@Override
@@ -47,12 +48,21 @@ public class InlineSwitchViewHolder extends SearchViewHolder {
}
final InlineSwitchPayload payload = (InlineSwitchPayload) result.payload;
switchView.setChecked(payload.getSwitchValue(mContext));
switchView.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
fragment.onSearchResultClicked();
payload.setSwitchValue(mContext, isChecked);
}
switchView.setOnCheckedChangeListener((buttonView, isChecked) -> {
final Pair<Integer, Object> name = Pair.create(
MetricsEvent.FIELD_SETTINGS_SEARCH_INLINE_RESULT_NAME, payload.settingsUri);
final Pair<Integer, Object> value = Pair.create(
MetricsEvent.FIELD_SETTINGS_SEARCH_INLINE_RESULT_VALUE, isChecked
? "checked"
: "not-checked");
final Pair<Integer, Object> rank = Pair.create(
MetricsEvent.FIELD_SETTINGS_SERACH_RESULT_RANK, getAdapterPosition());
mMetricsFeatureProvider.action(mContext,
MetricsEvent.ACTION_CLICK_SETTINGS_SEARCH_INLINE_RESULT,
name, value, rank);
fragment.onSearchResultClicked();
payload.setSwitchValue(mContext, isChecked);
});
}
}

6
src/com/android/settings/search2/IntentSearchViewHolder.java
View File

@@ -23,8 +23,6 @@ import android.view.View;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.SettingsActivity;
import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.overlay.FeatureFactory;
/**
* ViewHolder for intent based search results.
@@ -32,12 +30,8 @@ import com.android.settings.overlay.FeatureFactory;
*/
public class IntentSearchViewHolder extends SearchViewHolder {
private final MetricsFeatureProvider mMetricsFeatureProvider;
public IntentSearchViewHolder(View view) {
super(view);
mMetricsFeatureProvider = FeatureFactory.getFactory(view.getContext())
.getMetricsFeatureProvider();
}
@Override

16
src/com/android/settings/search2/SearchViewHolder.java
View File

@@ -17,8 +17,6 @@ package com.android.settings.search2;
import android.content.Context;
import android.content.pm.PackageManager;
import android.graphics.drawable.Drawable;
import android.os.UserHandle;
import android.support.v7.widget.RecyclerView;
import android.text.TextUtils;
import android.view.View;
@@ -26,6 +24,8 @@ import android.widget.ImageView;
import android.widget.TextView;
import com.android.settings.R;
import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.overlay.FeatureFactory;
/**
* The ViewHolder for the Search RecyclerView.
@@ -39,12 +39,16 @@ public abstract class SearchViewHolder extends RecyclerView.ViewHolder {
public final TextView breadcrumbView;
public final ImageView iconView;
protected final MetricsFeatureProvider mMetricsFeatureProvider;
public SearchViewHolder(View view) {
super(view);
titleView = (TextView) view.findViewById(android.R.id.title);
summaryView = (TextView) view.findViewById(android.R.id.summary);
iconView = (ImageView) view.findViewById(android.R.id.icon);
breadcrumbView = (TextView) view.findViewById(R.id.breadcrumb);
mMetricsFeatureProvider = FeatureFactory.getFactory(view.getContext())
.getMetricsFeatureProvider();
titleView = view.findViewById(android.R.id.title);
summaryView = view.findViewById(android.R.id.summary);
iconView = view.findViewById(android.R.id.icon);
breadcrumbView = view.findViewById(R.id.breadcrumb);
}
public void onBind(SearchFragment fragment, SearchResult result) {