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

Merge "Enable and add logging to ManageApplications"

Browse Source
This commit is contained in:
Beverly Tai
2018-06-25 14:03:28 +00:00
committed by Android (Google) Code Review
parent 5a98177563 b3ba0ac11f
commit dc4acf2bb5
2 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/applications/AppStateNotificationBridge.java
View File

@@ -23,6 +23,7 @@ import android.os.UserHandle;
import android.os.UserManager;
import android.text.format.DateUtils;
import android.util.ArrayMap;
import android.util.Log;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Switch;
@@ -46,6 +47,8 @@ import java.util.Map;
*/
public class AppStateNotificationBridge extends AppStateBaseBridge {
private final String TAG = "AppStateNotificationBridge";
private final boolean DEBUG = true;
private final Context mContext;
private IUsageStatsManager mUsageStatsManager;
protected List<Integer> mUserIds;
@@ -70,7 +73,12 @@ public class AppStateNotificationBridge extends AppStateBaseBridge {
@Override
protected void loadAllExtraInfo() {
ArrayList<AppEntry> apps = mAppSession.getAllApps();
if (apps == null) return;
if (apps == null) {
if (DEBUG) {
Log.d(TAG, "No apps. No extra info loaded");
}
return;
}
final Map<String, NotificationsSentState> map = getAggregatedUsageEvents();
for (AppEntry entry : apps) {

29
src/com/android/settings/applications/manageapplications/ManageApplications.java
View File

@@ -16,7 +16,6 @@
package com.android.settings.applications.manageapplications;
import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE;
import static com.android.settings.applications.manageapplications.AppFilterRegistry
.FILTER_APPS_ALL;
import static com.android.settings.applications.manageapplications.AppFilterRegistry
@@ -38,6 +37,8 @@ import static com.android.settings.applications.manageapplications.AppFilterRegi
import static com.android.settings.applications.manageapplications.AppFilterRegistry
.FILTER_APPS_WORK;
import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE;
import android.annotation.Nullable;
import android.annotation.StringRes;
import android.app.Activity;
@@ -141,7 +142,7 @@ public class ManageApplications extends InstrumentedFragment
implements View.OnClickListener, OnItemSelectedListener {
static final String TAG = "ManageApplications";
static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
static final boolean DEBUG = true;
// Intent extras.
public static final String EXTRA_CLASSNAME = "classname";
@@ -721,7 +722,9 @@ public class ManageApplications extends InstrumentedFragment
mFilter = mFilterAdapter.getFilter(position);
mApplications.setFilter(mFilter);
if (DEBUG) Log.d(TAG, "Selecting filter " + mFilter);
if (DEBUG) {
Log.d(TAG, "Selecting filter " + getContext().getText(mFilter.getTitle()));
}
}
@Override
@@ -784,7 +787,7 @@ public class ManageApplications extends InstrumentedFragment
return;
}
if (DEBUG) {
Log.d(TAG, "Enabling filter " + filter);
Log.d(TAG, "Enabling filter " + mContext.getText(filter.getTitle()));
}
mFilterOptions.add(filter);
Collections.sort(mFilterOptions);
@@ -793,7 +796,8 @@ public class ManageApplications extends InstrumentedFragment
notifyDataSetChanged();
if (mFilterOptions.size() == 1) {
if (DEBUG) {
Log.d(TAG, "Auto selecting filter " + filter);
Log.d(TAG, "Auto selecting filter " + filter + " " + mContext.getText(
filter.getTitle()));
}
mManageApplications.mFilterSpinner.setSelection(0);
mManageApplications.onItemSelected(null, null, 0, 0);
@@ -816,7 +820,8 @@ public class ManageApplications extends InstrumentedFragment
return;
}
if (DEBUG) {
Log.d(TAG, "Disabling filter " + filter);
Log.d(TAG, "Disabling filter " + filter + " " + mContext.getText(
filter.getTitle()));
}
Collections.sort(mFilterOptions);
mManageApplications.mSpinnerHeader.setVisibility(
@@ -825,7 +830,8 @@ public class ManageApplications extends InstrumentedFragment
if (mManageApplications.mFilter == filter) {
if (mFilterOptions.size() > 0) {
if (DEBUG) {
Log.d(TAG, "Auto selecting filter " + mFilterOptions.get(0));
Log.d(TAG, "Auto selecting filter " + mFilterOptions.get(0)
+ mContext.getText(mFilterOptions.get(0).getTitle()));
}
mManageApplications.mFilterSpinner.setSelection(0);
mManageApplications.onItemSelected(null, null, 0, 0);
@@ -1035,6 +1041,12 @@ public class ManageApplications extends InstrumentedFragment
if (!mHasReceivedLoadEntries
|| (mExtraInfoBridge != null && !mHasReceivedBridgeCallback)) {
// Don't rebuild the list until all the app entries are loaded.
if (DEBUG) {
Log.d(TAG, "Not rebuilding until all the app entries loaded."
+ " !mHasReceivedLoadEntries=" + !mHasReceivedLoadEntries
+ " !mExtraInfoBridgeNull=" + (mExtraInfoBridge != null)
+ " !mHasReceivedBridgeCallback=" + !mHasReceivedBridgeCallback);
}
return;
}
ApplicationsState.AppFilter filterObj;
@@ -1140,6 +1152,9 @@ public class ManageApplications extends InstrumentedFragment
@Override
public void onRebuildComplete(ArrayList<AppEntry> entries) {
if (DEBUG) {
Log.d(TAG, "onRebuildComplete");
}
final int filterType = mAppFilter.getFilterType();
if (filterType == FILTER_APPS_POWER_WHITELIST ||
filterType == FILTER_APPS_POWER_WHITELIST_ALL) {